Employee rework: entities, repositories, mappers

Author: hmbanan666

sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-orders/api-sdk",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "TS Lib: Easy ability to make requests to Main API via NPM package. 100% typed.",
   "scripts": {
     "build": "tsup",

sdk/types/objects.ts

@@ -46,12 +46,12 @@ export type Employee = {
   createdAt: Date;
   updatedAt: Date;
   lastLogin: Date | null;
-  permissions: EmployeePermission[];
 };
 
 export type EmployeePermission = {
   id: string;
   type: EmployeePermissionType;
+  employeeId: string;
 };
 
 export type EmployeePermissionType =
@@ -66,9 +66,20 @@ export type EmployeePermissionType =
   | 'READ_MENUS'
   | 'EDIT_MENUS';
 
+export type EmployeePassword = {
+  id: string;
+  hash: string;
+  createdAt: Date;
+  updatedAt: Date;
+  employeeId: string;
+};
+
 export type EmployeeContact = {
   id: string;
   type: EmployeeContactType;
+  employeeId: string;
+  value: string;
+  isUsedForAuthentication: boolean;
 };
 
 export type EmployeeContactType = 'EMAIL';

src/core/channel/channel.controller.ts

@@ -11,25 +11,21 @@ import { Permissions, Public } from '@/core/auth/auth.decorator';
 import { ChannelService } from '@/core/channel/channel.service';
 import { CreateChannelDto } from '@/core/channel/dto/create-channel.dto';
 import { ChannelCreateResponse } from '../../../sdk/endpoints';
+import { Channel } from '@api-sdk';
 
 @Controller('channel')
 export class ChannelController {
   constructor(private readonly service: ChannelService) {}
 
   @Public()
   @Get('list')
-  async findAllChannels() {
-    const channels = await this.service.findAllChannels();
-    if (!channels) {
-      throw new NotFoundException();
-    }
-
-    return channels;
+  findAllChannels(): Promise<Channel[]> {
+    return this.service.findAllChannels();
   }
 
   @Public()
   @Get(':id')
-  async findChannelById(@Param('id') id: string) {
+  async findChannelById(@Param('id') id: string): Promise<Channel> {
     const channel = await this.service.findChannelById(id);
     if (!channel) {
       throw new NotFoundException();
@@ -48,6 +44,9 @@ export class ChannelController {
       throw new BadRequestException();
     }
 
-    return created;
+    return {
+      ok: true,
+      result: created,
+    };
   }
 }

src/core/channel/channel.mapper.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { ChannelEntity } from '@/core/channel/channel.entity';
+import { ChannelEntity } from '@/core/channel/entities';
 import { CountryCode, CurrencyCode, LanguageCode } from '@api-sdk';
 import { PrismaModels } from '@/db/prisma.service';
 

src/core/channel/channel.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaService } from '@/db/prisma.service';
-import { ChannelEntity } from '@/core/channel/channel.entity';
+import { ChannelEntity } from '@/core/channel/entities';
 import { ChannelMapper } from '@/core/channel/channel.mapper';
 
 @Injectable()

src/core/channel/channel.service.spec.ts

@@ -97,10 +97,7 @@ describe('ChannelService', () => {
       repo.create.mockResolvedValueOnce(testChannelEntity);
 
       const result = await service.createChannel(testCreateChannelDto);
-      expect(result).toMatchObject({
-        ok: true,
-        result: testChannelEntity,
-      });
+      expect(result).toMatchObject(testChannelEntity);
     });
   });
 });

src/core/channel/channel.service.ts

@@ -1,9 +1,13 @@
 import { Injectable } from '@nestjs/common';
-import { Channel, CountryCode, CurrencyCode, LanguageCode } from '@api-sdk';
+import type {
+  Channel,
+  CountryCode,
+  CurrencyCode,
+  LanguageCode,
+} from '@api-sdk';
 import { CreateChannelDto } from '@/core/channel/dto/create-channel.dto';
 import { ChannelRepository } from '@/core/channel/channel.repository';
-import { ChannelEntity } from '@/core/channel/channel.entity';
-import { ChannelCreateResponse } from '../../../sdk/endpoints';
+import { ChannelEntity } from '@/core/channel/entities';
 
 @Injectable()
 export class ChannelService {
@@ -17,7 +21,7 @@ export class ChannelService {
     return this.repository.findById(id);
   }
 
-  async createChannel(dto: CreateChannelDto): Promise<ChannelCreateResponse> {
+  async createChannel(dto: CreateChannelDto): Promise<Channel> {
     const channelEntity = new ChannelEntity({
       slug: dto.slug,
       name: dto.name,
@@ -27,11 +31,6 @@ export class ChannelService {
       countryCode: dto.countryCode as CountryCode,
     });
 
-    const created = await this.repository.create(channelEntity);
-
-    return {
-      ok: true,
-      result: created,
-    };
+    return this.repository.create(channelEntity);
   }
 }

src/core/channel/channel.entity.ts src/core/channel/entities/channel.entity.ts

@@ -1,5 +1,5 @@
-import { Channel, CountryCode, CurrencyCode, LanguageCode } from '@api-sdk';
 import { createId } from '@paralleldrive/cuid2';
+import { Channel, CountryCode, CurrencyCode, LanguageCode } from '@api-sdk';
 
 export class ChannelEntity implements Channel {
   id!: string;

src/core/channel/entities/index.ts

@@ -0,0 +1 @@
+export { ChannelEntity } from './channel.entity';

src/core/employee/employee.controller.ts

@@ -38,7 +38,10 @@ export class EmployeeController {
       throw new BadRequestException();
     }
 
-    return created;
+    return {
+      ok: true,
+      result: created,
+    };
   }
 
   @Public()
@@ -51,7 +54,10 @@ export class EmployeeController {
       throw new BadRequestException();
     }
 
-    return created;
+    return {
+      ok: true,
+      result: created,
+    };
   }
 
   @Public()
@@ -64,7 +70,9 @@ export class EmployeeController {
       throw new BadRequestException();
     }
 
-    return created;
+    return {
+      ok: true,
+    };
   }
 
   @Public()
@@ -77,7 +85,10 @@ export class EmployeeController {
       throw new BadRequestException();
     }
 
-    return created;
+    return {
+      ok: true,
+      result: created,
+    };
   }
 
   @Public()

src/core/employee/employee.module.ts

@@ -1,13 +1,36 @@
 import { Module } from '@nestjs/common';
+import { JwtService } from '@nestjs/jwt';
 import { PrismaService } from '@/db/prisma.service';
+import { AuthService } from '@/core/auth/auth.service';
 import { EmployeeController } from '@/core/employee/employee.controller';
 import { EmployeeService } from '@/core/employee/employee.service';
-import { AuthService } from '@/core/auth/auth.service';
-import { JwtService } from '@nestjs/jwt';
+import {
+  EmployeeContactRepository,
+  EmployeePasswordRepository,
+  EmployeePermissionRepository,
+  EmployeeRepository,
+} from '@/core/employee/repositories';
+import {
+  EmployeeContactMapper,
+  EmployeeMapper,
+  EmployeePermissionMapper,
+} from '@/core/employee/mappers';
 
 @Module({
   controllers: [EmployeeController],
-  providers: [EmployeeService, PrismaService, AuthService, JwtService],
+  providers: [
+    EmployeeService,
+    EmployeeRepository,
+    EmployeeContactRepository,
+    EmployeePasswordRepository,
+    EmployeePermissionRepository,
+    EmployeeMapper,
+    EmployeeContactMapper,
+    EmployeePermissionMapper,
+    PrismaService,
+    AuthService,
+    JwtService,
+  ],
   exports: [EmployeeService],
 })
 export class EmployeeModule {}