@lenne.tech/nest-server 8.6.11 → 8.6.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.11",
+  "version": "8.6.14",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/core/common/helpers/db.helper.ts

@@ -543,7 +543,7 @@ export function removeIds(source: any[], ids: StringOrObjectId | StringOrObjectI
  */
 export async function setPopulates<T = Query<any, any> | Document>(
   queryOrDocument: T,
-  populateOptions: PopulateOptions[],
+  populateOptions: string[] | PopulateOptions[] | (string | PopulateOptions)[],
   modelSchemaPaths?: { [key: string]: SchemaType }
 ): Promise<T> {
   // Check parameters
@@ -553,8 +553,12 @@ export async function setPopulates<T = Query<any, any> | Document>(
 
   // Filter populate options via model schema paths
   if (modelSchemaPaths) {
-    populateOptions = populateOptions.filter((options) => {
-      return Object.keys(modelSchemaPaths).includes(options.path);
+    populateOptions = populateOptions.filter((option: string | PopulateOptions) => {
+      let key: string = option as string;
+      if ((option as PopulateOptions)?.path) {
+        key = (option as PopulateOptions)?.path;
+      }
+      return Object.keys(modelSchemaPaths).includes(key);
     });
   }
 

package/src/core/common/interfaces/server-options.interface.ts

@@ -1,7 +1,7 @@
 import { ApolloDriverConfig } from '@nestjs/apollo';
 import { GqlModuleAsyncOptions } from '@nestjs/graphql';
 import { JwtModuleOptions } from '@nestjs/jwt';
-import { MongooseModuleOptions } from '@nestjs/mongoose/dist/interfaces/mongoose-options.interface';
+import { MongooseModuleOptions } from '@nestjs/mongoose';
 import { ServeStaticOptions } from '@nestjs/platform-express/interfaces/serve-static-options.interface';
 import * as SMTPTransport from 'nodemailer/lib/smtp-transport';
 import { MailjetOptions } from './mailjet-options.interface';

package/src/core/common/interfaces/service-options.interface.ts

@@ -35,7 +35,7 @@ export interface ServiceOptions {
   outputType?: new (...params: any[]) => any;
 
   // Alias for fieldSelection (if both are set fieldSelection is overwritten by populate)
-  populate?: PopulateOptions | (PopulateOptions | string)[];
+  populate?: string | PopulateOptions | (PopulateOptions | string)[];
 
   // Process field selection
   // If {} or not set, then the field selection runs with defaults

package/src/core/common/types/field-selection.type.ts

@@ -5,4 +5,9 @@ import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 /**
  * Field selection to set fields of (populated) result
  */
-export type FieldSelection = PopulateOptions | (PopulateOptions | string)[] | SelectionNode[] | ResolveSelector;
+export type FieldSelection =
+  | string
+  | PopulateOptions
+  | (PopulateOptions | string)[]
+  | SelectionNode[]
+  | ResolveSelector;

package/src/core/common/types/maybe-promise.type.ts

@@ -0,0 +1,4 @@
+/**
+ * Promise or direct value
+ */
+export type MaybePromise<T = any> = T | Promise<T>;

package/src/core/modules/auth/core-auth.model.ts

@@ -34,7 +34,8 @@ export class CoreAuthModel extends CoreModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
     return this;
   }
 }

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

@@ -0,0 +1,40 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+import { Prop } from '@nestjs/mongoose';
+import { Types } from 'mongoose';
+import { CoreModel } from '../../common/models/core-model.model';
+
+/**
+ * File info
+ */
+@ObjectType({ description: 'Information about file' })
+export class CoreFileInfo extends CoreModel {
+  _id: Types.ObjectId;
+
+  @Field(() => String, { description: 'ID of the file' })
+  id: string = undefined;
+
+  @Field(() => Number, {
+    description:
+      'The size of each chunk in bytes. GridFS divides the document into chunks of size chunkSize, ' +
+      'except for the last, which is only as large as needed. The default size is 255 kilobytes (kB)',
+    nullable: true,
+  })
+  @Prop({ type: Number, required: false })
+  chunkSize: number = undefined;
+
+  @Field(() => String, { description: 'Content type', nullable: true })
+  @Prop({ type: String, required: false })
+  contentType?: string = undefined;
+
+  @Field(() => String, { description: 'Name of the file', nullable: true })
+  @Prop({ type: String, required: false })
+  filename?: string = undefined;
+
+  @Field(() => Number, { description: 'The size of the document in bytes', nullable: true })
+  @Prop({ type: Number, required: false })
+  length: number = undefined;
+
+  @Field(() => Date, { description: 'The date the file was first stored', nullable: true })
+  @Prop({ type: Date, required: false })
+  uploadDate: Date = undefined;
+}

package/src/core/modules/file/core-file.controller.ts

@@ -0,0 +1,34 @@
+import { BadRequestException, Controller, Get, NotFoundException, Param, Res } from '@nestjs/common';
+import { User } from '../../../server/modules/user/user.model';
+import { RESTUser } from '../../common/decorators/rest-user.decorator';
+import { CoreFileService } from './core-file.service';
+
+/**
+ * File controller
+ */
+@Controller('files')
+export abstract class CoreFileController {
+  /**
+   * Include services
+   */
+  protected constructor(protected fileService: CoreFileService) {}
+
+  /**
+   * Download file
+   */
+  @Get(':filename')
+  async getFile(@Param('filename') filename: string, @Res() res, @RESTUser() user: User) {
+    if (!filename) {
+      throw new BadRequestException('Missing filename for download');
+    }
+
+    const file = await this.fileService.getFileInfoByName(filename);
+    if (!file) {
+      throw new NotFoundException('File not found');
+    }
+    const filestream = await this.fileService.getFileStream(file.id);
+    res.header('Content-Type', file.contentType);
+    res.header('Content-Disposition', 'attachment; filename=' + file.filename);
+    return filestream.pipe(res);
+  }
+}

package/src/core/modules/file/core-file.resolver.ts

@@ -0,0 +1,56 @@
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import * as GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
+import { CoreFileInfo } from './core-file-info.model';
+import { CoreFileService } from './core-file.service';
+import { FileUpload } from './interfaces/file-upload.interface';
+
+/**
+ * File resolver
+ */
+@Resolver()
+export class CoreFileResolver {
+  /**
+   * Integrate services
+   */
+  constructor(protected readonly fileService: CoreFileService) {}
+
+  // ===========================================================================
+  // Queries
+  // ===========================================================================
+
+  /**
+   * Get file info
+   */
+  @Query(() => CoreFileInfo, { nullable: true })
+  async getFileInfo(@Args({ name: 'filename', type: () => String }) filename: string): Promise<any> {
+    return await this.fileService.getFileInfoByName(filename);
+  }
+
+  // ===========================================================================
+  // Mutations
+  // ===========================================================================
+
+  /**
+   * Delete file
+   */
+  @Mutation(() => CoreFileInfo)
+  async deleteFile(@Args({ name: 'filename', type: () => String }) filename: string): Promise<any> {
+    return await this.fileService.deleteFileByName(filename);
+  }
+
+  /**
+   * Upload file
+   */
+  @Mutation(() => CoreFileInfo)
+  async uploadFile(@Args({ name: 'file', type: () => GraphQLUpload }) file: FileUpload): Promise<any> {
+    return await this.fileService.createFile(file);
+  }
+
+  /**
+   * Upload files
+   */
+  @Mutation(() => [CoreFileInfo])
+  async uploadFiles(@Args({ name: 'files', type: () => [GraphQLUpload] }) files: FileUpload[]): Promise<any> {
+    return await this.fileService.createFiles(files);
+  }
+}

package/src/core/modules/file/core-file.service.ts

@@ -7,10 +7,16 @@ import { getObjectIds, getStringIds } from '../../common/helpers/db.helper';
 import { convertFilterArgsToQuery } from '../../common/helpers/filter.helper';
 import { check } from '../../common/helpers/input.helper';
 import { prepareOutput } from '../../common/helpers/service.helper';
-import { FileInfo } from './file-info.output';
+import { MaybePromise } from '../../common/types/maybe-promise.type';
+import { CoreFileInfo } from './core-file-info.model';
 import { FileServiceOptions } from './interfaces/file-service-options.interface';
 import { FileUpload } from './interfaces/file-upload.interface';
 
+/**
+ * Type for checking input
+ */
+export type FileInputCheckType = 'file' | 'files' | 'filterArgs' | 'id' | 'filename';
+
 /**
  * Abstract core file service
  */
@@ -20,16 +26,19 @@ export abstract class CoreFileService {
   /**
    * Include MongoDB connection and create File bucket
    */
-  protected constructor(protected readonly connection: Connection, modelName = 'File') {
-    this.files = createBucket({ modelName, connection });
+  protected constructor(protected readonly connection: Connection, bucketName = 'fs') {
+    this.files = createBucket({ bucketName, connection });
   }
 
   /**
    * Save file in DB
    */
-  createFile(file: FileUpload, serviceOptions?: FileServiceOptions): Promise<FileInfo> {
-    return new Promise(async (resolve, reject) => {
-      const { filename, mimetype, encoding, createReadStream } = file;
+  async createFile(file: MaybePromise<FileUpload>, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+    if (!(await this.checkRights(file, { ...serviceOptions, checkInputType: 'file' }))) {
+      return null;
+    }
+    return await new Promise(async (resolve, reject) => {
+      const { filename, mimetype, encoding, createReadStream } = await file;
       const readStream = createReadStream();
       const options: MongoGridFSOptions = { filename, contentType: mimetype };
       this.files.writeFile(options, readStream, (error, fileInfo) => {
@@ -41,8 +50,11 @@ export abstract class CoreFileService {
   /**
    * Save files in DB
    */
-  async createFiles(files: FileUpload[], serviceOptions?: FileServiceOptions): Promise<FileInfo[]> {
-    const promises: Promise<FileInfo>[] = [];
+  async createFiles(files: MaybePromise<FileUpload>[], serviceOptions?: FileServiceOptions): Promise<CoreFileInfo[]> {
+    if (!(await this.checkRights(files, { ...serviceOptions, checkInputType: 'files' }))) {
+      return null;
+    }
+    const promises: Promise<CoreFileInfo>[] = [];
     for (const file of files) {
       promises.push(this.createFile(file, serviceOptions));
     }
@@ -52,8 +64,11 @@ export abstract class CoreFileService {
   /**
    * Get file infos via filter
    */
-  findFileInfo(filterArgs?: FilterArgs, serviceOptions?: FileServiceOptions): Promise<FileInfo[]> {
-    return new Promise((resolve, reject) => {
+  async findFileInfo(filterArgs?: FilterArgs, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo[]> {
+    if (!(await this.checkRights(filterArgs, { ...serviceOptions, checkInputType: 'filterArgs' }))) {
+      return null;
+    }
+    return await new Promise((resolve, reject) => {
       const filterQuery = convertFilterArgsToQuery(filterArgs);
       const cursor = this.files.find(filterQuery[0], filterQuery[1]);
       if (!cursor) {
@@ -68,8 +83,11 @@ export abstract class CoreFileService {
   /**
    * Get info about file via file ID
    */
-  getFileInfo(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<FileInfo> {
-    return new Promise((resolve, reject) => {
+  async getFileInfo(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+    if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
+      return null;
+    }
+    return await new Promise((resolve, reject) => {
       this.files.findById(getObjectIds(id), (error, fileInfo) => {
         error ? reject(error) : resolve(this.prepareOutput(fileInfo, serviceOptions));
       });
@@ -79,8 +97,11 @@ export abstract class CoreFileService {
   /**
    * Get info about file via filename
    */
-  getFileInfoByName(filename: string, serviceOptions?: FileServiceOptions): Promise<FileInfo> {
-    return new Promise((resolve, reject) => {
+  async getFileInfoByName(filename: string, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+    if (!(await this.checkRights(filename, { ...serviceOptions, checkInputType: 'filename' }))) {
+      return null;
+    }
+    return await new Promise((resolve, reject) => {
       this.files.findOne({ filename }, (error, fileInfo) => {
         error ? reject(error) : resolve(this.prepareOutput(fileInfo, serviceOptions));
       });
@@ -90,22 +111,34 @@ export abstract class CoreFileService {
   /**
    * Get file stream (for big files) via file ID
    */
-  getFileStream(id: string | Types.ObjectId, options?: GridFSBucketReadStreamOptions) {
-    return this.files.openDownloadStream(getObjectIds(id), options);
+  async getFileStream(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions) {
+    if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
+      return null;
+    }
+    return this.files.openDownloadStream(getObjectIds(id));
   }
 
   /**
    * Get file stream (for big files) via filename
    */
-  getFileStreamByName(filename: string): GridFSBucketReadStreamOptions {
+  async getFileStreamByName(
+    filename: string,
+    serviceOptions?: FileServiceOptions
+  ): Promise<GridFSBucketReadStreamOptions> {
+    if (!(await this.checkRights(filename, { ...serviceOptions, checkInputType: 'filename' }))) {
+      return null;
+    }
     return this.files.readFile({ filename });
   }
 
   /**
    * Get file buffer (for small files) via file ID
    */
-  getBuffer(id: string | Types.ObjectId): Promise<Buffer> {
-    return new Promise((resolve, reject) => {
+  async getBuffer(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<Buffer> {
+    if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
+      return null;
+    }
+    return await new Promise((resolve, reject) => {
       this.files.readFile({ _id: getObjectIds(id) }, (error, buffer) => {
         error ? reject(error) : resolve(buffer);
       });
@@ -115,8 +148,11 @@ export abstract class CoreFileService {
   /**
    * Get file buffer (for small files) via file ID
    */
-  getBufferByName(filename: string): Promise<Buffer> {
-    return new Promise((resolve, reject) => {
+  async getBufferByName(filename: string, serviceOptions?: FileServiceOptions): Promise<Buffer> {
+    if (!(await this.checkRights(filename, { ...serviceOptions, checkInputType: 'filename' }))) {
+      return null;
+    }
+    return await new Promise((resolve, reject) => {
       this.files.readFile({ filename }, (error, buffer) => {
         error ? reject(error) : resolve(buffer);
       });
@@ -126,8 +162,11 @@ export abstract class CoreFileService {
   /**
    * Delete file reference of avatar
    */
-  deleteFile(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<FileInfo> {
-    return new Promise((resolve, reject) => {
+  async deleteFile(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+    if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
+      return null;
+    }
+    return await new Promise((resolve, reject) => {
       return this.files.unlink(getObjectIds(id), (error, fileInfo) => {
         error ? reject(error) : resolve(this.prepareOutput(fileInfo, serviceOptions));
       });
@@ -137,7 +176,10 @@ export abstract class CoreFileService {
   /**
    * Delete file reference of avatar
    */
-  async deleteFileByName(filename: string, serviceOptions?: FileServiceOptions): Promise<FileInfo> {
+  async deleteFileByName(filename: string, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+    if (!(await this.checkRights(filename, { ...serviceOptions, checkInputType: 'filename' }))) {
+      return null;
+    }
     const fileInfo = await this.getFileInfoByName(filename);
     if (!fileInfo) {
       throw new NotFoundException('File not found with filename ' + filename);
@@ -149,22 +191,33 @@ export abstract class CoreFileService {
   //  Helper methods
   // ===================================================================================================================
 
+  /**
+   * Check rights before processing file handling
+   * Can throw an exception if the rights do not fit
+   */
+  protected checkRights(
+    input: any,
+    options?: FileServiceOptions & { checkInputType: FileInputCheckType }
+  ): MaybePromise<boolean> {
+    return true;
+  }
+
   /**
    * Prepare output before return
    */
-  protected async prepareOutput(fileInfo: FileInfo | FileInfo[], options?: FileServiceOptions) {
+  protected async prepareOutput(fileInfo: CoreFileInfo | CoreFileInfo[], options?: FileServiceOptions) {
     if (!fileInfo) {
       return fileInfo;
     }
     this.setId(fileInfo);
-    fileInfo = await prepareOutput(fileInfo, { targetModel: FileInfo });
+    fileInfo = await prepareOutput(fileInfo, { targetModel: CoreFileInfo });
     return check(fileInfo, options?.currentUser, { roles: options?.roles });
   }
 
   /**
    * Set file info ID via _id
    */
-  protected setId(fileInfo: FileInfo | FileInfo[]) {
+  protected setId(fileInfo: CoreFileInfo | CoreFileInfo[]) {
     if (Array.isArray(fileInfo)) {
       fileInfo.forEach((item) => {
         if (typeof item === 'object') {

package/src/core/modules/user/core-user.model.ts

@@ -128,7 +128,8 @@ export abstract class CoreUserModel extends CorePersistenceModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
     return this;
   }
 }

package/src/index.ts

@@ -56,6 +56,7 @@ export * from './core/common/services/template.service';
 export * from './core/common/types/core-model-constructor.type';
 export * from './core/common/types/field-selection.type';
 export * from './core/common/types/ids.type';
+export * from './core/common/types/maybe-promise.type';
 export * from './core/common/types/plain-input.type';
 export * from './core/common/types/require-only-one.type';
 export * from './core/common/types/required-at-least-one.type';
@@ -84,8 +85,10 @@ export * from './core/modules/auth/jwt.strategy';
 
 export * from './core/modules/file/interfaces/file-service-options.interface';
 export * from './core/modules/file/interfaces/file-upload.interface';
+export * from './core/modules/file/core-file.controller';
+export * from './core/modules/file/core-file.resolver';
 export * from './core/modules/file/core-file.service';
-export * from './core/modules/file/file-info.output';
+export * from './core/modules/file/core-file-info.model';
 
 // =====================================================================================================================
 // Core - Modules - User

package/src/server/common/models/persistence.model.ts

@@ -61,7 +61,8 @@ export abstract class PersistenceModel extends CorePersistenceModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
     return this;
   }
 }

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

@@ -1,4 +1,5 @@
 import { Field, ObjectType } from '@nestjs/graphql';
+import { mapClasses } from '../../../core/common/helpers/model.helper';
 import { CoreAuthModel } from '../../../core/modules/auth/core-auth.model';
 import { User } from '../user/user.model';
 
@@ -35,7 +36,6 @@ export class Auth extends CoreAuthModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
-    return this;
+    return mapClasses(input, { user: User }, this);
   }
 }

package/src/server/modules/file/file-info.model.ts

@@ -0,0 +1,15 @@
+import { ObjectType } from '@nestjs/graphql';
+import { Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
+import { CoreFileInfo } from '../../../core/modules/file/core-file-info.model';
+
+/**
+ * File info model
+ */
+@ObjectType({ description: 'Information about file' })
+@MongooseSchema({ collection: 'fs.files' })
+export class FileInfo extends CoreFileInfo {}
+
+/**
+ * File info schema
+ */
+export const FileInfoSchema = SchemaFactory.createForClass(FileInfo);

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

@@ -1,34 +1,25 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Get,
-  NotFoundException,
-  Param,
-  Post,
-  Res,
-  UploadedFiles,
-  UseInterceptors,
-} from '@nestjs/common';
+import { Body, Controller, Post, UploadedFiles, UseInterceptors } from '@nestjs/common';
 import { FilesInterceptor } from '@nestjs/platform-express';
 import { diskStorage } from 'multer';
 import envConfig from '../../../config.env';
-import { RESTUser } from '../../../core/common/decorators/rest-user.decorator';
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { multerRandomFileName } from '../../../core/common/helpers/file.helper';
-import { User } from '../user/user.model';
+import { CoreFileController } from '../../../core/modules/file/core-file.controller';
 import { FileService } from './file.service';
 
 /**
  * File controller
  */
+@Roles(RoleEnum.S_USER)
 @Controller('files')
-export class FileController {
+export class FileController extends CoreFileController {
   /**
    * Include services
    */
-  constructor(protected fileService: FileService) {}
+  constructor(protected fileService: FileService) {
+    super(fileService);
+  }
 
   /**
    * Upload files via REST as an alternative to uploading via GraphQL (see file.resolver.ts)
@@ -53,24 +44,4 @@ export class FileController {
   uploadFiles(@UploadedFiles() files, @Body() fields: any) {
     console.log('Saved file info', JSON.stringify({ files, fields }, null, 2));
   }
-
-  /**
-   * Download file
-   */
-  @Roles(RoleEnum.ADMIN)
-  @Get(':filename')
-  async getFile(@Param('filename') filename: string, @Res() res, @RESTUser() user: User) {
-    if (!filename) {
-      throw new BadRequestException('Missing filename for download');
-    }
-
-    const file = await this.fileService.getFileInfoByName(filename);
-    if (!file) {
-      throw new NotFoundException('File not found');
-    }
-    const filestream = await this.fileService.getFileStream(file.id);
-    res.header('Content-Type', file.contentType);
-    res.header('Content-Disposition', 'attachment; filename=' + file.filename);
-    return filestream.pipe(res);
-  }
 }

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/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 {}