th-273: - businessId from business/driver endpoint (#275)

Co-authored-by: Alina Kupchyk <[email protected]>

Author: MaxHopaytsa

backend/src/packages/business/business.controller.ts

@@ -9,15 +9,14 @@ import { type ILogger } from '~/libs/packages/logger/logger.js';
 import { AuthStrategy } from '~/packages/auth/libs/enums/enums.js';
 
 import {
-  type BusinessGetAllDriversRequestParameters,
   type DriverCreateUpdateRequestDto,
-  type DriverUpdateDeleteRequestParameters,
+  type DriverRequestParameters,
 } from '../drivers/drivers.js';
 import {
   driverCreateUpdateRequestBody,
-  driverGetParameters,
-  driverUpdateDeleteParameters,
+  driverParameters,
 } from '../drivers/libs/validation-schemas/validation-schemas.js';
+import { type UserEntityObjectWithGroupT } from '../users/users.js';
 import { type BusinessService } from './business.service.js';
 import { BusinessApiPath } from './libs/enums/enums.js';
 import {
@@ -328,7 +327,7 @@ class BusinessController extends Controller {
         this.createDriver(
           options as ApiHandlerOptions<{
             body: DriverCreateUpdateRequestDto;
-            params: { businessId: number };
+            user: UserEntityObjectWithGroupT;
           }>,
         ),
     });
@@ -339,13 +338,14 @@ class BusinessController extends Controller {
       authStrategy: defaultStrategies,
       validation: {
         body: driverCreateUpdateRequestBody,
-        params: driverUpdateDeleteParameters,
+        params: driverParameters,
       },
       handler: (options) =>
         this.updateDriver(
           options as ApiHandlerOptions<{
             body: DriverCreateUpdateRequestDto;
-            params: DriverUpdateDeleteRequestParameters;
+            params: DriverRequestParameters;
+            user: UserEntityObjectWithGroupT;
           }>,
         ),
     });
@@ -354,13 +354,10 @@ class BusinessController extends Controller {
       path: BusinessApiPath.DRIVERS,
       method: 'GET',
       authStrategy: defaultStrategies,
-      validation: {
-        params: driverGetParameters,
-      },
       handler: (options) =>
         this.findAllDrivers(
           options as ApiHandlerOptions<{
-            params: BusinessGetAllDriversRequestParameters;
+            user: UserEntityObjectWithGroupT;
           }>,
         ),
     });
@@ -370,12 +367,13 @@ class BusinessController extends Controller {
       method: 'DELETE',
       authStrategy: defaultStrategies,
       validation: {
-        params: driverUpdateDeleteParameters,
+        params: driverParameters,
       },
       handler: (options) =>
         this.deleteDriver(
           options as ApiHandlerOptions<{
-            params: DriverUpdateDeleteRequestParameters;
+            params: DriverRequestParameters;
+            user: UserEntityObjectWithGroupT;
           }>,
         ),
     });
@@ -586,20 +584,12 @@ class BusinessController extends Controller {
 
   /**
    * @swagger
-   * /business/{businessId}/drivers:
+   * /business/drivers:
    *    post:
    *      tags:
    *       - business/driver
    *      summary: Create driver
    *      description: Create driver
-   *      parameters:
-   *       - in: path
-   *         name: businessId
-   *         schema:
-   *           type: integer
-   *         required: true
-   *         description: Numeric ID of the business to create driver
-   *         example: 1
    *      requestBody:
    *        content:
    *          application/json:
@@ -650,13 +640,13 @@ class BusinessController extends Controller {
   private async createDriver(
     options: ApiHandlerOptions<{
       body: DriverCreateUpdateRequestDto;
-      params: { businessId: number };
+      user: UserEntityObjectWithGroupT;
     }>,
   ): Promise<ApiHandlerResponse> {
-    const createdDriver = await this.businessService.createDriver({
-      payload: options.body,
-      businessId: options.params.businessId,
-    });
+    const createdDriver = await this.businessService.createDriver(
+      options.body,
+      options.user.id,
+    );
 
     return {
       status: HttpCode.CREATED,
@@ -666,21 +656,14 @@ class BusinessController extends Controller {
 
   /**
    * @swagger
-   * /business/{businessId}/driver/{driverId}:
+   * /business/driver/{driverId}:
    *    put:
    *      tags:
    *       - business/driver
    *      summary: Update driver
    *      description: Update driver
    *      parameters:
    *       - in: path
-   *         name: businessId
-   *         schema:
-   *           type: integer
-   *         required: true
-   *         description: Numeric ID of the business to update drivers
-   *         example: 1
-   *       - in: path
    *         name: driverId
    *         schema:
    *           type: integer
@@ -729,13 +712,15 @@ class BusinessController extends Controller {
   private async updateDriver(
     options: ApiHandlerOptions<{
       body: DriverCreateUpdateRequestDto;
-      params: DriverUpdateDeleteRequestParameters;
+      params: DriverRequestParameters;
+      user: UserEntityObjectWithGroupT;
     }>,
   ): Promise<ApiHandlerResponse> {
-    const updatedDriver = await this.businessService.updateDriver({
-      driverId: options.params.driverId,
-      payload: options.body,
-    });
+    const updatedDriver = await this.businessService.updateDriver(
+      options.body,
+      options.params.driverId,
+      options.user.id,
+    );
 
     return {
       status: HttpCode.OK,
@@ -745,20 +730,12 @@ class BusinessController extends Controller {
 
   /**
    * @swagger
-   * /business/{businessId}/drivers:
+   * /business/drivers:
    *    get:
    *      tags:
    *       - business/driver
    *      summary: Find all drivers
    *      description: Find all drivers
-   *      parameters:
-   *       - in: path
-   *         name: businessId
-   *         schema:
-   *           type: integer
-   *         required: true
-   *         description: Numeric ID of the business to find drivers
-   *         example: 1
    *      security:
    *        - bearerAuth: []
    *      responses:
@@ -774,11 +751,11 @@ class BusinessController extends Controller {
 
   private async findAllDrivers(
     options: ApiHandlerOptions<{
-      params: BusinessGetAllDriversRequestParameters;
+      user: UserEntityObjectWithGroupT;
     }>,
   ): Promise<ApiHandlerResponse> {
     const drivers = await this.businessService.findAllDriversByBusinessId(
-      options.params.businessId,
+      options.user.id,
     );
 
     return {
@@ -789,21 +766,14 @@ class BusinessController extends Controller {
 
   /**
    * @swagger
-   * /business/{businessId}/driver/{driverId}:
+   * /business/driver/{driverId}:
    *    delete:
    *      tags:
    *       - business/driver
    *      summary: Delete driver
    *      description: Delete driver
    *      parameters:
    *       - in: path
-   *         name: businessId
-   *         schema:
-   *           type: integer
-   *         required: true
-   *         description: Numeric ID of the business to delete drivers
-   *         example: 1
-   *       - in: path
    *         name: driverId
    *         schema:
    *           type: integer
@@ -831,11 +801,13 @@ class BusinessController extends Controller {
 
   private async deleteDriver(
     options: ApiHandlerOptions<{
-      params: DriverUpdateDeleteRequestParameters;
+      params: DriverRequestParameters;
+      user: UserEntityObjectWithGroupT;
     }>,
   ): Promise<ApiHandlerResponse> {
     const deletionResult = await this.businessService.deleteDriver(
       options.params.driverId,
+      options.user.id,
     );
 
     return {

backend/src/packages/business/business.service.ts

@@ -5,11 +5,10 @@ import { UserGroupKey } from '~/packages/users/libs/enums/enums.js';
 
 import { type DriverService } from '../drivers/driver.service.js';
 import {
-  type DriverAddPayload,
   type DriverAddResponseWithGroup,
+  type DriverCreateUpdateRequestDto,
   type DriverCreateUpdateResponseDto,
   type DriverGetAllResponseDto,
-  type DriverUpdatePayload,
 } from '../drivers/drivers.js';
 import { type ShiftEntity } from '../shifts/shift.js';
 import { type UserEntityT } from '../users/users.js';
@@ -130,40 +129,74 @@ class BusinessService implements IService {
     return await this.businessRepository.delete(id);
   }
 
-  public async createDriver({
-    payload,
-    businessId,
-  }: DriverAddPayload): Promise<DriverAddResponseWithGroup> {
-    const doesBusinessExist = await this.findById(businessId);
+  public async createDriver(
+    payload: DriverCreateUpdateRequestDto,
+    ownerId: number,
+  ): Promise<DriverAddResponseWithGroup> {
+    const business = await this.findByOwnerId(ownerId);
 
-    if (!doesBusinessExist) {
+    if (!business) {
       throw new HttpError({
         status: HttpCode.BAD_REQUEST,
         message: HttpMessage.BUSINESS_DOES_NOT_EXIST,
       });
     }
 
-    return await this.driverService.create({ payload, businessId });
+    return await this.driverService.create({
+      payload,
+      businessId: business.id,
+    });
   }
 
-  public updateDriver({
-    driverId,
-    payload,
-  }: DriverUpdatePayload): Promise<DriverCreateUpdateResponseDto> {
-    return this.driverService.update({
+  public async updateDriver(
+    payload: DriverCreateUpdateRequestDto,
+    driverId: number,
+    ownerId: number,
+  ): Promise<DriverCreateUpdateResponseDto> {
+    const business = await this.findByOwnerId(ownerId);
+
+    if (!business) {
+      throw new HttpError({
+        status: HttpCode.BAD_REQUEST,
+        message: HttpMessage.BUSINESS_DOES_NOT_EXIST,
+      });
+    }
+
+    return await this.driverService.update({
       driverId,
       payload,
     });
   }
 
-  public findAllDriversByBusinessId(
-    id: number,
+  public async findAllDriversByBusinessId(
+    ownerId: number,
   ): Promise<DriverGetAllResponseDto> {
-    return this.driverService.findAllByBusinessId(id);
+    const business = await this.findByOwnerId(ownerId);
+
+    if (!business) {
+      throw new HttpError({
+        status: HttpCode.BAD_REQUEST,
+        message: HttpMessage.BUSINESS_DOES_NOT_EXIST,
+      });
+    }
+
+    return await this.driverService.findAllByBusinessId(business.id);
   }
 
-  public deleteDriver(driverId: number): Promise<boolean> {
-    return this.driverService.delete(driverId);
+  public async deleteDriver(
+    driverId: number,
+    ownerId: number,
+  ): Promise<boolean> {
+    const business = await this.findByOwnerId(ownerId);
+
+    if (!business) {
+      throw new HttpError({
+        status: HttpCode.BAD_REQUEST,
+        message: HttpMessage.BUSINESS_DOES_NOT_EXIST,
+      });
+    }
+
+    return await this.driverService.delete(driverId);
   }
 
   public checkisDriverBelongedToBusiness({

backend/src/packages/drivers/drivers.ts

@@ -16,14 +16,12 @@ const driverService = new DriverService({
 
 export { driverRepository, driverService };
 export {
-  type BusinessGetAllDriversRequestParameters,
   type DriverAddPayload,
   type DriverAddResponseWithGroup,
   type DriverCreateUpdateRequestDto,
   type DriverCreateUpdateResponseDto,
   type DriverEntity,
   type DriverGetAllResponseDto,
-  type DriverGetRequestParameters,
-  type DriverUpdateDeleteRequestParameters,
+  type DriverRequestParameters,
   type DriverUpdatePayload,
 } from './libs/types/types.js';

backend/src/packages/drivers/libs/types/types.ts

@@ -1,12 +1,10 @@
 export { type DriverAddResponseWithGroup } from './driver-add-response-with-group.type.js';
 export {
-  type BusinessGetAllDriversRequestParameters,
   type DriverAddPayload,
   type DriverCreateUpdateRequestDto,
   type DriverCreateUpdateResponseDto,
   type DriverEntity,
   type DriverGetAllResponseDto,
-  type DriverGetRequestParameters,
-  type DriverUpdateDeleteRequestParameters,
+  type DriverRequestParameters,
   type DriverUpdatePayload,
 } from 'shared/build/index.js';

backend/src/packages/drivers/libs/validation-schemas/validation-schemas.ts

@@ -1,5 +1,4 @@
 export {
   driverCreateUpdateRequestBody,
-  driverGetParameters,
-  driverUpdateDeleteParameters,
+  driverParameters,
 } from 'shared/build/index.js';

shared/src/index.ts

@@ -71,19 +71,16 @@ export {
   BusinessValidationMessage,
 } from './packages/business/business.js';
 export {
-  type BusinessGetAllDriversRequestParameters,
   type DriverAddPayload,
   type DriverCreateUpdateRequestDto,
   type DriverCreateUpdateResponseDto,
   type DriverEntity,
   type DriverGetAllResponseDto,
-  type DriverGetRequestParameters,
-  type DriverUpdateDeleteRequestParameters,
+  type DriverRequestParameters,
   type DriverUpdatePayload,
   DriverApiPath,
   driverCreateUpdateRequestBody,
-  driverGetParameters,
-  driverUpdateDeleteParameters,
+  driverParameters,
   DriverValidationMessage,
 } from './packages/drivers/drivers.js';
 export {