@forklaunch/implementation-iam-base 0.1.17 → 0.2.0

package/lib/eject/services/organization.service.ts

@@ -1,14 +1,14 @@
 import { IdDto, InstanceTypeRecord } from '@forklaunch/common';
+import {
+  MetricsDefinition,
+  OpenTelemetryCollector
+} from '@forklaunch/core/http';
 import {
   InternalDtoMapper,
   RequestDtoMapperConstructor,
   ResponseDtoMapperConstructor,
   transformIntoInternalDtoMapper
 } from '@forklaunch/core/mappers';
-import {
-  MetricsDefinition,
-  OpenTelemetryCollector
-} from '@forklaunch/core/http';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
 import { OrganizationService } from '@forklaunch/interfaces-iam/interfaces';
 import {
@@ -61,8 +61,8 @@ export class BaseOrganizationService<
   }
 > implements OrganizationService<OrganizationStatus>
 {
-  #mapperss: InternalDtoMapper<
-    InstanceTypeRecord<typeof this.mapperss>,
+  #mappers: InternalDtoMapper<
+    InstanceTypeRecord<typeof this.mappers>,
     Entities,
     Dto
   >;
@@ -71,7 +71,7 @@ export class BaseOrganizationService<
     public em: EntityManager,
     protected openTelemetryCollector: OpenTelemetryCollector<Metrics>,
     protected schemaValidator: SchemaValidator,
-    protected mapperss: {
+    protected mappers: {
       OrganizationDtoMapper: ResponseDtoMapperConstructor<
         SchemaValidator,
         Dto['OrganizationDtoMapper'],
@@ -89,7 +89,7 @@ export class BaseOrganizationService<
       >;
     }
   ) {
-    this.#mapperss = transformIntoInternalDtoMapper(mapperss, schemaValidator);
+    this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
   }
 
   async createOrganization(
@@ -98,14 +98,14 @@ export class BaseOrganizationService<
   ): Promise<Dto['OrganizationDtoMapper']> {
     this.openTelemetryCollector.log('info', 'Creating organization');
     const organization =
-      this.#mapperss.CreateOrganizationDtoMapper.deserializeDtoToEntity(
+      await this.#mappers.CreateOrganizationDtoMapper.deserializeDtoToEntity(
         organizationDto
       );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(organization);
     });
 
-    return this.#mapperss.OrganizationDtoMapper.serializeEntityToDto(
+    return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       organization
     );
   }
@@ -118,7 +118,7 @@ export class BaseOrganizationService<
       'Organization',
       idDto
     );
-    return this.#mapperss.OrganizationDtoMapper.serializeEntityToDto(
+    return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       organization as Entities['OrganizationDtoMapper']
     );
   }
@@ -128,11 +128,11 @@ export class BaseOrganizationService<
     em?: EntityManager
   ): Promise<Dto['OrganizationDtoMapper']> {
     const updatedOrganization =
-      this.#mapperss.UpdateOrganizationDtoMapper.deserializeDtoToEntity(
+      await this.#mappers.UpdateOrganizationDtoMapper.deserializeDtoToEntity(
         organizationDto
       );
     await (em ?? this.em).upsert(updatedOrganization);
-    return this.#mapperss.OrganizationDtoMapper.serializeEntityToDto(
+    return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       updatedOrganization
     );
   }

package/lib/eject/services/permission.service.ts

@@ -4,16 +4,16 @@ import {
 } from '@forklaunch/interfaces-iam/interfaces';
 
 import { IdDto, IdsDto, InstanceTypeRecord } from '@forklaunch/common';
+import {
+  MetricsDefinition,
+  OpenTelemetryCollector
+} from '@forklaunch/core/http';
 import {
   InternalDtoMapper,
   RequestDtoMapperConstructor,
   ResponseDtoMapperConstructor,
   transformIntoInternalDtoMapper
 } from '@forklaunch/core/mappers';
-import {
-  MetricsDefinition,
-  OpenTelemetryCollector
-} from '@forklaunch/core/http';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
 import {
   CreatePermissionDto,
@@ -51,8 +51,8 @@ export class BasePermissionService<
   }
 > implements PermissionService
 {
-  #mapperss: InternalDtoMapper<
-    InstanceTypeRecord<typeof this.mapperss>,
+  #mappers: InternalDtoMapper<
+    InstanceTypeRecord<typeof this.mappers>,
     Entities,
     Dto
   >;
@@ -62,7 +62,7 @@ export class BasePermissionService<
     protected roleServiceFactory: () => RoleService,
     protected openTelemetryCollector: OpenTelemetryCollector<Metrics>,
     protected schemaValidator: SchemaValidator,
-    protected mapperss: {
+    protected mappers: {
       PermissionDtoMapper: ResponseDtoMapperConstructor<
         SchemaValidator,
         Dto['PermissionDtoMapper'],
@@ -85,7 +85,7 @@ export class BasePermissionService<
       >;
     }
   ) {
-    this.#mapperss = transformIntoInternalDtoMapper(mapperss, schemaValidator);
+    this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
   }
 
   // start: global helper functions
@@ -93,7 +93,7 @@ export class BasePermissionService<
     roles: Entities['RoleDtoMapper'][],
     permissions: Entities['PermissionDtoMapper'][]
   ): Promise<Entities['RoleDtoMapper'][]> {
-    return await Promise.all(
+    return Promise.all(
       roles.map(async (role) => {
         permissions.forEach((permission) => role.permissions.add(permission));
         return role;
@@ -105,7 +105,7 @@ export class BasePermissionService<
     roles: Entities['RoleDtoMapper'][],
     permissions: Entities['PermissionDtoMapper'][]
   ): Promise<Entities['RoleDtoMapper'][]> {
-    return await Promise.all(
+    return Promise.all(
       roles.map(async (role) => {
         permissions.forEach((permission) =>
           role.permissions.remove(permission)
@@ -120,12 +120,14 @@ export class BasePermissionService<
     em?: EntityManager
   ): Promise<Entities['RoleDtoMapper'][]> {
     return roleIds
-      ? (await this.roleServiceFactory().getBatchRoles(roleIds, em)).map(
-          (role) => {
-            return (em ?? this.em).merge(
-              this.#mapperss.RoleDtoMapper.deserializeDtoToEntity(role)
-            );
-          }
+      ? await Promise.all(
+          (await this.roleServiceFactory().getBatchRoles(roleIds, em)).map(
+            async (role) => {
+              return (em ?? this.em).merge(
+                await this.#mappers.RoleDtoMapper.deserializeDtoToEntity(role)
+              );
+            }
+          )
         )
       : [];
   }
@@ -159,7 +161,7 @@ export class BasePermissionService<
   }> {
     return {
       permission: (em ?? this.em).merge(
-        this.#mapperss.CreatePermissionDtoMapper.deserializeDtoToEntity(
+        await this.#mappers.CreatePermissionDtoMapper.deserializeDtoToEntity(
           permissionDto
         )
       ),
@@ -180,7 +182,7 @@ export class BasePermissionService<
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist([permission, ...roles]);
     });
-    return this.#mapperss.PermissionDtoMapper.serializeEntityToDto(permission);
+    return this.#mappers.PermissionDtoMapper.serializeEntityToDto(permission);
   }
 
   async createBatchPermissions(
@@ -219,8 +221,10 @@ export class BasePermissionService<
       ]);
     });
 
-    return permissions.map((permission) =>
-      this.#mapperss.PermissionDtoMapper.serializeEntityToDto(permission)
+    return Promise.all(
+      permissions.map(async (permission) =>
+        this.#mappers.PermissionDtoMapper.serializeEntityToDto(permission)
+      )
     );
   }
 
@@ -229,7 +233,7 @@ export class BasePermissionService<
     em?: EntityManager
   ): Promise<Dto['PermissionDtoMapper']> {
     const permission = await (em ?? this.em).findOneOrFail('Permission', idDto);
-    return this.#mapperss.PermissionDtoMapper.serializeEntityToDto(
+    return this.#mappers.PermissionDtoMapper.serializeEntityToDto(
       permission as Entities['PermissionDtoMapper']
     );
   }
@@ -238,11 +242,12 @@ export class BasePermissionService<
     idsDto: IdsDto,
     em?: EntityManager
   ): Promise<Dto['PermissionDtoMapper'][]> {
-    return (await (em ?? this.em).find('Permission', idsDto)).map(
-      (permission) =>
-        this.#mapperss.PermissionDtoMapper.serializeEntityToDto(
+    return Promise.all(
+      (await (em ?? this.em).find('Permission', idsDto)).map((permission) =>
+        this.#mappers.PermissionDtoMapper.serializeEntityToDto(
           permission as Entities['PermissionDtoMapper']
         )
+      )
     );
   }
 
@@ -255,7 +260,7 @@ export class BasePermissionService<
     roles: Entities['RoleDtoMapper'][];
   }> => {
     const permission =
-      this.#mapperss.UpdatePermissionDtoMapper.deserializeDtoToEntity(
+      await this.#mappers.UpdatePermissionDtoMapper.deserializeDtoToEntity(
         permissionDto
       );
     const addToRoles = permissionDto.addToRolesIds
@@ -290,7 +295,7 @@ export class BasePermissionService<
     if (!em) {
       this.em.flush();
     }
-    return this.#mapperss.PermissionDtoMapper.serializeEntityToDto(permission);
+    return this.#mappers.PermissionDtoMapper.serializeEntityToDto(permission);
   }
 
   async updateBatchPermissions(
@@ -325,8 +330,10 @@ export class BasePermissionService<
       ]);
     });
 
-    return permissions.map((permission) =>
-      this.#mapperss.PermissionDtoMapper.serializeEntityToDto(permission)
+    return Promise.all(
+      permissions.map((permission) =>
+        this.#mappers.PermissionDtoMapper.serializeEntityToDto(permission)
+      )
     );
   }
 

package/lib/eject/services/role.service.ts

@@ -55,8 +55,8 @@ export class BaseRoleService<
   }
 > implements RoleService
 {
-  #mapperss: InternalDtoMapper<
-    InstanceTypeRecord<typeof this.mapperss>,
+  #mappers: InternalDtoMapper<
+    InstanceTypeRecord<typeof this.mappers>,
     Entities,
     Dto
   >;
@@ -65,7 +65,7 @@ export class BaseRoleService<
     public em: EntityManager,
     protected openTelemetryCollector: OpenTelemetryCollector<Metrics>,
     protected schemaValidator: SchemaValidator,
-    protected mapperss: {
+    protected mappers: {
       RoleDtoMapper: ResponseDtoMapperConstructor<
         SchemaValidator,
         Dto['RoleDtoMapper'],
@@ -83,20 +83,17 @@ export class BaseRoleService<
       >;
     }
   ) {
-    this.#mapperss = transformIntoInternalDtoMapper(mapperss, schemaValidator);
+    this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
   }
 
   async createRole(
     roleDto: Dto['CreateRoleDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['RoleDtoMapper']> {
-    // TODO: Think about removing static method here, since we need specific args
     const role =
-      this.#mapperss.CreateRoleDtoMapper.deserializeDtoToEntity(roleDto);
+      await this.#mappers.CreateRoleDtoMapper.deserializeDtoToEntity(roleDto);
     await (em ?? this.em).transactional((em) => em.persist(role));
-    return this.#mapperss.RoleDtoMapper.serializeEntityToDto(
-      role as Entities['RoleDtoMapper']
-    );
+    return this.#mappers.RoleDtoMapper.serializeEntityToDto(role);
   }
 
   async createBatchRoles(
@@ -105,13 +102,13 @@ export class BaseRoleService<
   ): Promise<Dto['RoleDtoMapper'][]> {
     const roles = await Promise.all(
       roleDtos.map(async (roleDto) =>
-        this.#mapperss.CreateRoleDtoMapper.deserializeDtoToEntity(roleDto)
+        this.#mappers.CreateRoleDtoMapper.deserializeDtoToEntity(roleDto)
       )
     );
     await (em ?? this.em).transactional((em) => em.persist(roles));
-    return roles.map((role) =>
-      this.#mapperss.RoleDtoMapper.serializeEntityToDto(
-        role as Entities['RoleDtoMapper']
+    return Promise.all(
+      roles.map((role) =>
+        this.#mappers.RoleDtoMapper.serializeEntityToDto(role)
       )
     );
   }
@@ -120,19 +117,21 @@ export class BaseRoleService<
     const role = await (em ?? this.em).findOneOrFail('Role', idDto, {
       populate: ['id', '*']
     });
-    return this.#mapperss.RoleDtoMapper.serializeEntityToDto(
+    return this.#mappers.RoleDtoMapper.serializeEntityToDto(
       role as Entities['RoleDtoMapper']
     );
   }
 
   async getBatchRoles(idsDto: IdsDto, em?: EntityManager): Promise<RoleDto[]> {
-    return (
-      await (em ?? this.em).find('Role', idsDto, {
-        populate: ['id', '*']
-      })
-    ).map((role) =>
-      this.#mapperss.RoleDtoMapper.serializeEntityToDto(
-        role as Entities['RoleDtoMapper']
+    return Promise.all(
+      (
+        await (em ?? this.em).find('Role', idsDto, {
+          populate: ['id', '*']
+        })
+      ).map((role) =>
+        this.#mappers.RoleDtoMapper.serializeEntityToDto(
+          role as Entities['RoleDtoMapper']
+        )
       )
     );
   }
@@ -141,13 +140,12 @@ export class BaseRoleService<
     roleDto: Dto['UpdateRoleDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['RoleDtoMapper']> {
-    let role = this.#mapperss.UpdateRoleDtoMapper.deserializeDtoToEntity(
-      roleDto
-    ) as Entities['RoleDtoMapper'];
+    let role =
+      await this.#mappers.UpdateRoleDtoMapper.deserializeDtoToEntity(roleDto);
     await (em ?? this.em).transactional(async (em) => {
       role = (await em.upsert('Role', role)) as Entities['RoleDtoMapper'];
     });
-    return this.#mapperss.RoleDtoMapper.serializeEntityToDto(role);
+    return this.#mappers.RoleDtoMapper.serializeEntityToDto(role);
   }
 
   async updateBatchRoles(
@@ -156,15 +154,17 @@ export class BaseRoleService<
   ): Promise<Dto['RoleDtoMapper'][]> {
     let roles = await Promise.all(
       roleDtos.map(async (roleDto) =>
-        this.#mapperss.UpdateRoleDtoMapper.deserializeDtoToEntity(roleDto)
+        this.#mappers.UpdateRoleDtoMapper.deserializeDtoToEntity(roleDto)
       )
     );
     await (em ?? this.em).transactional(async (em) => {
       roles = await em.upsertMany('Role', roles);
     });
-    return roles.map((role) =>
-      this.#mapperss.RoleDtoMapper.serializeEntityToDto(
-        role as Entities['RoleDtoMapper']
+    return Promise.all(
+      roles.map((role) =>
+        this.#mappers.RoleDtoMapper.serializeEntityToDto(
+          role as Entities['RoleDtoMapper']
+        )
       )
     );
   }

package/lib/eject/services/user.service.ts

@@ -5,16 +5,16 @@ import {
 } from '@forklaunch/interfaces-iam/interfaces';
 
 import { IdDto, IdsDto, InstanceTypeRecord } from '@forklaunch/common';
+import {
+  MetricsDefinition,
+  OpenTelemetryCollector
+} from '@forklaunch/core/http';
 import {
   InternalDtoMapper,
   RequestDtoMapperConstructor,
   ResponseDtoMapperConstructor,
   transformIntoInternalDtoMapper
 } from '@forklaunch/core/mappers';
-import {
-  MetricsDefinition,
-  OpenTelemetryCollector
-} from '@forklaunch/core/http';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
 import {
   CreateUserDto,
@@ -48,8 +48,8 @@ export class BaseUserService<
   }
 > implements UserService
 {
-  #mapperss: InternalDtoMapper<
-    InstanceTypeRecord<typeof this.mapperss>,
+  #mappers: InternalDtoMapper<
+    InstanceTypeRecord<typeof this.mappers>,
     Entities,
     Dto
   >;
@@ -61,7 +61,7 @@ export class BaseUserService<
     protected organizationServiceFactory: () => OrganizationService<OrganizationStatus>,
     protected openTelemetryCollector: OpenTelemetryCollector<Metrics>,
     protected schemaValidator: SchemaValidator,
-    protected mapperss: {
+    protected mappers: {
       UserDtoMapper: ResponseDtoMapperConstructor<
         SchemaValidator,
         Dto['UserDtoMapper'],
@@ -74,7 +74,7 @@ export class BaseUserService<
         (
           dto: never,
           passwordEncryptionPublicKeyPath: string
-        ) => Entities['UpdateUserDtoMapper']
+        ) => Promise<Entities['UpdateUserDtoMapper']>
       >;
       UpdateUserDtoMapper: RequestDtoMapperConstructor<
         SchemaValidator,
@@ -83,26 +83,25 @@ export class BaseUserService<
         (
           dto: never,
           passwordEncryptionPublicKeyPath: string
-        ) => Entities['UpdateUserDtoMapper']
+        ) => Promise<Entities['UpdateUserDtoMapper']>
       >;
     }
   ) {
-    this.#mapperss = transformIntoInternalDtoMapper(mapperss, schemaValidator);
+    this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
   }
 
   async createUser(
     userDto: Dto['CreateUserDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper']> {
-    const user =
-      await this.#mapperss.CreateUserDtoMapper.deserializeDtoToEntity(
-        userDto,
-        this.passwordEncryptionPublicKeyPath
-      );
+    const user = await this.#mappers.CreateUserDtoMapper.deserializeDtoToEntity(
+      userDto,
+      this.passwordEncryptionPublicKeyPath
+    );
     ((await em) ?? this.em).transactional(async (em) => {
       await em.persist(user);
     });
-    return this.#mapperss.UserDtoMapper.serializeEntityToDto(user);
+    return this.#mappers.UserDtoMapper.serializeEntityToDto(user);
   }
 
   async createBatchUsers(
@@ -111,7 +110,7 @@ export class BaseUserService<
   ): Promise<Dto['UserDtoMapper'][]> {
     const users = await Promise.all(
       userDtos.map(async (createUserDto) =>
-        this.#mapperss.CreateUserDtoMapper.deserializeDtoToEntity(
+        this.#mappers.CreateUserDtoMapper.deserializeDtoToEntity(
           createUserDto,
           this.passwordEncryptionPublicKeyPath
         )
@@ -121,8 +120,10 @@ export class BaseUserService<
       await em.persist(users);
     });
 
-    return users.map((user) =>
-      this.#mapperss.UserDtoMapper.serializeEntityToDto(user)
+    return Promise.all(
+      users.map((user) =>
+        this.#mappers.UserDtoMapper.serializeEntityToDto(user)
+      )
     );
   }
 
@@ -133,7 +134,7 @@ export class BaseUserService<
     const user = await (em ?? this.em).findOneOrFail('User', idDto, {
       populate: ['id', '*']
     });
-    return this.#mapperss.UserDtoMapper.serializeEntityToDto(
+    return this.#mappers.UserDtoMapper.serializeEntityToDto(
       user as Entities['UserDtoMapper']
     );
   }
@@ -142,13 +143,15 @@ export class BaseUserService<
     idsDto: IdsDto,
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper'][]> {
-    return (
-      await (em ?? this.em).find('User', idsDto, {
-        populate: ['id', '*']
-      })
-    ).map((user) =>
-      this.#mapperss.UserDtoMapper.serializeEntityToDto(
-        user as Entities['UserDtoMapper']
+    return Promise.all(
+      (
+        await (em ?? this.em).find('User', idsDto, {
+          populate: ['id', '*']
+        })
+      ).map((user) =>
+        this.#mappers.UserDtoMapper.serializeEntityToDto(
+          user as Entities['UserDtoMapper']
+        )
       )
     );
   }
@@ -157,14 +160,14 @@ export class BaseUserService<
     userDto: Dto['UpdateUserDtoMapper'],
     em?: EntityManager
   ): Promise<Dto['UserDtoMapper']> {
-    let user = this.#mapperss.UpdateUserDtoMapper.deserializeDtoToEntity(
+    let user = await this.#mappers.UpdateUserDtoMapper.deserializeDtoToEntity(
       userDto,
       this.passwordEncryptionPublicKeyPath
     );
     await (em ?? this.em).transactional(async (localEm) => {
       user = await localEm.upsert(user);
     });
-    return this.#mapperss.UserDtoMapper.serializeEntityToDto(user);
+    return this.#mappers.UserDtoMapper.serializeEntityToDto(user);
   }
 
   async updateBatchUsers(
@@ -173,7 +176,7 @@ export class BaseUserService<
   ): Promise<Dto['UserDtoMapper'][]> {
     let users = await Promise.all(
       userDtos.map(async (updateUserDto) =>
-        this.#mapperss.UpdateUserDtoMapper.deserializeDtoToEntity(
+        this.#mappers.UpdateUserDtoMapper.deserializeDtoToEntity(
           updateUserDto,
           this.passwordEncryptionPublicKeyPath
         )
@@ -182,8 +185,10 @@ export class BaseUserService<
     await (em ?? this.em).transactional(async (localEm) => {
       users = await localEm.upsertMany(users);
     });
-    return users.map((user) =>
-      this.#mapperss.UserDtoMapper.serializeEntityToDto(user)
+    return Promise.all(
+      users.map((user) =>
+        this.#mappers.UserDtoMapper.serializeEntityToDto(user)
+      )
     );
   }
 

package/lib/services/organization.service.d.ts

@@ -1,12 +1,12 @@
 import { IdDto } from '@forklaunch/common';
-import {
-  RequestDtoMapperConstructor,
-  ResponseDtoMapperConstructor
-} from '@forklaunch/core/mappers';
 import {
   MetricsDefinition,
   OpenTelemetryCollector
 } from '@forklaunch/core/http';
+import {
+  RequestDtoMapperConstructor,
+  ResponseDtoMapperConstructor
+} from '@forklaunch/core/mappers';
 import { MapNestedDtoArraysToCollections } from '@forklaunch/core/services';
 import { OrganizationService } from '@forklaunch/interfaces-iam/interfaces';
 import {
@@ -62,7 +62,7 @@ export declare class BaseOrganizationService<
   em: EntityManager;
   protected openTelemetryCollector: OpenTelemetryCollector<Metrics>;
   protected schemaValidator: SchemaValidator;
-  protected mapperss: {
+  protected mappers: {
     OrganizationDtoMapper: ResponseDtoMapperConstructor<
       SchemaValidator,
       Dto['OrganizationDtoMapper'],
@@ -83,7 +83,7 @@ export declare class BaseOrganizationService<
     em: EntityManager,
     openTelemetryCollector: OpenTelemetryCollector<Metrics>,
     schemaValidator: SchemaValidator,
-    mapperss: {
+    mappers: {
       OrganizationDtoMapper: ResponseDtoMapperConstructor<
         SchemaValidator,
         Dto['OrganizationDtoMapper'],

package/lib/services/organization.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"organization.service.d.ts","sourceRoot":"","sources":["../../services/organization.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organization.service.d.ts","sourceRoot":"","sources":["../../services/organization.service.ts"],"names":[],"mappings":"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"}

package/lib/services/organization.service.js

@@ -3,25 +3,25 @@ export class BaseOrganizationService {
   em;
   openTelemetryCollector;
   schemaValidator;
-  mapperss;
-  #mapperss;
-  constructor(em, openTelemetryCollector, schemaValidator, mapperss) {
+  mappers;
+  #mappers;
+  constructor(em, openTelemetryCollector, schemaValidator, mappers) {
     this.em = em;
     this.openTelemetryCollector = openTelemetryCollector;
     this.schemaValidator = schemaValidator;
-    this.mapperss = mapperss;
-    this.#mapperss = transformIntoInternalDtoMapper(mapperss, schemaValidator);
+    this.mappers = mappers;
+    this.#mappers = transformIntoInternalDtoMapper(mappers, schemaValidator);
   }
   async createOrganization(organizationDto, em) {
     this.openTelemetryCollector.log('info', 'Creating organization');
     const organization =
-      this.#mapperss.CreateOrganizationDtoMapper.deserializeDtoToEntity(
+      await this.#mappers.CreateOrganizationDtoMapper.deserializeDtoToEntity(
         organizationDto
       );
     await (em ?? this.em).transactional(async (innerEm) => {
       await innerEm.persist(organization);
     });
-    return this.#mapperss.OrganizationDtoMapper.serializeEntityToDto(
+    return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       organization
     );
   }
@@ -30,17 +30,17 @@ export class BaseOrganizationService {
       'Organization',
       idDto
     );
-    return this.#mapperss.OrganizationDtoMapper.serializeEntityToDto(
+    return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       organization
     );
   }
   async updateOrganization(organizationDto, em) {
     const updatedOrganization =
-      this.#mapperss.UpdateOrganizationDtoMapper.deserializeDtoToEntity(
+      await this.#mappers.UpdateOrganizationDtoMapper.deserializeDtoToEntity(
         organizationDto
       );
     await (em ?? this.em).upsert(updatedOrganization);
-    return this.#mapperss.OrganizationDtoMapper.serializeEntityToDto(
+    return this.#mappers.OrganizationDtoMapper.serializeEntityToDto(
       updatedOrganization
     );
   }