@lenne.tech/nest-server 11.0.1 → 11.1.1

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

@@ -1,7 +1,8 @@
-import { Field, InputType } from '@nestjs/graphql';
+import { InputType } from '@nestjs/graphql';
 import { IsEmail } from 'class-validator';
 
 import { Restricted } from '../../../common/decorators/restricted.decorator';
+import { UnifiedField } from '../../../common/decorators/unified-field.decorator';
 import { RoleEnum } from '../../../common/enums/role.enum';
 import { CoreUserInput } from './core-user.input';
 
@@ -15,8 +16,10 @@ import { CoreUserInput } from './core-user.input';
 @InputType({ description: 'User input to create a new user', isAbstract: true })
 @Restricted(RoleEnum.S_EVERYONE)
 export abstract class CoreUserCreateInput extends CoreUserInput {
-  @Field({ description: 'Email of the user', nullable: false })
-  @IsEmail()
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Email of the user',
+    roles: RoleEnum.S_EVERYONE,
+    validator: () => [IsEmail()],
+  })
   override email: string = undefined;
 }

package/src/core/modules/user/inputs/core-user.input.ts

@@ -1,7 +1,8 @@
-import { Field, InputType } from '@nestjs/graphql';
-import { IsEmail, IsOptional } from 'class-validator';
+import { InputType } from '@nestjs/graphql';
+import { IsEmail } from 'class-validator';
 
 import { Restricted } from '../../../common/decorators/restricted.decorator';
+import { UnifiedField } from '../../../common/decorators/unified-field.decorator';
 import { ProcessType } from '../../../common/enums/process-type.enum';
 import { RoleEnum } from '../../../common/enums/role.enum';
 import { CoreInput } from '../../../common/inputs/core-input.input';
@@ -19,49 +20,62 @@ export abstract class CoreUserInput extends CoreInput {
   /**
    * Email of the user
    */
-  @Field({ description: 'Email of the user', nullable: true })
-  @IsEmail()
-  @IsOptional()
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Email of the user',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+    validator: () => [IsEmail()],
+  })
   email?: string = undefined;
 
   /**
    * First name of the user
    */
-  @Field({ description: 'First name of the user', nullable: true })
-  @IsOptional()
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Last name of the user',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+  })
   firstName?: string = undefined;
 
   /**
    * Last name of the user
    */
-  @Field({ description: 'Last name of the user', nullable: true })
-  @IsOptional()
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Last name of the user',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+  })
   lastName?: string = undefined;
 
   /**
    * Roles of the user
    */
-  @Field(() => [String], { description: 'Roles of the user', nullable: true })
-  @IsOptional()
   @Restricted({ processType: ProcessType.INPUT, roles: RoleEnum.ADMIN })
+  @UnifiedField({
+    array: true,
+    isOptional: true,
+    type: String,
+  })
   roles?: string[] = undefined;
 
   /**
    * Username / alias of the user
    */
-  @Field({ description: 'Username / alias of the user', nullable: true })
-  @IsOptional()
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Username / alias of the user',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+  })
   username?: string = undefined;
 
   /**
    * Password of the user
    */
-  @Field({ description: 'Password of the user', nullable: true })
-  @IsOptional()
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Password of the user',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+  })
   password?: string = undefined;
 }

package/src/core.module.ts

@@ -4,6 +4,7 @@ import { APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Context } from 'apollo-server-core';
+import graphqlUploadExpress = require('graphql-upload/graphqlUploadExpress.js');
 import mongoose from 'mongoose';
 
 import { merge } from './core/common/helpers/config.helper';
@@ -19,8 +20,6 @@ import { ModelDocService } from './core/common/services/model-doc.service';
 import { TemplateService } from './core/common/services/template.service';
 import { CoreHealthCheckModule } from './core/modules/health-check/core-health-check.module';
 
-import graphqlUploadExpress = require('graphql-upload/graphqlUploadExpress.js');
-
 /**
  * Core module (dynamic)
  *

package/src/index.ts

@@ -19,6 +19,7 @@ export * from './core/common/decorators/rest-user.decorator';
 export * from './core/common/decorators/restricted.decorator';
 export * from './core/common/decorators/roles.decorator';
 export * from './core/common/decorators/translatable.decorator';
+export * from './core/common/decorators/unified-field.decorator';
 export * from './core/common/enums/comparison-operator.enum';
 export * from './core/common/enums/logical-operator.enum';
 export * from './core/common/enums/process-type.enum';

package/src/main.ts

@@ -1,14 +1,13 @@
 import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { exec } from 'child_process';
+import compression = require('compression');
+import cookieParser = require('cookie-parser');
 
 import envConfig from './config.env';
 import { HttpExceptionLogFilter } from './core/common/filters/http-exception-log.filter';
 import { ServerModule } from './server/server.module';
 
-import compression = require('compression');
-import cookieParser = require('cookie-parser');
-
 /**
  * Preparations for server start
  */

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

@@ -2,14 +2,13 @@ import { Field, ObjectType } from '@nestjs/graphql';
 import { Prop } from '@nestjs/mongoose';
 import { ApiExtraModels, ApiProperty } from '@nestjs/swagger';
 import { Types } from 'mongoose';
+import mongoose = require('mongoose');
 
 import { Restricted } from '../../../core/common/decorators/restricted.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { CorePersistenceModel } from '../../../core/common/models/core-persistence.model';
 import { User } from '../../modules/user/user.model';
 
-import mongoose = require('mongoose');
-
 /**
  * Metadata for persistent objects
  *

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

@@ -1,6 +1,7 @@
-import { Field, InputType } from '@nestjs/graphql';
+import { InputType } from '@nestjs/graphql';
 
 import { Restricted } from '../../../../core/common/decorators/restricted.decorator';
+import { UnifiedField } from '../../../../core/common/decorators/unified-field.decorator';
 import { RoleEnum } from '../../../../core/common/enums/role.enum';
 import { CoreAuthSignUpInput } from '../../../../core/modules/auth/inputs/core-auth-sign-up.input';
 
@@ -14,11 +15,17 @@ export class AuthSignUpInput extends CoreAuthSignUpInput {
   // Properties
   // ===================================================================================================================
 
-  @Field({ description: 'firstName', nullable: true })
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'firstName',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+  })
   firstName: string = undefined;
 
-  @Field({ description: 'lastName', nullable: true })
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'lastName',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+  })
   lastName: string = undefined;
 }

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

@@ -1,5 +1,7 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 import { createWriteStream } from 'fs';
+import fs = require('fs');
+import GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
 
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
@@ -7,9 +9,6 @@ import { FileUpload } from '../../../core/modules/file/interfaces/file-upload.in
 import { FileInfo } from './file-info.model';
 import { FileService } from './file.service';
 
-import fs = require('fs');
-import GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
-
 /**
  * File resolver
  */

package/src/server/modules/user/outputs/find-and-count-users-result.output.ts

@@ -1,17 +1,24 @@
-import { Field, ObjectType } from '@nestjs/graphql';
+import { ObjectType } from '@nestjs/graphql';
 
 import { Restricted } from '../../../../core/common/decorators/restricted.decorator';
+import { UnifiedField } from '../../../../core/common/decorators/unified-field.decorator';
 import { RoleEnum } from '../../../../core/common/enums/role.enum';
 import { User } from '../user.model';
 
 @ObjectType({ description: 'Result of find and count' })
 @Restricted(RoleEnum.ADMIN)
 export class FindAndCountUsersResult {
-  @Field(() => [User], { description: 'Found users' })
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    array: true,
+    description: 'Found users',
+    isOptional: true,
+    type: () => User,
+  })
   items: User[];
 
-  @Field({ description: 'Total count (skip/offset and limit/take are ignored in the count)' })
-  @Restricted(RoleEnum.S_EVERYONE)
+  @UnifiedField({
+    description: 'Total count (skip/offset and limit/take are ignored in the count)',
+    isOptional: false,
+  })
   totalCount: number;
 }

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

@@ -116,6 +116,8 @@ export class User extends CoreUserModel implements PersistenceModel {
       this.createdBy = null;
       this.updatedAt = null;
       this.updatedBy = null;
+      this.createdTs = null;
+      this.updatedAt = null;
     }
 
     // Return prepared user

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

@@ -1,5 +1,6 @@
 import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
+import fs = require('fs');
 import { PubSub } from 'graphql-subscriptions';
 import { Model } from 'mongoose';
 
@@ -12,8 +13,6 @@ import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
 import { User, UserDocument } from './user.model';
 
-import fs = require('fs');
-
 /**
  * User service
  */

package/src/test/test.helper.ts

@@ -3,13 +3,12 @@ import { Blob } from 'buffer';
 import { createClient } from 'graphql-ws';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import { Types } from 'mongoose';
-
-import { getStringIds } from '../core/common/helpers/db.helper';
-
 import supertest = require('supertest');
 import util = require('util');
 import ws = require('ws');
 
+import { getStringIds } from '../core/common/helpers/db.helper';
+
 /**
  * GraphQL request type
  */