Merge pull request #107 from MatheusAFD/fix/106

Fix/106

Author: MatheusAFD

src/modules/employees/employees.controller.ts

@@ -29,6 +29,7 @@ import { CreateEmployeeDTO, UpdateEmployeeDTO } from './dto'
 import { GetEmployeesDTO } from './dto/get-employee.dto'
 import { EmployeesService } from './employees.service'
 import { Employee } from './entities/employee.entity'
+import { GetOneEmployeeResponse } from './types'
 import { CreateEmployeeAndUserUseCase } from './use-cases'
 
 @Controller('employees')
@@ -76,7 +77,7 @@ export class EmployeesController {
   findOne(
     @Param('id') id: string,
     @CurrentUser() user: AuthUser
-  ): Promise<Employee> {
+  ): Promise<GetOneEmployeeResponse> {
     return this.employeesService.findOne(user.companyId, id)
   }
 

src/modules/employees/employees.service.ts

@@ -5,20 +5,21 @@ import {
   NotFoundException
 } from '@nestjs/common'
 
-import { and, count, desc, eq, ilike } from 'drizzle-orm'
+import { and, count, desc, eq, getTableColumns, ilike } from 'drizzle-orm'
 
 import { DrizzleAsyncProvider } from '@db/drizzle/drizzle.provider'
-import { employees } from '@db/drizzle/schema'
+import { employees, users } from '@db/drizzle/schema'
 import { DrizzleSchema } from '@db/drizzle/types'
 
-import { ERROR_CONSTANTS } from '@common/constants'
+import { DEFAULT_EMPLOYEE_COLOR, ERROR_CONSTANTS } from '@common/constants'
 import { StatusEnum } from '@common/enums'
 import { ResponseWithPagination } from '@common/types'
 import { calculatePagination, calculateQueryOffset } from '@common/utils'
 
 import { GetEmployeesDTO } from './dto/get-employee.dto'
 import { UpdateEmployeeDTO } from './dto/update-employee.dto'
 import { Employee } from './entities/employee.entity'
+import { GetOneEmployeeResponse } from './types'
 
 @Injectable()
 export class EmployeesService {
@@ -67,11 +68,19 @@ export class EmployeesService {
     return { data, pagination }
   }
 
-  async findOne(companyId: string, id: string): Promise<Employee> {
+  async findOne(
+    companyId: string,
+    id: string
+  ): Promise<GetOneEmployeeResponse> {
     const [employee] = await this.db
-      .select()
+      .select({
+        ...getTableColumns(employees),
+        email: users.email,
+        genre: users.genre
+      })
       .from(employees)
       .where(and(eq(employees.id, id), eq(employees.companyId, companyId)))
+      .innerJoin(users, eq(employees.userId, users.id))
       .limit(1)
 
     if (!employee) {
@@ -85,26 +94,67 @@ export class EmployeesService {
     { id, companyId }: { id: string; companyId: string },
     body: UpdateEmployeeDTO
   ): Promise<Employee> {
-    const { name, status, color } = body
-
-    const employee = await this.findOne(companyId, id)
-
-    const [updatedEmployee] = await this.db
-      .update(employees)
-      .set({
-        name: name ?? employee.name,
-        color: color ?? employee.color,
-        status: status ?? employee.status
-      })
-      .where(and(eq(employees.id, id), eq(employees.companyId, companyId)))
-      .returning()
+    const {
+      name,
+      email,
+      phone,
+      isWhatsapp = false,
+      status = StatusEnum.ACTIVE,
+      color = DEFAULT_EMPLOYEE_COLOR,
+      birthdate,
+      genre,
+      address,
+      neighborhood,
+      city,
+      state,
+      zipcode,
+      number
+    } = body
+
+    const response = await this.db.transaction(async (trx) => {
+      const employee = await this.findOne(companyId, id)
+
+      const [updatedEmployee] = await trx
+        .update(employees)
+        .set({
+          name: name ?? employee.name,
+          color: color ?? employee.color,
+          status: status ?? employee.status,
+          address: address ?? employee.address,
+          neighborhood: neighborhood ?? employee.neighborhood,
+          city: city ?? employee.city,
+          state: state ?? employee.state,
+          zipcode: zipcode ?? employee.zipcode,
+          number: number ?? employee.number,
+          phone: phone ?? employee.phone,
+          isWhatsapp: isWhatsapp ?? employee.isWhatsapp,
+          birthdate: birthdate ?? employee.birthdate
+        })
+        .where(and(eq(employees.id, id), eq(employees.companyId, companyId)))
+        .returning()
+
+      const [updatedUser] = await trx
+        .update(users)
+        .set({
+          email: email ?? employee.email,
+          genre: genre ?? employee.genre
+        })
+        .where(eq(users.id, employee.userId))
+        .returning()
+
+      if (!updatedEmployee) {
+        throw new InternalServerErrorException(
+          ERROR_CONSTANTS.EMPLOYEE.UPDATE_FAILED
+        )
+      }
 
-    if (!updatedEmployee) {
-      throw new InternalServerErrorException(
-        ERROR_CONSTANTS.EMPLOYEE.UPDATE_FAILED
-      )
-    }
+      return {
+        ...updatedEmployee,
+        genre: updatedUser.genre,
+        email: updatedUser.email
+      }
+    })
 
-    return updatedEmployee
+    return response
   }
 }

src/modules/employees/types/get-one-employee-response.ts

@@ -0,0 +1,6 @@
+import { Employee } from '../entities/employee.entity'
+
+export interface GetOneEmployeeResponse extends Employee {
+  email: string
+  genre: string | null
+}

src/modules/employees/types/index.ts

@@ -0,0 +1 @@
+export * from './get-one-employee-response'