@lenne.tech/nest-server 11.1.5 → 11.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "11.1.5",
+  "version": "11.1.7",
   "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/decorators/translatable.decorator.ts

@@ -22,3 +22,28 @@ export function Translatable(): PropertyDecorator {
     Reflect.defineMetadata(TRANSLATABLE_KEY, [...existingProperties, propertyKey], target.constructor);
   };
 }
+
+export function updateLanguage<T extends Record<string, any>, K extends readonly (keyof T)[]>(
+  language: string,
+  input: any,
+  oldValue: T,
+  translatableFields: string[],
+): T {
+  const changedFields: Partial<Pick<T, K[number]>> = {};
+
+  for (const key of translatableFields) {
+    const k = key as keyof T;
+
+    if (input[k] !== oldValue[k] && input[k] !== undefined) {
+      changedFields[k] = input[k];
+      input[k] = oldValue[k] as T[typeof k];
+    }
+  }
+
+  input._translations = input._translations ?? {};
+  input._translations[language] = {
+    ...(input._translations[language] ?? {}),
+    ...changedFields,
+  };
+  return input;
+}

package/src/core/common/decorators/unified-field.decorator.ts

@@ -22,17 +22,6 @@ import { RoleEnum } from '../enums/role.enum';
 import { Restricted, RestrictedType } from './restricted.decorator';
 
 export interface UnifiedFieldOptions {
-  /**
-   * Indicates whether the property is an array.
-   *
-   * This value is typically determined automatically based on the property type or metadata.
-   *
-   * However, cases involving complex or dynamic type definitions (e.g., union types, generics, or factory functions)
-   * may result in inaccurate detection.
-   *
-   * When in doubt, explicitly set this property to ensure correct behavior.
-   */
-  array?: boolean;
   /** Description used for both Swagger & Gql */
   description?: string;
   /** Enum for class-validator */
@@ -41,10 +30,12 @@ export interface UnifiedFieldOptions {
   example?: any;
   /** Options for graphql */
   gqlOptions?: FieldOptions;
-  /** Type if Swagger & Gql types arent compatible */
+  /** Type if Swagger & Gql types aren't compatible */
   gqlType?: GraphQLScalarType | (new (...args: any[]) => any) | Record<number | string, number | string>;
   /** If the property is Any (skips all Validation) */
   isAny?: boolean;
+  /** Indicates whether the property is an array. */
+  isArray?: boolean;
   /** Default: false */
   isOptional?: boolean;
   /** Restricted roles */
@@ -75,9 +66,9 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
   return (target: any, propertyKey: string | symbol) => {
     const metadataType = Reflect.getMetadata('design:type', target, propertyKey);
     const userType = opts.type;
-    const isArrayField = opts.array === true || metadataType === Array;
+    const isArrayField = opts.isArray === true || metadataType === Array;
 
-    // Throwing because metatype only returns the generic array, but not the type of the array items
+    // Throwing because meta type only returns the generic array, but not the type of the array items
     if (metadataType === Array && !userType) {
       throw new Error(`Array field '${String(propertyKey)}' of '${String(target)}' must have an explicit type`);
     }
@@ -129,12 +120,21 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
       swaggerOpts.required = true;
     }
 
-    // Description
+    // Set type for swagger
+    if (baseType) {
+      if (opts.enum) {
+        swaggerOpts.type = () => String;
+      } else {
+        swaggerOpts.type = () => resolvedTypeFn();
+      }
+    }
+
+    // Set description
     const defaultDesc = opts.description ?? `${String(propertyKey)} of ${target.constructor.name}`;
     gqlOpts.description = gqlOpts.description ?? defaultDesc;
     swaggerOpts.description = swaggerOpts.description ?? defaultDesc;
 
-    // Swagger example
+    // Set swagger example
     if (opts.example !== undefined) {
       swaggerOpts.example = swaggerOpts.example ?? opts.example;
     }

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

@@ -53,7 +53,7 @@ export abstract class CoreUserInput extends CoreInput {
    */
   @Restricted({ processType: ProcessType.INPUT, roles: RoleEnum.ADMIN })
   @UnifiedField({
-    array: true,
+    isArray: true,
     isOptional: true,
     type: String,
   })

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

@@ -1,4 +1,5 @@
-import { InputType } from '@nestjs/graphql';
+import { Field, InputType } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
 
 import { Restricted } from '../../../../core/common/decorators/restricted.decorator';
 import { RoleEnum } from '../../../../core/common/enums/role.enum';
@@ -11,4 +12,11 @@ import { CoreUserCreateInput } from '../../../../core/modules/user/inputs/core-u
 @Restricted(RoleEnum.ADMIN)
 export class UserCreateInput extends CoreUserCreateInput {
   // Extend UserCreateInput here
+  @Field(() => String, {
+    description: 'Job Title of the user',
+    nullable: true,
+  })
+  @IsOptional()
+  @Restricted(RoleEnum.ADMIN)
+  jobTitle?: string = undefined;
 }

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

@@ -1,4 +1,5 @@
-import { InputType } from '@nestjs/graphql';
+import { Field, InputType } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
 
 import { Restricted } from '../../../../core/common/decorators/restricted.decorator';
 import { RoleEnum } from '../../../../core/common/enums/role.enum';
@@ -11,4 +12,11 @@ import { CoreUserInput } from '../../../../core/modules/user/inputs/core-user.in
 @Restricted(RoleEnum.ADMIN)
 export class UserInput extends CoreUserInput {
   // Extend UserInput here
+  @Field(() => String, {
+    description: 'Job Title of the user',
+    nullable: true,
+  })
+  @IsOptional()
+  @Restricted(RoleEnum.ADMIN)
+  jobTitle?: string = undefined;
 }

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

@@ -9,8 +9,8 @@ import { User } from '../user.model';
 @Restricted(RoleEnum.ADMIN)
 export class FindAndCountUsersResult {
   @UnifiedField({
-    array: true,
     description: 'Found users',
+    isArray: true,
     isOptional: true,
     type: () => User,
   })

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

@@ -4,6 +4,7 @@ import { IsEmail, IsOptional } from 'class-validator';
 import { Document, Schema } from 'mongoose';
 
 import { Restricted } from '../../../core/common/decorators/restricted.decorator';
+import { Translatable } from '../../../core/common/decorators/translatable.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { CoreUserModel } from '../../../core/modules/user/core-user.model';
 import { PersistenceModel } from '../../common/models/persistence.model';
@@ -60,6 +61,15 @@ export class User extends CoreUserModel implements PersistenceModel {
   @Restricted(RoleEnum.S_EVERYONE)
   override roles: string[] = undefined;
 
+  @Field(() => String, {
+    description: 'Job title of user',
+    nullable: true,
+  })
+  @Prop()
+  @Restricted(RoleEnum.S_EVERYONE)
+  @Translatable()
+  jobTitle?: string = undefined;
+
   /**
    * ID of the user who updated the object
    *
@@ -73,6 +83,10 @@ export class User extends CoreUserModel implements PersistenceModel {
   @Restricted(RoleEnum.S_USER)
   updatedBy: string = undefined;
 
+  @Prop({ default: {}, type: Schema.Types.Mixed })
+  @Restricted(RoleEnum.S_EVERYONE)
+  _translations?: Record<string, Partial<User>> = undefined;
+
   // ===================================================================================================================
   // Methods
   // ===================================================================================================================

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

@@ -4,6 +4,7 @@ import fs = require('fs');
 import { PubSub } from 'graphql-subscriptions';
 import { Model } from 'mongoose';
 
+import { getTranslatablePropertyKeys, updateLanguage } from '../../../core/common/decorators/translatable.decorator';
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
 import { ConfigService } from '../../../core/common/services/config.service';
 import { EmailService } from '../../../core/common/services/email.service';
@@ -62,6 +63,14 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     return user;
   }
 
+  override async update(id: string, input: UserInput, serviceOptions?: ServiceOptions): Promise<User> {
+    const dbObject = await super.get(id, serviceOptions);
+    if (serviceOptions.language && serviceOptions.language !== 'de') {
+      input = updateLanguage(serviceOptions.language, input, dbObject as UserInput, getTranslatablePropertyKeys(User));
+    }
+    return super.update(id, input, serviceOptions);
+  }
+
   /**
    * Request password reset mail
    */

package/src/test/test.helper.ts

@@ -83,6 +83,11 @@ export interface TestGraphQLOptions {
    */
   countOfSubscriptionMessages?: number;
 
+  /**
+   * Language selected by user
+   */
+  language?: string;
+
   /**
    * Output information in the console
    */
@@ -225,6 +230,7 @@ export class TestHelper {
     const config = {
       convertEnums: true,
       countOfSubscriptionMessages: 1,
+      language: null,
       log: false,
       logError: false,
       prepareArguments: true,
@@ -234,7 +240,7 @@ export class TestHelper {
     };
 
     // Init vars
-    const { log, logError, statusCode, token, variables } = config;
+    const { language, log, logError, statusCode, token, variables } = config;
 
     // Init
     let query = '';
@@ -337,6 +343,10 @@ export class TestHelper {
       requestConfig.headers = { authorization: `Bearer ${token}` };
     }
 
+    if (language) {
+      requestConfig.headers = { ...requestConfig.headers, 'accept-language': language };
+    }
+
     // Get response
     const response = await this.getResponse(token, requestConfig, statusCode, log, logError, variables);