@lenne.tech/nest-server 10.8.9 → 10.8.11

package/src/core/common/services/crud.service.ts

@@ -32,7 +32,7 @@ export abstract class CrudService<
    */
   async aggregate<T = any>(
     pipeline: PipelineStage[],
-    serviceOptions?: { aggregateOptions?: AggregateOptions } & ServiceOptions,
+    serviceOptions?: ServiceOptions & { aggregateOptions?: AggregateOptions },
   ): Promise<T> {
     return this.process(
       async () => {
@@ -147,7 +147,7 @@ export abstract class CrudService<
    * Get items via filter
    */
   async find(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions,
   ): Promise<Model[]> {
     // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
@@ -191,7 +191,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions!
    */
   async findForce(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
   ): Promise<Model[]> {
     serviceOptions = serviceOptions || {};
@@ -204,7 +204,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async findRaw(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
   ): Promise<Model[]> {
     serviceOptions = serviceOptions || {};
@@ -216,7 +216,7 @@ export abstract class CrudService<
    * Get items and total count via filter
    */
   async findAndCount(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions,
   ): Promise<{ items: Model[]; totalCount: number }> {
     // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
@@ -295,7 +295,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions!
    */
   async findAndCountForce(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
   ): Promise<{ items: Model[]; totalCount: number }> {
     serviceOptions.raw = true;
@@ -307,7 +307,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async findAndCountRaw(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
   ): Promise<{ items: Model[]; totalCount: number }> {
     serviceOptions = serviceOptions || {};
@@ -319,7 +319,7 @@ export abstract class CrudService<
    * Find and update
    */
   async findAndUpdate(
-    filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     update: PlainObject<UpdateInput>,
     serviceOptions?: ServiceOptions,
   ): Promise<Model[]> {
@@ -348,7 +348,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions!
    */
   async findAndUpdateForce(
-    filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     update: PlainObject<UpdateInput>,
     serviceOptions: ServiceOptions = {},
   ): Promise<Model[]> {
@@ -362,7 +362,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async findAndUpdateRaw(
-    filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     update: PlainObject<UpdateInput>,
     serviceOptions: ServiceOptions = {},
   ): Promise<Model[]> {
@@ -375,7 +375,7 @@ export abstract class CrudService<
    * Find one item via filter
    */
   async findOne(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model> {
     // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
@@ -414,7 +414,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions!
    */
   async findOneForce(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
   ): Promise<Model> {
     serviceOptions = serviceOptions || {};
@@ -427,7 +427,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async findOneRaw(
-    filter?: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number } | FilterArgs,
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
   ): Promise<Model> {
     serviceOptions = serviceOptions || {};
@@ -452,7 +452,7 @@ export abstract class CrudService<
    * CRUD alias for find
    */
   async read(
-    filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model[]>;
 
@@ -460,7 +460,7 @@ export abstract class CrudService<
    * CRUD alias for get or find
    */
   async read(
-    input: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs | string,
+    input: FilterArgs | string | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model | Model[]> {
     if (typeof input === 'string') {
@@ -481,7 +481,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions!
    */
   async readForce(
-    filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model[]>;
 
@@ -490,7 +490,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions!
    */
   async readForce(
-    input: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs | string,
+    input: FilterArgs | string | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model | Model[]> {
     if (typeof input === 'string') {
@@ -511,7 +511,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async readRaw(
-    filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model[]>;
 
@@ -520,7 +520,7 @@ export abstract class CrudService<
    * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
    */
   async readRaw(
-    input: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs | string,
+    input: FilterArgs | string | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
     serviceOptions?: ServiceOptions,
   ): Promise<Model | Model[]> {
     if (typeof input === 'string') {

package/src/core/common/services/mailjet.service.ts

@@ -1,8 +1,8 @@
 import { HttpException, Injectable } from '@nestjs/common';
+const Mailjet = require('node-mailjet');
 
 import { ConfigService } from './config.service';
 
-const Mailjet = require('node-mailjet');
 
 /**
  * Mailjet service

package/src/core/common/services/module.service.ts

@@ -75,18 +75,18 @@ export abstract class ModuleService<T extends CoreModel = any> {
     serviceFunc: (options?: { [key: string]: any; input?: any; serviceOptions?: ServiceOptions }) => any,
     options?: {
       [key: string]: any;
-      dbObject?: Types.ObjectId | any | string;
+      dbObject?: any | string | Types.ObjectId;
       input?: any;
       outputPath?: string | string[];
       serviceOptions?: ServiceOptions;
     },
   ) {
     // Configuration with default values
-    const config: {
-      dbObject: Types.ObjectId | any | string;
+    const config: ServiceOptions & {
+      dbObject: any | string | Types.ObjectId;
       input: any;
       outputPath: string | string[];
-    } & ServiceOptions = {
+    } = {
       checkRights: true,
       dbObject: options?.dbObject,
       force: false,

package/src/core/common/types/falsy.type.ts

@@ -1,4 +1,4 @@
 /**
  * Falsy type for anything that is considered false if it occurs in a Boolean context
  */
-export type Falsy = '' | 0 | false | null | undefined;
+export type Falsy = 0 | '' | false | null | undefined;

package/src/core/common/types/id.type.ts

@@ -1,3 +1,3 @@
 import { Types } from 'mongoose';
 
-export type IdType = { _id?: Types.ObjectId | string; id?: Types.ObjectId | string } | Types.ObjectId | string;
+export type IdType = string | Types.ObjectId | { _id?: string | Types.ObjectId; id?: string | Types.ObjectId };

package/src/core/common/types/require-only-one.type.ts

@@ -2,7 +2,7 @@
  * Require only one of the optional properties
  * See https://stackoverflow.com/a/49725198
  */
-export type RequireOnlyOne<T, Keys extends keyof T = keyof T> = {
+export type RequireOnlyOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> &
+  {
   [K in Keys]-?: Partial<Record<Exclude<Keys, K>, undefined>> & Required<Pick<T, K>>;
-}[Keys] &
-  Pick<T, Exclude<keyof T, Keys>>;
+}[Keys];

package/src/core/common/types/required-at-least-one.type.ts

@@ -2,7 +2,7 @@
  * Require at least on of optional properties
  * See https://stackoverflow.com/a/49725198
  */
-export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = {
+export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> &
+  {
   [K in Keys]-?: Partial<Pick<T, Exclude<Keys, K>>> & Required<Pick<T, K>>;
-}[Keys] &
-  Pick<T, Exclude<keyof T, Keys>>;
+}[Keys];

package/src/core/common/types/string-or-object-id.type.ts

@@ -3,4 +3,4 @@ import { Types } from 'mongoose';
 /**
  * Everything which will be used by getStringIds or getObjectIds (see helpers/db.helper.ts)
  */
-export type StringOrObjectId<T = any> = T | Types.ObjectId | string;
+export type StringOrObjectId<T = any> = string | T | Types.ObjectId;

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

@@ -21,9 +21,9 @@ import { ICoreAuthUser } from './interfaces/core-auth-user.interface';
 import { CoreAuthService } from './services/core-auth.service';
 import { Tokens } from './tokens.decorator';
 
-@Roles(RoleEnum.ADMIN)
-@Controller('auth')
 @ApiCommonErrorResponses()
+@Controller('auth')
+@Roles(RoleEnum.ADMIN)
 export class CoreAuthController {
   /**
    * Import services
@@ -36,9 +36,9 @@ export class CoreAuthController {
   /**
    * Logout user (from specific device)
    */
+  @ApiOkResponse({ type: Boolean })
   @ApiOperation({ description: 'Logs a user out from a specific device' })
   @ApiQuery({ description: 'If all devices should be logged out,', name: 'allDevices', required: false, type: Boolean })
-  @ApiOkResponse({ type: Boolean })
   @Get('logout')
   @Roles(RoleEnum.S_EVERYONE)
   @UseGuards(AuthGuard(AuthGuardStrategy.JWT))
@@ -55,8 +55,8 @@ export class CoreAuthController {
   /**
    * Refresh token (for specific device)
    */
-  @ApiOperation({ description: 'Refresh token (for specific device)' })
   @ApiOkResponse({ type: CoreAuthModel })
+  @ApiOperation({ description: 'Refresh token (for specific device)' })
   @Get('refresh-token')
   @Roles(RoleEnum.S_EVERYONE)
   @UseGuards(AuthGuard(AuthGuardStrategy.JWT_REFRESH))
@@ -72,8 +72,8 @@ export class CoreAuthController {
   /**
    * Sign in user via email and password (on specific device)
    */
-  @ApiOperation({ description: 'Sign in via email and password' })
   @ApiCreatedResponse({ description: 'Signed in successfully', type: CoreAuthModel })
+  @ApiOperation({ description: 'Sign in via email and password' })
   @Post('signin')
   @Roles(RoleEnum.S_EVERYONE)
   async signIn(@Res({ passthrough: true }) res: ResponseType, @Body() input: CoreAuthSignInInput): Promise<CoreAuthModel> {
@@ -85,8 +85,8 @@ export class CoreAuthController {
    * Register a new user account (on specific device)
    */
   @ApiBody({ type: CoreAuthSignUpInput })
-  @ApiOperation({ description: 'Sign up via email and password' })
   @ApiCreatedResponse({ type: CoreAuthSignUpInput })
+  @ApiOperation({ description: 'Sign up via email and password' })
   @Post('signup')
   @Roles(RoleEnum.S_EVERYONE)
   async signUp(@Res({ passthrough: true }) res: ResponseType, @Body() input: CoreAuthSignUpInput): Promise<CoreAuthModel> {

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

@@ -9,8 +9,8 @@ import { CoreUserModel } from '../user/core-user.model';
 /**
  * CoreAuth model for the response after the sign in
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @ObjectType({ description: 'CoreAuth', isAbstract: true })
+@Restricted(RoleEnum.S_EVERYONE)
 export class CoreAuthModel extends CoreModel {
   // ===================================================================================================================
   // Properties

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

@@ -6,10 +6,10 @@ import { PubSub } from 'graphql-subscriptions';
 
 import { AuthGuardStrategy } from './auth-guard-strategy.enum';
 import { RolesGuard } from './guards/roles.guard';
-import { CoreAuthService } from './services/core-auth.service';
 import { CoreAuthUserService } from './services/core-auth-user.service';
-import { JwtStrategy } from './strategies/jwt.strategy';
+import { CoreAuthService } from './services/core-auth.service';
 import { JwtRefreshStrategy } from './strategies/jwt-refresh.strategy';
+import { JwtStrategy } from './strategies/jwt.strategy';
 
 /**
  * CoreAuthModule to handle user authentication and enables Roles
@@ -23,13 +23,13 @@ export class CoreAuthModule {
   static forRoot(
     UserModule: Type<any>,
     UserService: Type<CoreAuthUserService>,
-    options: {
+    options: JwtModuleOptions & {
       authService?: Type<CoreAuthService>;
       imports?: Array<DynamicModule | ForwardReference | Promise<DynamicModule> | Type<any>>;
       jwtRefreshStrategy?: Type<JwtRefreshStrategy>;
       jwtStrategy?: Type<JwtStrategy>;
       providers?: Provider[];
-    } & JwtModuleOptions,
+    },
   ): DynamicModule {
     // Process imports
     let imports: any[] = [

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

@@ -20,8 +20,8 @@ import { Tokens } from './tokens.decorator';
 /**
  * Authentication resolver for the sign in
  */
+@Resolver(() => CoreAuthModel, { isAbstract: true })
 @Roles(RoleEnum.ADMIN)
-@Resolver(of => CoreAuthModel, { isAbstract: true })
 export class CoreAuthResolver {
   /**
    * Import services
@@ -38,9 +38,9 @@ export class CoreAuthResolver {
   /**
    * Logout user (from specific device)
    */
+  @Mutation(() => Boolean, { description: 'Logout user (from specific device)' })
   @Roles(RoleEnum.S_EVERYONE)
   @UseGuards(AuthGuard(AuthGuardStrategy.JWT))
-  @Mutation(returns => Boolean, { description: 'Logout user (from specific device)' })
   async logout(
     @CurrentUser() currentUser: ICoreAuthUser,
     @Context() ctx: { res: ResponseType },
@@ -54,9 +54,9 @@ export class CoreAuthResolver {
   /**
    * Refresh token (for specific device)
    */
+  @Mutation(() => CoreAuthModel, { description: 'Refresh tokens (for specific device)' })
   @Roles(RoleEnum.S_EVERYONE)
   @UseGuards(AuthGuard(AuthGuardStrategy.JWT_REFRESH))
-  @Mutation(returns => CoreAuthModel, { description: 'Refresh tokens (for specific device)' })
   async refreshToken(
     @CurrentUser() user: ICoreAuthUser,
     @Tokens('refreshToken') refreshToken: string,
@@ -69,10 +69,10 @@ export class CoreAuthResolver {
   /**
    * Sign in user via email and password (on specific device)
    */
-  @Roles(RoleEnum.S_EVERYONE)
-  @Mutation(returns => CoreAuthModel, {
+  @Mutation(() => CoreAuthModel, {
     description: 'Sign in user via email and password and get JWT tokens (for specific device)',
   })
+  @Roles(RoleEnum.S_EVERYONE)
   async signIn(
     @GraphQLServiceOptions({ gqlPath: 'signIn.user' }) serviceOptions: ServiceOptions,
     @Context() ctx: { res: ResponseType },
@@ -85,8 +85,8 @@ export class CoreAuthResolver {
   /**
    * Register a new user account (on specific device)
    */
+  @Mutation(() => CoreAuthModel, { description: 'Register a new user account (on specific device)' })
   @Roles(RoleEnum.S_EVERYONE)
-  @Mutation(returns => CoreAuthModel, { description: 'Register a new user account (on specific device)' })
   async signUp(
     @GraphQLServiceOptions({ gqlPath: 'signUp.user' }) serviceOptions: ServiceOptions,
     @Context() ctx: { res: ResponseType },

package/src/core/modules/auth/guards/auth.guard.ts

@@ -1,4 +1,4 @@
-import { CanActivate, ExecutionContext, Logger, Optional, mixin } from '@nestjs/common';
+import { CanActivate, ExecutionContext, Logger, mixin, Optional } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import { AuthModuleOptions, Type } from '@nestjs/passport';
 import { defaultOptions } from '@nestjs/passport/dist/options';
@@ -21,9 +21,9 @@ const NO_STRATEGY_ERROR
 /**
  * Interface for auth guard
  */
-export type IAuthGuard = {
+export type IAuthGuard = CanActivate & {
   handleRequest<TUser = any>(err, user, info, context): TUser;
-} & CanActivate;
+};
 
 /**
  * Create passport context

package/src/core/modules/auth/inputs/core-auth-sign-in.input.ts

@@ -9,8 +9,8 @@ import { CoreInput } from '../../../common/inputs/core-input.input';
 /**
  * SignIn input
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @InputType({ description: 'Sign-in input' })
+@Restricted(RoleEnum.S_EVERYONE)
 export class CoreAuthSignInInput extends CoreInput {
   // ===================================================================================================================
   // Properties

package/src/core/modules/auth/inputs/core-auth-sign-up.input.ts

@@ -7,6 +7,6 @@ import { CoreAuthSignInInput } from './core-auth-sign-in.input';
 /**
  * SignUp input
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @InputType({ description: 'Sign-up input' })
+@Restricted(RoleEnum.S_EVERYONE)
 export class CoreAuthSignUpInput extends CoreAuthSignInInput {}

package/src/core/modules/auth/services/core-auth.service.ts

@@ -42,7 +42,7 @@ export class CoreAuthService {
    */
   async logout(
     tokenOrRefreshToken: string,
-    serviceOptions: { allDevices?: boolean } & ServiceOptions,
+    serviceOptions: ServiceOptions & { allDevices?: boolean },
   ): Promise<boolean> {
     // Check authentication
     const user = serviceOptions.currentUser;

package/src/core/modules/auth/tokens.decorator.ts

@@ -1,4 +1,4 @@
-import { ExecutionContext, createParamDecorator } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 
 import { getContextData } from '../../common/helpers/context.helper';
 
@@ -9,7 +9,7 @@ export const Tokens = createParamDecorator(
   (
     tokenId: 'refreshToken' | 'token' | undefined,
     ctx: ExecutionContext,
-  ): { refreshToken: string; token: string } | string => {
+  ): string | { refreshToken: string; token: string } => {
     // Get prepared context (REST or GraphQL)
     const context = getContextData(ctx);
 

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

@@ -9,8 +9,8 @@ import { CoreModel } from '../../common/models/core-model.model';
 /**
  * File info
  */
-@Restricted(RoleEnum.S_EVERYONE)
 @ObjectType({ description: 'Information about file' })
+@Restricted(RoleEnum.S_EVERYONE)
 export class CoreFileInfo extends CoreModel {
   // ===========================================================================
   // Getter
@@ -25,11 +25,10 @@ export class CoreFileInfo extends CoreModel {
   // Properties
   // ===========================================================================
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => String, { description: 'ID of the file' })
+  @Restricted(RoleEnum.S_EVERYONE)
   id: string = undefined;
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => Number, {
     description:
       'The size of each chunk in bytes. GridFS divides the document into chunks of size chunkSize, '
@@ -37,25 +36,26 @@ export class CoreFileInfo extends CoreModel {
     nullable: true,
   })
   @Prop({ required: false, type: Number })
+  @Restricted(RoleEnum.S_EVERYONE)
   chunkSize: number = undefined;
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => String, { description: 'Content type', nullable: true })
   @Prop({ required: false, type: String })
+  @Restricted(RoleEnum.S_EVERYONE)
   contentType?: string = undefined;
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => String, { description: 'Name of the file', nullable: true })
   @Prop({ required: false, type: String })
+  @Restricted(RoleEnum.S_EVERYONE)
   filename?: string = undefined;
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => Number, { description: 'The size of the document in bytes', nullable: true })
   @Prop({ required: false, type: Number })
+  @Restricted(RoleEnum.S_EVERYONE)
   length: number = undefined;
 
-  @Restricted(RoleEnum.S_EVERYONE)
   @Field(() => Date, { description: 'The date the file was first stored', nullable: true })
   @Prop({ required: false, type: Date })
+  @Restricted(RoleEnum.S_EVERYONE)
   uploadDate: Date = undefined;
 }

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

@@ -7,8 +7,8 @@ import { CoreFileService } from './core-file.service';
 /**
  * File controller
  */
-@Roles(RoleEnum.ADMIN)
 @Controller('files')
+@Roles(RoleEnum.ADMIN)
 export abstract class CoreFileController {
   /**
    * Include services
@@ -18,8 +18,8 @@ export abstract class CoreFileController {
   /**
    * Download file
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Get(':filename')
+  @Roles(RoleEnum.S_EVERYONE)
   async getFile(@Param('filename') filename: string, @Res() res) {
     if (!filename) {
       throw new BadRequestException('Missing filename for download');

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

@@ -3,15 +3,15 @@ import * as GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
 
 import { Roles } from '../../common/decorators/roles.decorator';
 import { RoleEnum } from '../../common/enums/role.enum';
-import { CoreFileService } from './core-file.service';
 import { CoreFileInfo } from './core-file-info.model';
+import { CoreFileService } from './core-file.service';
 import { FileUpload } from './interfaces/file-upload.interface';
 
 /**
  * File resolver
  */
-@Roles(RoleEnum.ADMIN)
 @Resolver()
+@Roles(RoleEnum.ADMIN)
 export class CoreFileResolver {
   /**
    * Integrate services
@@ -25,8 +25,8 @@ export class CoreFileResolver {
   /**
    * Get file info
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Query(() => CoreFileInfo, { nullable: true })
+  @Roles(RoleEnum.S_EVERYONE)
   async getFileInfo(@Args({ name: 'filename', type: () => String }) filename: string): Promise<any> {
     return await this.fileService.getFileInfoByName(filename);
   }
@@ -38,8 +38,8 @@ export class CoreFileResolver {
   /**
    * Delete file
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Mutation(() => CoreFileInfo)
+  @Roles(RoleEnum.S_EVERYONE)
   async deleteFile(@Args({ name: 'filename', type: () => String }) filename: string): Promise<any> {
     return await this.fileService.deleteFileByName(filename);
   }
@@ -47,8 +47,8 @@ export class CoreFileResolver {
   /**
    * Upload file
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Mutation(() => CoreFileInfo)
+  @Roles(RoleEnum.S_EVERYONE)
   async uploadFile(@Args({ name: 'file', type: () => GraphQLUpload }) file: FileUpload): Promise<any> {
     return await this.fileService.createFile(file);
   }
@@ -56,8 +56,8 @@ export class CoreFileResolver {
   /**
    * Upload files
    */
-  @Roles(RoleEnum.S_EVERYONE)
   @Mutation(() => [CoreFileInfo])
+  @Roles(RoleEnum.S_EVERYONE)
   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

@@ -1,4 +1,4 @@
-import { MongoGridFSOptions, MongooseGridFS, createBucket } from '@lenne.tech/mongoose-gridfs';
+import { createBucket, MongoGridFSOptions, MongooseGridFS } from '@lenne.tech/mongoose-gridfs';
 import { NotFoundException } from '@nestjs/common';
 import { GridFSBucket, GridFSBucketReadStream, GridFSBucketReadStreamOptions } from 'mongodb';
 import mongoose, { Connection, Types } from 'mongoose';
@@ -127,7 +127,7 @@ export abstract class CoreFileService {
   /**
    * Get info about file via file ID
    */
-  async getFileInfo(id: Types.ObjectId | string, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+  async getFileInfo(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
     if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
       return null;
     }
@@ -155,7 +155,7 @@ export abstract class CoreFileService {
   /**
    * Get file stream (for big files) via file ID
    */
-  async getFileStream(id: Types.ObjectId | string, serviceOptions?: FileServiceOptions) {
+  async getFileStream(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions) {
     if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
       return null;
     }
@@ -178,7 +178,7 @@ export abstract class CoreFileService {
   /**
    * Get file buffer (for small files) via file ID
    */
-  async getBuffer(id: Types.ObjectId | string, serviceOptions?: FileServiceOptions): Promise<Buffer> {
+  async getBuffer(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<Buffer> {
     if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
       return null;
     }
@@ -206,7 +206,7 @@ export abstract class CoreFileService {
   /**
    * Delete file reference of avatar
    */
-  async deleteFile(id: Types.ObjectId | string, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
+  async deleteFile(id: string | Types.ObjectId, serviceOptions?: FileServiceOptions): Promise<CoreFileInfo> {
     if (!(await this.checkRights(id, { ...serviceOptions, checkInputType: 'id' }))) {
       return null;
     }
@@ -241,7 +241,7 @@ export abstract class CoreFileService {
    */
   protected checkRights(
     input: any, // eslint-disable-line unused-imports/no-unused-vars
-    options?: { checkInputType: FileInputCheckType } & FileServiceOptions, // eslint-disable-line unused-imports/no-unused-vars
+    options?: FileServiceOptions & { checkInputType: FileInputCheckType }, // eslint-disable-line unused-imports/no-unused-vars
   ): MaybePromise<boolean> {
     return true;
   }