Merge branch 'master' into people-import

src/internships/internships.controller.ts

@@ -60,13 +60,19 @@ export class InternshipsController {
   // uploads even if invalid state...
   @Put(':studentId/:state')
   @UseInterceptors(
-    FileInterceptor('pdf', {
+    FileInterceptor('file', {
       storage: diskStorage({
         destination: './files',
         filename: (_req, _file, cb) => {
           return cb(null, `${v4()}.pdf`);
         },
       }),
+      fileFilter: (req, file, cb) => {
+        if (!file.originalname.match(/\.pdf$/)) {
+          return cb(new Error('Only PDF files are allowed!'), false);
+        }
+        cb(null, true);
+      },
     }),
   )
   updateState(

src/login/login.controller.ts

@@ -11,7 +11,7 @@ export class LoginController {
 //   @UseGuards(AuthGuard('local'))
   @Post()
    async login(@Body() req: Login)  {
-    console.log('controller ' + req.email + req.passwordHash);
+    // console.log('controller ' + req.email + req.passwordHash);
     return this.loginService.login(req);
   }
 }

src/login/login.module.ts

@@ -15,7 +15,7 @@ import { JwtStrategy } from './jwt.strategy';
     PassportModule,
     JwtModule.register({
       secret: jwtConstants.secret,
-      signOptions: { expiresIn: '300s' },
+      signOptions: { expiresIn: '3600s' },
     }),
   ],
   controllers: [LoginController],

src/people/dto/create-people.dto.ts

-import { IsString, IsNotEmpty, IsOptional } from 'class-validator';
+import { IsBoolean, IsString, IsNotEmpty, IsOptional, IsNumber } from 'class-validator';
 
 export class CreatePeopleDto {
+
+  @IsNumber()
+  @IsNotEmpty()
+  ine: number;
+
   @IsString()
   @IsNotEmpty()
   firstname: string;
@@ -15,7 +20,7 @@ export class CreatePeopleDto {
   @IsString()
   @IsNotEmpty()
   email: string;
-
+ 
   @IsOptional()
   role: number;
 }

src/people/dto/update-people.dto.ts

-import { IsOptional, IsString, IsNotEmpty } from 'class-validator';
-
-export class UpdatePeopleDto {
-  @IsString()
-  @IsOptional()
-  firstname: string;
-
-  @IsString()
-  @IsOptional()
-  lastname: string;
-
-  @IsString()
-  @IsOptional()
-  email: string;
-
-  @IsString()
-  @IsOptional()
-  passwordHash: string;
-  
-  @IsOptional()
-  role: number;
-
-}
\ No newline at end of file
+import { IsOptional, IsString, IsNotEmpty, IsNumber } from 'class-validator';
+
+export class UpdatePeopleDto {
+  
+  @IsNumber()
+  @IsNotEmpty()
+  ine: number;
+  
+  @IsString()
+  @IsOptional()
+  firstname: string;
+
+  @IsString()
+  @IsOptional()
+  lastname: string;
+
+  @IsString()
+  @IsOptional()
+  email: string;
+
+  @IsString()
+  @IsOptional()
+  passwordHash: string;
+  
+  @IsOptional()
+  role: number;
+
+}

src/people/entities/people.entity.ts

@@ -2,6 +2,7 @@ import { People } from '../schemas/people.schema';
 
 export class PeopleEntity {
   _id: string;
+  ine: number;
   firstname: string;
   lastname: string;
   email: string;

src/people/schemas/people.schema.ts

-import * as mongoose from 'mongoose';
-import { Document } from 'mongoose';
-import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
-
-export type PeopleDocument = People & Document;
-
-@Schema({
-  toJSON: {
-    virtuals: true,
-    transform: (doc: any, ret: any) => {
-      delete ret._id;
-    },
-  },
-})
-export class People {
-    @Prop({
-        type: mongoose.Schema.Types.ObjectId,
-        auto: true,
-      })
-      _id: any;
-    
-    @Prop({
-        type: String,
-        required: true,
-        trim: true,
-        minlength: 2,
-    }) firstname: string;
-
-    @Prop({
-        type: String,
-        required: true,
-        trim: true,
-        minlength: 2,
-    }) lastname: string;
-
-    @Prop({
-        type: String,
-        required: true,
-        trim: true,
-        minlength: 2,
-    }) email: string;
-
-    @Prop({
-        type: String,
-        trim: true,
-        minlength: 2,
-    }) passwordHash: string;
-
-    @Prop({
-        type: Number,
-        required: true,
-    }) role: number;
-
-}
-
-export const PeopleSchema = SchemaFactory.createForClass(People);
-
-PeopleSchema.index({});
\ No newline at end of file
+import * as mongoose from 'mongoose';
+import { Document } from 'mongoose';
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+
+export type PeopleDocument = People & Document;
+
+@Schema({
+  toJSON: {
+    virtuals: true,
+    transform: (doc: any, ret: any) => {
+      delete ret._id;
+    },
+  },
+})
+export class People {
+    @Prop({
+        type: mongoose.Schema.Types.ObjectId,
+        auto: true,
+      })
+      _id: any;
+    
+      @Prop({
+        type: Number,
+        required: true,
+    }) ine: number;
+
+    @Prop({
+        type: String,
+        required: true,
+        trim: true,
+        minlength: 2,
+    }) firstname: string;
+
+    @Prop({
+        type: String,
+        required: true,
+        trim: true,
+        minlength: 2,
+    }) lastname: string;
+
+    @Prop({
+        type: String,
+        required: true,
+        trim: true,
+        minlength: 2,
+    }) email: string;
+
+    @Prop({
+        type: String,
+        trim: true,
+        minlength: 2,
+    }) passwordHash: string;
+
+    @Prop({
+        type: Number,
+        required: true,
+    }) role: number;
+
+}
+
+export const PeopleSchema = SchemaFactory.createForClass(People);
+
+PeopleSchema.index({});

src/resources/resources.controller.ts

@@ -19,7 +19,7 @@ export class ResourcesController {
     @Param('filename') filename,
     @Res({ passthrough: true }) res: Response,
   ): StreamableFile {
-    const filepath = `files\\${filename}`;
+    const filepath = `files/${filename}`;
     if (!existsSync(filepath)) throw NOT_FOUND;
     const file = createReadStream(filepath);
     res.set({