Merge branch 'development' into fix/th-294-user-unlogging-when-server-is-dead

Author: Some14u

backend/src/libs/enums/enums.ts

@@ -5,4 +5,5 @@ export {
   HttpCode,
   HttpMessage,
   ServerErrorType,
+  SortMethod,
 } from 'shared/build/index.js';

backend/src/libs/helpers/count-offset-by-query.helper.ts

@@ -0,0 +1,7 @@
+import { type PaginationParameters } from '../types/types.js';
+
+const countOffsetByQuery = ({ page, size }: PaginationParameters): number => {
+  return page * size;
+};
+
+export { countOffsetByQuery };

backend/src/libs/helpers/get-sorted-by.helper.ts

@@ -0,0 +1,32 @@
+import {
+  type AnyColumn,
+  type SQL,
+  type SQLWrapper,
+  asc,
+  desc,
+} from 'drizzle-orm';
+
+import { SortMethod } from '../enums/enums.js';
+import { type SortMethodValue } from '../types/types.js';
+
+type ColumnToSorted = SQLWrapper | AnyColumn;
+
+const getSortedBy = (
+  sortedMethod: SortMethodValue | null,
+  requiredColumnToSorted: ColumnToSorted,
+  optionalColumnToSorted: ColumnToSorted,
+): SQL[] => {
+  const sortedBy = [desc(requiredColumnToSorted)];
+
+  if (sortedMethod === SortMethod.ASC) {
+    sortedBy.unshift(asc(optionalColumnToSorted));
+  }
+
+  if (sortedMethod === SortMethod.DESC) {
+    sortedBy.unshift(desc(optionalColumnToSorted));
+  }
+
+  return sortedBy;
+};
+
+export { getSortedBy };

backend/src/libs/helpers/helpers.ts

@@ -0,0 +1,2 @@
+export { countOffsetByQuery } from './count-offset-by-query.helper.js';
+export { getSortedBy } from './get-sorted-by.helper.js';

backend/src/libs/packages/database/generated-schema/0012_add_businessId_to_trucks.sql

@@ -0,0 +1,9 @@
+ALTER TABLE "trucks"
+ADD COLUMN "business_id" integer NOT NULL;
+
+--> statement-breakpoint
+DO $$ BEGIN
+ALTER TABLE "trucks" ADD CONSTRAINT "trucks_business_id_business_details_id_fk" FOREIGN KEY ("business_id") REFERENCES "business_details"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+WHEN duplicate_object THEN null;
+END $$;

backend/src/libs/packages/database/schema/tables-schema.ts

@@ -128,15 +128,15 @@ const trucks = pgTable(
     id: serial('id').primaryKey(),
     createdAt: timestamp('created_at').notNull().defaultNow(),
     updatedAt: timestamp('updated_at').notNull().defaultNow(),
+    businessId: integer('business_id')
+      .notNull()
+      .references(() => business.id),
     manufacturer: varchar('manufacturer').notNull(),
     capacity: integer('capacity').notNull(),
     pricePerKm: real('price_per_km').notNull(),
     licensePlateNumber: varchar('license_plate_number').notNull(),
     year: integer('year').notNull(),
     towType: varchar('tow_type').notNull(),
-    businessId: integer('business_id')
-      .notNull()
-      .references(() => business.id),
   },
   (trucks) => {
     return {

backend/src/libs/types/types.ts

@@ -5,9 +5,12 @@ export {
   type Id,
   type NullableProperties,
   type OperationResult,
+  type PaginationParameters,
+  type PaginationWithSortingParameters,
   type RequireProperty,
   type ServerCommonErrorResponse,
   type ServerValidationErrorResponse,
+  type SortMethodValue,
   type ValidationSchema,
   type ValueOf,
 } from 'shared/build/index.js';

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

@@ -6,6 +6,7 @@ import {
 } from '~/libs/packages/controller/controller.js';
 import { HttpCode } from '~/libs/packages/http/http.js';
 import { type ILogger } from '~/libs/packages/logger/logger.js';
+import { type PaginationWithSortingParameters } from '~/libs/types/types.js';
 import { AuthStrategy } from '~/packages/auth/libs/enums/enums.js';
 
 import {
@@ -16,6 +17,8 @@ import {
   driverCreateUpdateRequestBody,
   driverParameters,
 } from '../drivers/libs/validation-schemas/validation-schemas.js';
+import { type TruckAddRequestDto } from '../trucks/libs/types/types.js';
+import { truckCreateRequestBody } from '../trucks/trucks.js';
 import { type UserEntityObjectWithGroupT } from '../users/users.js';
 import { type BusinessService } from './business.service.js';
 import { BusinessApiPath } from './libs/enums/enums.js';
@@ -392,7 +395,23 @@ class BusinessController extends Controller {
       handler: (options) =>
         this.findAllTrucks(
           options as ApiHandlerOptions<{
-            query: GetPaginatedPageQuery;
+            query: PaginationWithSortingParameters;
+            user: UserEntityObjectWithGroupT;
+          }>,
+        ),
+    });
+
+    this.addRoute({
+      path: BusinessApiPath.TRUCKS,
+      method: 'POST',
+      authStrategy: defaultStrategies,
+      validation: {
+        body: truckCreateRequestBody,
+      },
+      handler: (request) =>
+        this.createTruck(
+          request as ApiHandlerOptions<{
+            body: TruckAddRequestDto;
             user: UserEntityObjectWithGroupT;
           }>,
         ),
@@ -873,11 +892,11 @@ class BusinessController extends Controller {
 
   private async findAllTrucks(
     options: ApiHandlerOptions<{
-      query: GetPaginatedPageQuery;
+      query: PaginationWithSortingParameters;
       user: UserEntityObjectWithGroupT;
     }>,
   ): Promise<ApiHandlerResponse> {
-    const trucks = await this.businessService.findAllTrucksByOwnerId(
+    const trucks = await this.businessService.findAllTrucksByBusinessId(
       options.user.id,
       options.query,
     );
@@ -887,6 +906,49 @@ class BusinessController extends Controller {
       payload: trucks,
     };
   }
+
+  /**
+   * @swagger
+   * /trucks:
+   *   post:
+   *     summary: Create a new truck
+   *     tags:
+   *       - business/trucks
+   *     requestBody:
+   *       description: Truck data to be added
+   *       required: true
+   *       content:
+   *         application/json:
+   *           schema:
+   *             $ref: '#/components/schemas/Truck'
+   *     security:
+   *       - bearerAuth: []
+   *     responses:
+   *       '201':
+   *         description: Truck created successfully
+   *         content:
+   *           application/json:
+   *             schema:
+   *               $ref: '#/components/schemas/TruckResponse'
+   *       '400':
+   *         description: Bad request
+   *
+   */
+
+  private async createTruck(
+    options: ApiHandlerOptions<{
+      body: TruckAddRequestDto;
+      user: UserEntityObjectWithGroupT;
+    }>,
+  ): Promise<ApiHandlerResponse> {
+    return {
+      status: HttpCode.CREATED,
+      payload: await this.businessService.createTruck(
+        options.body,
+        options.user.id,
+      ),
+    };
+  }
 }
 
 export { BusinessController };

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

@@ -1,7 +1,7 @@
 import { NotFoundError } from '~/libs/exceptions/exceptions.js';
 import { type IService } from '~/libs/interfaces/interfaces.js';
 import { HttpCode, HttpError, HttpMessage } from '~/libs/packages/http/http.js';
-import { type EntityPagination } from '~/libs/types/types.js';
+import { type PaginationWithSortingParameters } from '~/libs/types/types.js';
 import { UserGroupKey } from '~/packages/users/libs/enums/enums.js';
 
 import { type DriverService } from '../drivers/driver.service.js';
@@ -12,7 +12,11 @@ import {
   type DriverGetAllResponseDto,
 } from '../drivers/drivers.js';
 import { type ShiftEntity } from '../shifts/shift.js';
-import { type TruckEntity } from '../trucks/libs/types/types.js';
+import {
+  type TruckAddRequestDto,
+  type TruckEntity,
+  type TruckGetAllResponseDto,
+} from '../trucks/libs/types/types.js';
 import { type TruckService } from '../trucks/truck.service.js';
 import { type UserEntityT } from '../users/users.js';
 import { BusinessEntity } from './business.entity.js';
@@ -211,23 +215,26 @@ class BusinessService implements IService {
     return await this.driverService.delete(driverId);
   }
 
-  public checkisDriverBelongedToBusiness({
-    userId,
-    driverId,
-  }: {
-    userId: UserEntityT['id'];
-    driverId: ShiftEntity['driverId'];
-  }): Promise<boolean> {
-    return this.businessRepository.checkisDriverBelongedToBusiness(
-      userId,
-      driverId,
-    );
+  public async findAllTrucksByBusinessId(
+    userId: number,
+    query: PaginationWithSortingParameters,
+  ): Promise<TruckGetAllResponseDto> {
+    const business = await this.findByOwnerId(userId);
+
+    if (!business) {
+      throw new HttpError({
+        status: HttpCode.BAD_REQUEST,
+        message: HttpMessage.BUSINESS_DOES_NOT_EXIST,
+      });
+    }
+
+    return await this.truckService.findAllByBusinessId(business.id, query);
   }
 
-  public async findAllTrucksByOwnerId(
+  public async createTruck(
+    payload: TruckAddRequestDto,
     userId: number,
-    query: GetPaginatedPageQuery,
-  ): Promise<EntityPagination<TruckEntity>> {
+  ): Promise<TruckEntity> {
     const business = await this.findByOwnerId(userId);
 
     if (!business) {
@@ -237,7 +244,23 @@ class BusinessService implements IService {
       });
     }
 
-    return await this.truckService.findAllByBusinessId(business.id, query);
+    return await this.truckService.create({
+      ...payload,
+      businessId: business.id,
+    });
+  }
+
+  public checkisDriverBelongedToBusiness({
+    userId,
+    driverId,
+  }: {
+    userId: UserEntityT['id'];
+    driverId: ShiftEntity['driverId'];
+  }): Promise<boolean> {
+    return this.businessRepository.checkisDriverBelongedToBusiness(
+      userId,
+      driverId,
+    );
   }
 }
 

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

@@ -1,3 +1,7 @@
 export { type DriverHaveAccessToTruck } from './driver-have-acces-to-truck.type.js';
 export { type TruckDatabaseModel } from './truck-entity-type/truck-database-model.type.js';
-export { type TruckEntity } from 'shared/build/index.js';
+export {
+  type TruckAddRequestDto,
+  type TruckEntity,
+  type TruckGetAllResponseDto,
+} from 'shared/build/index.js';