booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateApprovalRuleDto } from '../dto/create-approval-rule.dto';
 import { UpdateApprovalRuleDto } from '../dto/update-approval-rule.dto';
@@ -9,12 +10,12 @@ 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()
+  @RuleEngineView('approval-rules')
   @ApiOperation({ summary: 'List approval rules' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -28,30 +29,35 @@ export class ApprovalRulesController {
   }
 
   @Get('chain')
+  @RuleEngineView('approval-rules')
   @ApiOperation({ summary: 'Get approval chain for cargo routing flag' })
   findChain(@Query('requiresDirectorApproval') flag: string) {
     return this.service.findChain(flag === 'true');
   }
 
   @Get(':id')
+  @RuleEngineView('approval-rules')
   @ApiOperation({ summary: 'Get an approval rule by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('approval-rules')
   @ApiOperation({ summary: 'Create an approval rule step' })
   create(@Body() dto: CreateApprovalRuleDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('approval-rules')
   @ApiOperation({ summary: 'Update an approval rule' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateApprovalRuleDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('approval-rules')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete an approval rule' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -3,18 +3,19 @@ import {
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { CreateCargoTypeDto } from '../dto/create-cargo-type.dto';
 import { UpdateCargoTypeDto } from '../dto/update-cargo-type.dto';
 import { CargoTypesService } from '../services/cargo-types.service';
 
 @ApiTags('cargo-types')
 @Controller('cargo-types')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class CargoTypesController {
   constructor(private readonly service: CargoTypesService) {}
 
   @Get()
+  @RuleEngineView('cargo-types')
   @ApiOperation({ summary: 'List cargo types' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -32,24 +33,28 @@ export class CargoTypesController {
   }
 
   @Get(':id')
+  @RuleEngineView('cargo-types')
   @ApiOperation({ summary: 'Get a cargo type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('cargo-types')
   @ApiOperation({ summary: 'Create a cargo type' })
   create(@Body() dto: CreateCargoTypeDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('cargo-types')
   @ApiOperation({ summary: 'Update a cargo type' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateCargoTypeDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('cargo-types')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a cargo type' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -3,18 +3,19 @@ import {
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { CreateContainerTypeDto } from '../dto/create-container-type.dto';
 import { UpdateContainerTypeDto } from '../dto/update-container-type.dto';
 import { ContainerTypesService } from '../services/container-types.service';
 
 @ApiTags('container-types')
 @Controller('container-types')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class ContainerTypesController {
   constructor(private readonly service: ContainerTypesService) {}
 
   @Get()
+  @RuleEngineView('container-types')
   @ApiOperation({ summary: 'List container types' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -25,24 +26,28 @@ export class ContainerTypesController {
   }
 
   @Get(':id')
+  @RuleEngineView('container-types')
   @ApiOperation({ summary: 'Get a container type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('container-types')
   @ApiOperation({ summary: 'Create a container type' })
   create(@Body() dto: CreateContainerTypeDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('container-types')
   @ApiOperation({ summary: 'Update a container type' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateContainerTypeDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('container-types')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a container type' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreatePriorityRuleDto } from '../dto/create-priority-rule.dto';
 import { UpdatePriorityRuleDto } from '../dto/update-priority-rule.dto';
@@ -9,12 +10,12 @@ import { PriorityRulesService } from '../services/priority-rules.service';
 
 @ApiTags('priority-rules')
 @Controller('priority-rules')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class PriorityRulesController {
   constructor(private readonly service: PriorityRulesService) {}
 
   @Get()
+  @RuleEngineView('priority-rules')
   @ApiOperation({ summary: 'List priority rules' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -25,24 +26,28 @@ export class PriorityRulesController {
   }
 
   @Get(':id')
+  @RuleEngineView('priority-rules')
   @ApiOperation({ summary: 'Get a priority rule by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('priority-rules')
   @ApiOperation({ summary: 'Create a priority rule' })
   create(@Body() dto: CreatePriorityRuleDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('priority-rules')
   @ApiOperation({ summary: 'Update a priority rule' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdatePriorityRuleDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('priority-rules')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a priority rule' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -1,10 +1,10 @@
 import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
-  Param, ParseUUIDPipe, Patch, Post, Query, UseGuards,
+  Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CurrentUser } from '@edr/api-common';
-import { JwtGuard } from '@tria-plc/api-common/modules/auth/services/jwt.guard';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { CreateRateDto } from '../dto/create-rate.dto';
 import {
   type AuthUserPayload,
@@ -15,12 +15,12 @@ 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()
+  @RuleEngineView('rates')
   @ApiOperation({ summary: 'List rates' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -32,19 +32,21 @@ export class RatesController {
   }
 
   @Get('live')
+  @RuleEngineView('rates')
   @ApiOperation({ summary: 'List all LIVE rates effective now' })
   findLive() {
     return this.service.findLiveRates();
   }
 
   @Get(':id')
+  @RuleEngineView('rates')
   @ApiOperation({ summary: 'Get a rate by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
-  @UseGuards(JwtGuard)
+  @RuleEngineManage('rates')
   @ApiOperation({ summary: 'Create a rate (DRAFT)' })
   create(
     @Body() dto: CreateRateDto,
@@ -54,19 +56,21 @@ export class RatesController {
   }
 
   @Patch(':id')
+  @RuleEngineManage('rates')
   @ApiOperation({ summary: 'Update a DRAFT rate' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateRateDto) {
     return this.service.update(id, dto);
   }
 
   @Post(':id/submit')
+  @RuleEngineManage('rates')
   @ApiOperation({ summary: 'Submit rate for CEO approval' })
   submit(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.submitForApproval(id);
   }
 
   @Post(':id/approve')
-  @UseGuards(JwtGuard)
+  @RuleEngineManage('rates')
   @ApiOperation({ summary: 'CEO approves a rate' })
   approve(
     @Param('id', ParseUUIDPipe) id: string,
@@ -76,6 +80,7 @@ export class RatesController {
   }
 
   @Delete(':id')
+  @RuleEngineManage('rates')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a rate' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateServiceTypeDto } from '../dto/create-service-type.dto';
 import { UpdateServiceTypeDto } from '../dto/update-service-type.dto';
@@ -9,12 +10,12 @@ import { ServiceTypesService } from '../services/service-types.service';
 
 @ApiTags('service-types')
 @Controller('service-types')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class ServiceTypesController {
   constructor(private readonly service: ServiceTypesService) {}
 
   @Get()
+  @RuleEngineView('service-types')
   @ApiOperation({ summary: 'List service types' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -29,24 +30,28 @@ export class ServiceTypesController {
   }
 
   @Get(':id')
+  @RuleEngineView('service-types')
   @ApiOperation({ summary: 'Get a service type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('service-types')
   @ApiOperation({ summary: 'Create a service type' })
   create(@Body() dto: CreateServiceTypeDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('service-types')
   @ApiOperation({ summary: 'Update a service type' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateServiceTypeDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('service-types')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a service type' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateShippingLineDto } from '../dto/create-shipping-line.dto';
 import { UpdateShippingLineDto } from '../dto/update-shipping-line.dto';
@@ -9,12 +10,12 @@ 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()
+  @RuleEngineView('shipping-lines')
   @ApiOperation({ summary: 'List shipping lines' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -25,24 +26,28 @@ export class ShippingLinesController {
   }
 
   @Get(':id')
+  @RuleEngineView('shipping-lines')
   @ApiOperation({ summary: 'Get a shipping line by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('shipping-lines')
   @ApiOperation({ summary: 'Create a shipping line' })
   create(@Body() dto: CreateShippingLineDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('shipping-lines')
   @ApiOperation({ summary: 'Update a shipping line' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateShippingLineDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('shipping-lines')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a shipping line' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateSurchargeTypeDto } from '../dto/create-surcharge-type.dto';
 import { UpdateSurchargeTypeDto } from '../dto/update-surcharge-type.dto';
@@ -9,12 +10,12 @@ import { SurchargeTypesService } from '../services/surcharge-types.service';
 
 @ApiTags('surcharge-types')
 @Controller('surcharge-types')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class SurchargeTypesController {
   constructor(private readonly service: SurchargeTypesService) {}
 
   @Get()
+  @RuleEngineView('surcharge-types')
   @ApiOperation({ summary: 'List surcharge types' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -25,24 +26,28 @@ export class SurchargeTypesController {
   }
 
   @Get(':id')
+  @RuleEngineView('surcharge-types')
   @ApiOperation({ summary: 'Get a surcharge type by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('surcharge-types')
   @ApiOperation({ summary: 'Create a surcharge type' })
   create(@Body() dto: CreateSurchargeTypeDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('surcharge-types')
   @ApiOperation({ summary: 'Update a surcharge type' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateSurchargeTypeDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('surcharge-types')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a surcharge type' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateWeightLimitRuleDto } from '../dto/create-weight-limit-rule.dto';
 import { UpdateWeightLimitRuleDto } from '../dto/update-weight-limit-rule.dto';
@@ -9,12 +10,12 @@ import { WeightLimitRulesService } from '../services/weight-limit-rules.service'
 
 @ApiTags('weight-limit-rules')
 @Controller('weight-limit-rules')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class WeightLimitRulesController {
   constructor(private readonly service: WeightLimitRulesService) {}
 
   @Get()
+  @RuleEngineView('weight-limit-rules')
   @ApiOperation({ summary: 'List weight limit rules' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -26,24 +27,28 @@ export class WeightLimitRulesController {
   }
 
   @Get(':id')
+  @RuleEngineView('weight-limit-rules')
   @ApiOperation({ summary: 'Get a weight limit rule by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('weight-limit-rules')
   @ApiOperation({ summary: 'Create a weight limit rule' })
   create(@Body() dto: CreateWeightLimitRuleDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('weight-limit-rules')
   @ApiOperation({ summary: 'Update a weight limit rule' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateWeightLimitRuleDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('weight-limit-rules')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a weight limit rule' })
   remove(@Param('id', ParseUUIDPipe) id: string) {

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

@@ -2,6 +2,7 @@ import {
   Body, Controller, Delete, Get, HttpCode, HttpStatus,
   Param, ParseUUIDPipe, Patch, Post, Query,
 } from '@nestjs/common';
+import { RuleEngineManage, RuleEngineView } from '../../../common/rule-engine-guards';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateYardDto } from '../dto/create-yard.dto';
 import { UpdateYardDto } from '../dto/update-yard.dto';
@@ -9,12 +10,12 @@ import { YardsService } from '../services/yards.service';
 
 @ApiTags('yards')
 @Controller('yards')
-// @UseGuards(JwtAuthGuard) — TODO: add when auth package integrated
 @ApiBearerAuth()
 export class YardsController {
   constructor(private readonly service: YardsService) {}
 
   @Get()
+  @RuleEngineView('yards')
   @ApiOperation({ summary: 'List yards' })
   findAll(@Query() query: Record<string, string>) {
     return this.service.findAll({
@@ -26,24 +27,28 @@ export class YardsController {
   }
 
   @Get(':id')
+  @RuleEngineView('yards')
   @ApiOperation({ summary: 'Get a yard by ID' })
   findOne(@Param('id', ParseUUIDPipe) id: string) {
     return this.service.findById(id);
   }
 
   @Post()
+  @RuleEngineManage('yards')
   @ApiOperation({ summary: 'Create a yard' })
   create(@Body() dto: CreateYardDto) {
     return this.service.create(dto);
   }
 
   @Patch(':id')
+  @RuleEngineManage('yards')
   @ApiOperation({ summary: 'Update a yard' })
   update(@Param('id', ParseUUIDPipe) id: string, @Body() dto: UpdateYardDto) {
     return this.service.update(id, dto);
   }
 
   @Delete(':id')
+  @RuleEngineManage('yards')
   @HttpCode(HttpStatus.NO_CONTENT)
   @ApiOperation({ summary: 'Soft-delete a yard' })
   remove(@Param('id', ParseUUIDPipe) id: string) {