@lenne.tech/nest-server 8.6.10 → 8.6.13

package/src/server/modules/file/file.module.ts

@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import { FileInfo, FileInfoSchema } from './file-info.model';
+import { FileController } from './file.controller';
+import { FileResolver } from './file.resolver';
+import { FileService } from './file.service';
+
+/**
+ * File module
+ */
+@Module({
+  imports: [MongooseModule.forFeature([{ name: FileInfo.name, schema: FileInfoSchema }])],
+  controllers: [FileController],
+  providers: [FileService, FileResolver],
+  exports: [MongooseModule, FileService],
+})
+export class FileModule {}

package/src/server/modules/file/file.resolver.ts

@@ -3,8 +3,8 @@ import { createWriteStream } from 'fs';
 import * as GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
-import { FileInfo } from '../../../core/modules/file/file-info.output';
 import { FileUpload } from '../../../core/modules/file/interfaces/file-upload.interface';
+import { FileInfo } from './file-info.model';
 import { FileService } from './file.service';
 
 /**
@@ -49,9 +49,6 @@ export class FileResolver {
   @Roles(RoleEnum.ADMIN)
   @Mutation(() => FileInfo)
   async uploadFile(@Args({ name: 'file', type: () => GraphQLUpload }) file: FileUpload) {
-    const { filename, mimetype, encoding, createReadStream } = file;
-
-    // Save file in DB
     return await this.fileService.createFile(file);
   }
 

package/src/server/modules/file/file.service.ts

@@ -3,9 +3,12 @@ import { InjectConnection } from '@nestjs/mongoose';
 import { Connection } from 'mongoose';
 import { CoreFileService } from '../../../core/modules/file/core-file.service';
 
+/**
+ * File service
+ */
 @Injectable()
 export class FileService extends CoreFileService {
   constructor(@InjectConnection() protected readonly connection: Connection) {
-    super(connection, 'File');
+    super(connection, 'fs');
   }
 }

package/src/server/modules/user/inputs/user-create.input.ts

@@ -3,10 +3,6 @@ import { CoreUserCreateInput } from '../../../../core/modules/user/inputs/core-u
 
 /**
  * User input to create a new user
- *
- * HINT: All properties (in this class and all classes that extend this class) must be initialized with undefined,
- * otherwise the property will not be recognized via Object.keys (this is necessary for mapping) or will be initialized
- * with a default value that may overwrite an existing value in the DB.
  */
 @InputType({ description: 'User input to create a new user' })
 export class UserCreateInput extends CoreUserCreateInput {

package/src/server/modules/user/inputs/user.input.ts

@@ -3,10 +3,6 @@ import { CoreUserInput } from '../../../../core/modules/user/inputs/core-user.in
 
 /**
  * User input to update a user
- *
- * HINT: All properties (in this class and all classes that extend this class) must be initialized with undefined,
- * otherwise the property will not be recognized via Object.keys (this is necessary for mapping) or will be initialized
- * with a default value that may overwrite an existing value in the DB.
  */
 @InputType({ description: 'User input' })
 export class UserInput extends CoreUserInput {

package/src/server/modules/user/user.model.ts

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { Prop, Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
-import { Document, Schema } from 'mongoose';
+import { Document, Schema, Types } from 'mongoose';
 import { mapClasses } from '../../../core/common/helpers/model.helper';
 import { CoreUserModel } from '../../../core/modules/user/core-user.model';
 import { PersistenceModel } from '../../common/models/persistence.model';
@@ -8,7 +8,7 @@ import { PersistenceModel } from '../../common/models/persistence.model';
 export type UserDocument = User & Document;
 
 /**
- * User schema
+ * User model
  */
 @ObjectType({ description: 'User' })
 @MongooseSchema({ timestamps: true })
@@ -25,28 +25,28 @@ export class User extends CoreUserModel implements PersistenceModel {
   avatar: string = undefined;
 
   /**
-   * Editor who created the object
+   * ID of the user who created the object
    *
    * Not set when created by system
    */
-  @Field((type) => User, {
+  @Field(() => String, {
     description: 'ID of the user who created the object',
     nullable: true,
   })
   @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
-  createdBy: User = undefined;
+  createdBy: Types.ObjectId | string = undefined;
 
   /**
-   * Editor who last updated the object
+   * ID of the user who updated the object
    *
    * Not set when updated by system
    */
-  @Field((type) => User, {
+  @Field(() => String, {
     description: 'ID of the user who last updated the object',
     nullable: true,
   })
   @Prop({ type: Schema.Types.ObjectId, ref: 'User' })
-  updatedBy: User = undefined;
+  updatedBy: Types.ObjectId | string = undefined;
 
   // ===================================================================================================================
   // Methods

package/src/server/server.module.ts

@@ -3,9 +3,7 @@ import envConfig from '../config.env';
 import { CoreModule } from '../core.module';
 import { CoreAuthService } from '../core/modules/auth/services/core-auth.service';
 import { AuthModule } from './modules/auth/auth.module';
-import { FileController } from './modules/file/file.controller';
-import { FileResolver } from './modules/file/file.resolver';
-import { FileService } from './modules/file/file.service';
+import { FileModule } from './modules/file/file.module';
 import { ServerController } from './server.controller';
 
 /**
@@ -23,15 +21,15 @@ import { ServerController } from './server.controller';
     // Include AuthModule for authorization handling,
     // which will also include UserModule
     AuthModule.forRoot(envConfig.jwt),
+
+    // Include FileModule for file handling
+    FileModule,
   ],
 
   // Include REST controllers
-  controllers: [FileController, ServerController],
-
-  // Include resolvers, services and other providers
-  providers: [FileService, FileResolver],
+  controllers: [ServerController],
 
   // Export modules for reuse in other modules
-  exports: [CoreModule, AuthModule],
+  exports: [CoreModule, AuthModule, FileModule],
 })
 export class ServerModule {}

package/src/test/test.helper.ts

@@ -169,7 +169,7 @@ export class TestHelper {
           });
         })
         .end((err, res: superagent.Response) => {
-          (res as superagent.Response & { data: string }).data = new Buffer(data, 'binary').toString();
+          (res as superagent.Response & { data: string }).data = Buffer.from(data, 'binary').toString();
           err ? reject(err) : resolve(res as superagent.Response & { data: string });
         });
     });

package/dist/core/modules/file/file-info.output.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"file-info.output.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-info.output.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAoD;AAEpD,2EAAiE;AAMjE,IAAa,QAAQ,GAArB,MAAa,QAAS,SAAQ,4BAAS;IAAvC;;QAIE,OAAE,GAAW,SAAS,CAAC;QAGvB,WAAM,GAAW,SAAS,CAAC;QAG3B,cAAS,GAAW,SAAS,CAAC;QAG9B,aAAQ,GAAY,SAAS,CAAC;QAG9B,gBAAW,GAAY,SAAS,CAAC;IACnC,CAAC;CAAA,CAAA;AAbC;IADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC;;oCACzC;AAGvB;IADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,6BAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACzD;AAG3B;IADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC5C;AAG9B;IADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC3C;AAG9B;IADC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACpC;AAhBtB,QAAQ;IADpB,IAAA,oBAAU,EAAC,EAAE,WAAW,EAAE,mCAAmC,EAAE,CAAC;GACpD,QAAQ,CAiBpB;AAjBY,4BAAQ"}

package/src/core/modules/file/file-info.output.ts

@@ -1,26 +0,0 @@
-import { Field, ObjectType } from '@nestjs/graphql';
-import { Types } from 'mongoose';
-import { CoreModel } from '../../common/models/core-model.model';
-
-/**
- * File info (output)
- */
-@ObjectType({ description: 'Information about attachment file' })
-export class FileInfo extends CoreModel {
-  _id: Types.ObjectId;
-
-  @Field(() => String, { description: 'ID of the file in bytes' })
-  id: string = undefined;
-
-  @Field(() => Number, { description: 'Length of the file in bytes', nullable: true })
-  length: number = undefined;
-
-  @Field(() => Number, { description: 'Size of the chunk', nullable: true })
-  chunkSize: number = undefined;
-
-  @Field(() => String, { description: 'Name of the file', nullable: true })
-  filename?: string = undefined;
-
-  @Field(() => String, { description: 'Content type', nullable: true })
-  contentType?: string = undefined;
-}