[Fix] User setter

Author: pawelkeska

libs/api/core/src/query/module.ts

@@ -6,6 +6,7 @@ import { NestjsQueryCoreModule } from '@owl-app/nestjs-query-core';
 import { NestjsQueryTypeOrmModule } from '@owl-app/nestjs-query-typeorm';
 import { RegistryServiceModule } from '@owl-app/registry-nestjs';
 
+import BaseEntity from '../database/entity/base.entity';
 import { createPaginatedQueryServiceProvider } from '../data-provider/query/providers';
 import { PaginationConfigProvider } from '../config/pagination';
 import { TypeOrmModule } from '../typeorm/typeorm.module';
@@ -99,7 +100,7 @@ export class AppNestjsQueryTypeOrmModule {
                     name: SETTER_REGISTRY_TENANT,
                     services: {
                       tenant: TenantRelationSetter<TenantAware>,
-                      user: OwnerRelationSetter<UserAware>,
+                      user: OwnerRelationSetter<UserAware & BaseEntity>,
                     },
                   }),
                 ],

libs/api/core/src/query/typeorm/services/app-typeorm-query.service.ts

@@ -190,8 +190,6 @@ export class AppTypeOrmQueryService<Entity>
   ): Promise<Entity> {
     this.ensureIdIsNotPresent(update);
 
-    this.injectSetters(update);
-
     let entity: Entity = null;
 
     if (typeof id === 'object') {
@@ -200,6 +198,8 @@ export class AppTypeOrmQueryService<Entity>
       entity = await this.getById(id, opts);
     }
 
+    this.injectSetters(entity as DeepPartial<Entity>);
+
     this.copyRegularColumn(entity, update);
 
     if (entity instanceof DomainEventableEntity) {

libs/api/core/src/typeorm/app-typeorm.module.ts

@@ -9,6 +9,7 @@ import { AppTypeOrmOpts } from './types';
 import { DEFAULT_DATA_SOURCE_NAME } from '../contants';
 import { TypeOrmModule } from './typeorm.module';
 
+import BaseEntity from '../database/entity/base.entity';
 import { FILTER_REGISTRY_TENANT, SETTER_REGISTRY_TENANT } from '../registry/constants';
 import { TenantRelationFilter } from './filters/tenant-relation.filter';
 import { FilterQuery } from '../registry/interfaces/filter-query';
@@ -49,7 +50,7 @@ export class AppTypeOrmModule {
           name: SETTER_REGISTRY_TENANT,
           services: {
             tenant: TenantRelationSetter<TenantAware>,
-            user: OwnerRelationSetter<UserAware>,
+            user: OwnerRelationSetter<UserAware & BaseEntity>,
           },
         }),
         EventEmitter2,

libs/api/core/src/typeorm/setters/owner-relation.setter.ts

@@ -8,9 +8,10 @@ import { RequestContextService } from '../../context/app-request-context';
 
 import { USER_ENTITY } from '../../entity-tokens';
 import { EntitySetter } from '../../registry/interfaces/entity-setter';
+import BaseEntity from '../../database/entity/base.entity';
 
 @Injectable()
-export class OwnerRelationSetter<Entity extends UserAware> implements EntitySetter<Entity> {
+export class OwnerRelationSetter<Entity extends UserAware & BaseEntity> implements EntitySetter<Entity> {
   constructor(readonly configService: ConfigService) {}
 
   supports(metadata: EntityMetadata): boolean {
@@ -20,9 +21,11 @@ export class OwnerRelationSetter<Entity extends UserAware> implements EntitySett
   execute<T extends DeepPartial<Entity>>(entityOrEntities: T | T[]): void {
     if (Array.isArray(entityOrEntities)) {
       entityOrEntities.forEach((entity) => {
-        entity.user = { id: RequestContextService.getCurrentUserId() };
+        if (entity.id === null) {
+          entity.user = { id: RequestContextService.getCurrentUserId() };
+        }
       });
-    } else {
+    } else if (entityOrEntities.id === null || entityOrEntities.id === undefined) {
       entityOrEntities.user = { id: RequestContextService.getCurrentUserId() };
     }
   }