260318:1401 Fix UUID #05

backend/src/modules/rfa/rfa.controller.ts

@@ -4,7 +4,6 @@ import {
   Controller,
   Get,
   Param,
-  ParseIntPipe,
   Post,
   Query,
   UseGuards,
@@ -22,6 +21,7 @@ import { WorkflowActionDto } from '../correspondence/dto/workflow-action.dto';
 import { User } from '../user/entities/user.entity';
 import { CreateRfaDto } from './dto/create-rfa.dto';
 import { SubmitRfaDto } from './dto/submit-rfa.dto';
+import { SearchRfaDto } from './dto/search-rfa.dto';
 import { RfaService } from './rfa.service';
 
 import { Audit } from '../../common/decorators/audit.decorator';
@@ -29,13 +29,18 @@ import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { RequirePermission } from '../../common/decorators/require-permission.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { RbacGuard } from '../../common/guards/rbac.guard';
+import { ParseUuidPipe } from '../../common/pipes/parse-uuid.pipe';
+import { ProjectService } from '../project/project.service';
 
 @ApiTags('RFA (Request for Approval)')
 @ApiBearerAuth()
 @UseGuards(JwtAuthGuard, RbacGuard)
 @Controller('rfas')
 export class RfaController {
-  constructor(private readonly rfaService: RfaService) {}
+  constructor(
+    private readonly rfaService: RfaService,
+    private readonly projectService: ProjectService
+  ) {}
 
   @Post()
   @ApiOperation({ summary: 'Create new RFA (Draft)' })
@@ -47,24 +52,26 @@ export class RfaController {
     return this.rfaService.create(createDto, user);
   }
 
-  @Post(':id/submit')
+  @Post(':uuid/submit')
   @ApiOperation({ summary: 'Submit RFA to Workflow' })
-  @ApiParam({ name: 'id', description: 'RFA ID' })
+  @ApiParam({ name: 'uuid', description: 'RFA UUID (from correspondences.uuid)' })
   @ApiBody({ type: SubmitRfaDto })
   @ApiResponse({ status: 200, description: 'RFA submitted successfully' })
   @RequirePermission('rfa.create')
   @Audit('rfa.submit', 'rfa')
-  submit(
-    @Param('id', ParseIntPipe) id: number,
+  async submit(
+    @Param('uuid', ParseUuidPipe) uuid: string,
     @Body() submitDto: SubmitRfaDto,
     @CurrentUser() user: User
   ) {
-    return this.rfaService.submit(id, submitDto.templateId, user);
+    // ADR-019: resolve UUID → internal INT id via findOneByUuidRaw
+    const rfa = await this.rfaService.findOneByUuidRaw(uuid);
+    return this.rfaService.submit(rfa.id, submitDto.templateId, user);
   }
 
-  @Post(':id/action')
+  @Post(':uuid/action')
   @ApiOperation({ summary: 'Process Workflow Action (Approve/Reject)' })
-  @ApiParam({ name: 'id', description: 'RFA ID' })
+  @ApiParam({ name: 'uuid', description: 'RFA UUID (from correspondences.uuid)' })
   @ApiBody({ type: WorkflowActionDto })
   @ApiResponse({
     status: 200,
@@ -72,28 +79,33 @@ export class RfaController {
   })
   @RequirePermission('workflow.action_review')
   @Audit('rfa.action', 'rfa')
-  processAction(
-    @Param('id', ParseIntPipe) id: number,
+  async processAction(
+    @Param('uuid', ParseUuidPipe) uuid: string,
     @Body() actionDto: WorkflowActionDto,
     @CurrentUser() user: User
   ) {
-    return this.rfaService.processAction(id, actionDto, user);
+    // ADR-019: resolve UUID → internal INT id
+    const rfa = await this.rfaService.findOneByUuidRaw(uuid);
+    return this.rfaService.processAction(rfa.id, actionDto, user);
   }
 
   @Get()
   @ApiOperation({ summary: 'List all RFAs with pagination' })
   @ApiResponse({ status: 200, description: 'List of RFAs' })
   @RequirePermission('document.view')
-  findAll(@Query() query: any) {
+  async findAll(@Query() query: SearchRfaDto) {
+    // ADR-019: resolve projectUuid → internal INT projectId
+    const project = await this.projectService.findOneByUuid(query.projectUuid);
+    query.projectId = project.id;
     return this.rfaService.findAll(query);
   }
 
-  @Get(':id')
+  @Get(':uuid')
   @ApiOperation({ summary: 'Get RFA details with revisions and items' })
-  @ApiParam({ name: 'id', description: 'RFA ID' })
+  @ApiParam({ name: 'uuid', description: 'RFA UUID (from correspondences.uuid)' })
   @ApiResponse({ status: 200, description: 'RFA details' })
   @RequirePermission('document.view')
-  findOne(@Param('id', ParseIntPipe) id: number) {
-    return this.rfaService.findOne(id);
+  findOne(@Param('uuid', ParseUuidPipe) uuid: string) {
+    return this.rfaService.findOneByUuid(uuid);
   }
 }