@forklaunch/implementation-iam-base 0.8.24 → 1.0.0

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

@@ -13,7 +13,8 @@ import {
 } from '@forklaunch/core/http';
 import { CreateUserDto, UpdateUserDto } from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager, FilterQuery } from '@mikro-orm/core';
+import { EntityManager, FilterQuery, InferEntity } from '@mikro-orm/core';
+import { User } from '../persistence/entities';
 import { UserDtos } from '../domain/types/iamDto.types';
 import { UserEntities } from '../domain/types/iamEntities.types';
 import { UserMappers } from '../domain/types/user.mapper.types';
@@ -81,7 +82,7 @@ export class BaseUserService<
     if (em) {
       await em.persist(user);
     } else {
-      await this.em.persistAndFlush(user);
+      await this.em.persist(user).flush();
     }
 
     return this.mappers.UserMapper.toDto(user);
@@ -109,7 +110,7 @@ export class BaseUserService<
     if (em) {
       await em.persist(users);
     } else {
-      await this.em.persistAndFlush(users);
+      await this.em.persist(users).flush();
     }
 
     return Promise.all(
@@ -121,50 +122,58 @@ export class BaseUserService<
     idDto: IdDto,
     em?: EntityManager
   ): Promise<string | undefined> {
-    const user = await (em ?? this.em).findOne('User', idDto, {
-      populate: ['id', 'organization']
-    });
+    const user = await (em ?? this.em).findOne(
+      this.mappers.UserMapper.entity as typeof User,
+      idDto,
+      {
+        populate: ['id', 'organization']
+      }
+    );
     return user?.organization?.id;
   }
 
   async getUser(
-    idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>,
+    idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>,
     em?: EntityManager
   ): Promise<MapperDomains['UserMapper']> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Getting user', idDto);
     }
 
-    const user = await (em ?? this.em).findOneOrFail('User', idDto, {
-      populate: ['id', '*']
-    });
+    const user = await (em ?? this.em).findOneOrFail(
+      this.mappers.UserMapper.entity as typeof User,
+      idDto,
+      {
+        populate: ['id', '*']
+      }
+    );
 
-    return this.mappers.UserMapper.toDto(user as MapperEntities['UserMapper']);
+    return this.mappers.UserMapper.toDto(
+      user as InferEntity<MapperEntities['UserMapper']>
+    );
   }
 
   async getBatchUsers(
-    idsDto: IdsDto & FilterQuery<MapperEntities['UserMapper']>,
+    idsDto: IdsDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>,
     em?: EntityManager
   ): Promise<MapperDomains['UserMapper'][]> {
     if (this.evaluatedTelemetryOptions.logging) {
       this.openTelemetryCollector.info('Getting batch users', idsDto);
     }
 
-    // Build filter with organization constraint if provided
-    const filter: FilterQuery<MapperEntities['UserMapper']> = {
-      id: { $in: idsDto.ids },
-      ...((idsDto as any).organization && {
-        organization: (idsDto as any).organization
-      })
-    };
-
     return Promise.all(
       (
-        await (em ?? this.em).find('User', filter, {
-          populate: ['id', '*']
-        })
+        await (em ?? this.em).find(
+          this.mappers.UserMapper.entity as typeof User,
+          idsDto,
+          {
+            populate: ['id', '*']
+          }
+        )
       ).map((user) =>
-        this.mappers.UserMapper.toDto(user as MapperEntities['UserMapper'])
+        this.mappers.UserMapper.toDto(
+          user as InferEntity<MapperEntities['UserMapper']>
+        )
       )
     );
   }
@@ -187,7 +196,7 @@ export class BaseUserService<
     if (em) {
       await em.persist(user);
     } else {
-      await this.em.persistAndFlush(user);
+      await this.em.persist(user).flush();
     }
 
     return this.mappers.UserMapper.toDto(user);
@@ -215,7 +224,7 @@ export class BaseUserService<
     if (em) {
       await em.persist(users);
     } else {
-      await this.em.persistAndFlush(users);
+      await this.em.persist(users).flush();
     }
 
     return Promise.all(
@@ -224,10 +233,7 @@ export class BaseUserService<
   }
 
   async deleteUser(
-    idDto: IdDto & { organization?: { id: string } } & FilterQuery<
-        MapperEntities['UserMapper']
-      > &
-      object,
+    idDto: IdDto & { organization?: { id: string } },
     em?: EntityManager
   ): Promise<void> {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -240,16 +246,16 @@ export class BaseUserService<
       ...(idDto.organization && {
         organization: idDto.organization
       })
-    } as FilterQuery<MapperEntities['UserMapper']>;
+    };
 
-    await (em ?? this.em).nativeDelete('User', filter);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.UserMapper.entity as typeof User,
+      filter
+    );
   }
 
   async deleteBatchUsers(
-    idsDto: IdsDto & { organization?: { id: string } } & FilterQuery<
-        MapperEntities['UserMapper']
-      > &
-      object,
+    idsDto: IdsDto & { organization?: { id: string } },
     em?: EntityManager
   ): Promise<void> {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -260,15 +266,18 @@ export class BaseUserService<
       ...idsDto,
       id: { $in: idsDto.ids },
       ...(idsDto.organization && {
-        organization: idsDto.organization
+        organization: idsDto.organization.id
       })
     };
 
-    await (em ?? this.em).nativeDelete('User', filter);
+    await (em ?? this.em).nativeDelete(
+      this.mappers.UserMapper.entity as typeof User,
+      filter
+    );
   }
 
   async surfaceRoles(
-    idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>,
+    idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>,
     em?: EntityManager
   ): Promise<MapperDomains['UserMapper']['roles']> {
     if (this.evaluatedTelemetryOptions.logging) {
@@ -281,7 +290,7 @@ export class BaseUserService<
   }
 
   async surfacePermissions(
-    idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>,
+    idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>,
     em?: EntityManager
   ): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']> {
     if (this.evaluatedTelemetryOptions.logging) {

package/lib/services/index.d.mts

@@ -5,9 +5,9 @@ export * from '@forklaunch/interfaces-iam/interfaces';
 import { CreateOrganizationDto, UpdateOrganizationDto, CreatePermissionDto, UpdatePermissionDto, CreateRoleDto, RoleDto, UpdateRoleDto, CreateUserDto, UpdateUserDto } from '@forklaunch/interfaces-iam/types';
 export * from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager, FilterQuery } from '@mikro-orm/core';
+import { EntityManager, FilterQuery, InferEntity } from '@mikro-orm/core';
 import { OrganizationEntities, OrganizationDtos, OrganizationMappers, PermissionEntities, PermissionDtos, PermissionMappers, RoleEntities, RoleDtos, RoleMappers, UserEntities, UserDtos, UserMappers } from '../domain/types/index.mjs';
-import '@forklaunch/core/services';
+import '@forklaunch/core/persistence';
 
 declare class BaseOrganizationService<SchemaValidator extends AnySchemaValidator, OrganizationStatus = unknown, MapperEntities extends OrganizationEntities<OrganizationStatus> = OrganizationEntities<OrganizationStatus>, MapperDomains extends OrganizationDtos<OrganizationStatus> = OrganizationDtos<OrganizationStatus>> implements OrganizationService<OrganizationStatus> {
     private evaluatedTelemetryOptions;
@@ -19,9 +19,9 @@ declare class BaseOrganizationService<SchemaValidator extends AnySchemaValidator
         telemetry?: TelemetryOptions;
     });
     createOrganization(organizationDto: CreateOrganizationDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['OrganizationMapper']>;
-    getOrganization(idDto: IdDto, em?: EntityManager): Promise<MapperDomains['OrganizationMapper']>;
+    getOrganization(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['OrganizationMapper']>>, em?: EntityManager): Promise<MapperDomains['OrganizationMapper']>;
     updateOrganization(organizationDto: UpdateOrganizationDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['OrganizationMapper']>;
-    deleteOrganization(idDto: IdDto, em?: EntityManager): Promise<void>;
+    deleteOrganization(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['OrganizationMapper']>>, em?: EntityManager): Promise<void>;
 }
 
 declare class BasePermissionService<SchemaValidator extends AnySchemaValidator, MapperEntities extends PermissionEntities = PermissionEntities, MapperDomains extends PermissionDtos = PermissionDtos> implements PermissionService {
@@ -83,22 +83,22 @@ declare class BaseUserService<SchemaValidator extends AnySchemaValidator, Organi
     createUser(userDto: CreateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     createBatchUsers(userDtos: CreateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
     getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string | undefined>;
-    getUser(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
-    getBatchUsers(idsDto: IdsDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
+    getUser(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
+    getBatchUsers(idsDto: IdsDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
     updateUser(userDto: UpdateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     updateBatchUsers(userDtos: UpdateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
     deleteUser(idDto: IdDto & {
         organization?: {
             id: string;
         };
-    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
+    }, em?: EntityManager): Promise<void>;
     deleteBatchUsers(idsDto: IdsDto & {
         organization?: {
             id: string;
         };
-    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
-    surfaceRoles(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles']>;
-    surfacePermissions(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']>;
+    }, em?: EntityManager): Promise<void>;
+    surfaceRoles(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles']>;
+    surfacePermissions(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']>;
 }
 
 export { BaseOrganizationService, BasePermissionService, BaseRoleService, BaseUserService };

package/lib/services/index.d.ts

@@ -5,9 +5,9 @@ export * from '@forklaunch/interfaces-iam/interfaces';
 import { CreateOrganizationDto, UpdateOrganizationDto, CreatePermissionDto, UpdatePermissionDto, CreateRoleDto, RoleDto, UpdateRoleDto, CreateUserDto, UpdateUserDto } from '@forklaunch/interfaces-iam/types';
 export * from '@forklaunch/interfaces-iam/types';
 import { AnySchemaValidator } from '@forklaunch/validator';
-import { EntityManager, FilterQuery } from '@mikro-orm/core';
+import { EntityManager, FilterQuery, InferEntity } from '@mikro-orm/core';
 import { OrganizationEntities, OrganizationDtos, OrganizationMappers, PermissionEntities, PermissionDtos, PermissionMappers, RoleEntities, RoleDtos, RoleMappers, UserEntities, UserDtos, UserMappers } from '../domain/types/index.js';
-import '@forklaunch/core/services';
+import '@forklaunch/core/persistence';
 
 declare class BaseOrganizationService<SchemaValidator extends AnySchemaValidator, OrganizationStatus = unknown, MapperEntities extends OrganizationEntities<OrganizationStatus> = OrganizationEntities<OrganizationStatus>, MapperDomains extends OrganizationDtos<OrganizationStatus> = OrganizationDtos<OrganizationStatus>> implements OrganizationService<OrganizationStatus> {
     private evaluatedTelemetryOptions;
@@ -19,9 +19,9 @@ declare class BaseOrganizationService<SchemaValidator extends AnySchemaValidator
         telemetry?: TelemetryOptions;
     });
     createOrganization(organizationDto: CreateOrganizationDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['OrganizationMapper']>;
-    getOrganization(idDto: IdDto, em?: EntityManager): Promise<MapperDomains['OrganizationMapper']>;
+    getOrganization(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['OrganizationMapper']>>, em?: EntityManager): Promise<MapperDomains['OrganizationMapper']>;
     updateOrganization(organizationDto: UpdateOrganizationDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['OrganizationMapper']>;
-    deleteOrganization(idDto: IdDto, em?: EntityManager): Promise<void>;
+    deleteOrganization(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['OrganizationMapper']>>, em?: EntityManager): Promise<void>;
 }
 
 declare class BasePermissionService<SchemaValidator extends AnySchemaValidator, MapperEntities extends PermissionEntities = PermissionEntities, MapperDomains extends PermissionDtos = PermissionDtos> implements PermissionService {
@@ -83,22 +83,22 @@ declare class BaseUserService<SchemaValidator extends AnySchemaValidator, Organi
     createUser(userDto: CreateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     createBatchUsers(userDtos: CreateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
     getOrganizationIdByUserId(idDto: IdDto, em?: EntityManager): Promise<string | undefined>;
-    getUser(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
-    getBatchUsers(idsDto: IdsDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
+    getUser(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper']>;
+    getBatchUsers(idsDto: IdsDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper'][]>;
     updateUser(userDto: UpdateUserDto, em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper']>;
     updateBatchUsers(userDtos: UpdateUserDto[], em?: EntityManager, ...args: unknown[]): Promise<MapperDomains['UserMapper'][]>;
     deleteUser(idDto: IdDto & {
         organization?: {
             id: string;
         };
-    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
+    }, em?: EntityManager): Promise<void>;
     deleteBatchUsers(idsDto: IdsDto & {
         organization?: {
             id: string;
         };
-    } & FilterQuery<MapperEntities['UserMapper']> & object, em?: EntityManager): Promise<void>;
-    surfaceRoles(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles']>;
-    surfacePermissions(idDto: IdDto & FilterQuery<MapperEntities['UserMapper']>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']>;
+    }, em?: EntityManager): Promise<void>;
+    surfaceRoles(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles']>;
+    surfacePermissions(idDto: IdDto & FilterQuery<InferEntity<MapperEntities['UserMapper']>>, em?: EntityManager): Promise<MapperDomains['UserMapper']['roles'][0]['permissions']>;
 }
 
 export { BaseOrganizationService, BasePermissionService, BaseRoleService, BaseUserService };