complete rule engine and booking flow

apps/edr-freight-api/src/modules/rule-engine/controllers/approval-rules.controller.ts

@@ -0,0 +1,60 @@
+import {
+  Body, Controller, Delete, Get, HttpCode, HttpStatus,
+  Param, ParseUUIDPipe, Patch, Post, Query,
+} from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { CreateApprovalRuleDto } from '../dto/create-approval-rule.dto';
+import { UpdateApprovalRuleDto } from '../dto/update-approval-rule.dto';
+import { ApprovalRulesService } from '../services/approval-rules.service';
+
+@ApiTags('approval-rules')
+@Controller('approval-rules')
+// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
+@ApiBearerAuth()
+export class ApprovalRulesController {
+  constructor(private readonly service: ApprovalRulesService) {}
+
+  @Get()
+  @ApiOperation({ summary: 'List approval rules' })
+  findAll(@Query() query: Record<string, string>) {
+    return this.service.findAll({
+      requiresDirectorApproval:
+        query['requiresDirectorApproval'] !== undefined
+          ? query['requiresDirectorApproval'] === 'true'
+          : undefined,
+      page: query['page'] ? parseInt(query['page'], 10) : undefined,
+      pageSize: query['pageSize'] ? parseInt(query['pageSize'], 10) : undefined,
+    });
+  }
+
+  @Get('chain')
+  @ApiOperation({ summary: 'Get approval chain for cargo routing flag' })
+  findChain(@Query('requiresDirectorApproval') flag: string) {
+    return this.service.findChain(flag === 'true');
+  }
+
+  @Get(':id')
+  @ApiOperation({ summary: 'Get an approval rule by ID' })
+  findOne(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.findById(id);
+  }
+
+  @Post()
+  @ApiOperation({ summary: 'Create an approval rule step' })
+  create(@Body() dto: CreateApprovalRuleDto) {
+    return this.service.create(dto);
+  }
+
+  @Patch(':id')
+  @ApiOperation({ summary: 'Update an approval rule' })
+  update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateApprovalRuleDto) {
+    return this.service.update(id, dto);
+  }
+
+  @Delete(':id')
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({ summary: 'Soft-delete an approval rule' })
+  remove(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.remove(id);
+  }
+}

apps/edr-freight-api/src/modules/rule-engine/controllers/rates.controller.ts

@@ -0,0 +1,70 @@
+import {
+  Body, Controller, Delete, Get, HttpCode, HttpStatus,
+  Param, ParseUUIDPipe, Patch, Post, Query,
+} from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { ApproveRateDto, CreateRateDto } from '../dto/create-rate.dto';
+import { UpdateRateDto } from '../dto/update-rate.dto';
+import { RatesService } from '../services/rates.service';
+
+@ApiTags('rates')
+@Controller('rates')
+// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
+@ApiBearerAuth()
+export class RatesController {
+  constructor(private readonly service: RatesService) {}
+
+  @Get()
+  @ApiOperation({ summary: 'List rates' })
+  findAll(@Query() query: Record<string, string>) {
+    return this.service.findAll({
+      status: query['status'],
+      rateType: query['rateType'],
+      page: query['page'] ? parseInt(query['page'], 10) : undefined,
+      pageSize: query['pageSize'] ? parseInt(query['pageSize'], 10) : undefined,
+    });
+  }
+
+  @Get('live')
+  @ApiOperation({ summary: 'List all LIVE rates effective now' })
+  findLive() {
+    return this.service.findLiveRates();
+  }
+
+  @Get(':id')
+  @ApiOperation({ summary: 'Get a rate by ID' })
+  findOne(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.findById(id);
+  }
+
+  @Post()
+  @ApiOperation({ summary: 'Create a rate (DRAFT)' })
+  create(@Body() dto: CreateRateDto) {
+    return this.service.create(dto);
+  }
+
+  @Patch(':id')
+  @ApiOperation({ summary: 'Update a DRAFT rate' })
+  update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateRateDto) {
+    return this.service.update(id, dto);
+  }
+
+  @Post(':id/submit')
+  @ApiOperation({ summary: 'Submit rate for CEO approval' })
+  submit(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.submitForApproval(id);
+  }
+
+  @Post(':id/approve')
+  @ApiOperation({ summary: 'CEO approves a rate' })
+  approve(@Param('id', ParseUUIDPipe) id: string, @Body() dto: ApproveRateDto) {
+    return this.service.approve(id, dto);
+  }
+
+  @Delete(':id')
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({ summary: 'Soft-delete a rate' })
+  remove(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.remove(id);
+  }
+}

apps/edr-freight-api/src/modules/rule-engine/controllers/shipping-lines.controller.ts

@@ -0,0 +1,51 @@
+import {
+  Body, Controller, Delete, Get, HttpCode, HttpStatus,
+  Param, ParseUUIDPipe, Patch, Post, Query,
+} from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { CreateShippingLineDto } from '../dto/create-shipping-line.dto';
+import { UpdateShippingLineDto } from '../dto/update-shipping-line.dto';
+import { ShippingLinesService } from '../services/shipping-lines.service';
+
+@ApiTags('shipping-lines')
+@Controller('shipping-lines')
+// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
+@ApiBearerAuth()
+export class ShippingLinesController {
+  constructor(private readonly service: ShippingLinesService) {}
+
+  @Get()
+  @ApiOperation({ summary: 'List shipping lines' })
+  findAll(@Query() query: Record<string, string>) {
+    return this.service.findAll({
+      isActive: query['isActive'] !== undefined ? query['isActive'] === 'true' : undefined,
+      page: query['page'] ? parseInt(query['page'], 10) : undefined,
+      pageSize: query['pageSize'] ? parseInt(query['pageSize'], 10) : undefined,
+    });
+  }
+
+  @Get(':id')
+  @ApiOperation({ summary: 'Get a shipping line by ID' })
+  findOne(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.findById(id);
+  }
+
+  @Post()
+  @ApiOperation({ summary: 'Create a shipping line' })
+  create(@Body() dto: CreateShippingLineDto) {
+    return this.service.create(dto);
+  }
+
+  @Patch(':id')
+  @ApiOperation({ summary: 'Update a shipping line' })
+  update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateShippingLineDto) {
+    return this.service.update(id, dto);
+  }
+
+  @Delete(':id')
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({ summary: 'Soft-delete a shipping line' })
+  remove(@Param('id', ParseUUIDPipe) id: string) {
+    return this.service.remove(id);
+  }
+}

apps/edr-freight-api/src/modules/rule-engine/controllers/weight-limit-rules.controller.ts

@@ -18,7 +18,7 @@ export class WeightLimitRulesController {
   @ApiOperation({ summary: 'List weight limit rules' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
-      isActive: query['isActive'] !== undefined ? query['isActive'] === 'true' : undefined,
+      tradeDirection: query['tradeDirection'],
       containerTypeId: query['containerTypeId'],
       page: query['page'] ? parseInt(query['page'], 10) : undefined,
       pageSize: query['pageSize'] ? parseInt(query['pageSize'], 10) : undefined,

apps/edr-freight-api/src/modules/rule-engine/controllers/yards.controller.ts

@@ -3,49 +3,49 @@ import {
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { CreateSurchargeDto } from '../dto/create-surcharge.dto';
-import { UpdateSurchargeDto } from '../dto/update-surcharge.dto';
-import { SurchargesService } from '../services/surcharges.service';
+import { CreateYardDto } from '../dto/create-yard.dto';
+import { UpdateYardDto } from '../dto/update-yard.dto';
+import { YardsService } from '../services/yards.service';
 
-@ApiTags('surcharges')
-@Controller('surcharges')
+@ApiTags('yards')
+@Controller('yards')
 // @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
-export class SurchargesController {
-  constructor(private readonly service: SurchargesService) {}
+export class YardsController {
+  constructor(private readonly service: YardsService) {}
 
   @Get()
-  @ApiOperation({ summary: 'List surcharges' })
+  @ApiOperation({ summary: 'List yards' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
       isActive: query['isActive'] !== undefined ? query['isActive'] === 'true' : undefined,
-      surchargeTypeId: query['surchargeTypeId'],
+      country: query['country'],
       page: query['page'] ? parseInt(query['page'], 10) : undefined,
       pageSize: query['pageSize'] ? parseInt(query['pageSize'], 10) : undefined,
     });
   }
 
   @Get(':id')
-  @ApiOperation({ summary: 'Get a surcharge by ID' })
+  @ApiOperation({ summary: 'Get a yard by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
-  @ApiOperation({ summary: 'Create a surcharge' })
-  create(@Body() dto: CreateSurchargeDto) {
+  @ApiOperation({ summary: 'Create a yard' })
+  create(@Body() dto: CreateYardDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
-  @ApiOperation({ summary: 'Update a surcharge' })
-  update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateSurchargeDto) {
+  @ApiOperation({ summary: 'Update a yard' })
+  update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateYardDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
   @HttpCode(HttpStatus.NO_CONTENT)
-  @ApiOperation({ summary: 'Soft-delete a surcharge' })
+  @ApiOperation({ summary: 'Soft-delete a yard' })
   remove(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.remove(id);
   }