s.yahyaee/yara724-api
1
0
Fork 0
forked from Yara724/api
Code Pull Requests Activity

YARA-1115

Browse Source
This commit is contained in:
SepehrYahyaee
2026-07-14 11:23:39 +03:30
parent 6387ebaed0
commit 36a34e27b3
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/request-management/request-management.service.ts
View File

@@ -8695,13 +8695,16 @@ export class RequestManagementService {
partyRole: PartyRole, partyRole: PartyRole,
actor: any, actor: any,
): void { ): void {
// V4/V5 FileMaker files skip the location step — it is auto-completed here.
const skipLocation = !!(req as any).isMadeByFileMaker;
if (partyRole === PartyRole.FIRST) { if (partyRole === PartyRole.FIRST) {
this.pushWorkflowSteps(req, [ const completedSteps = skipLocation
WorkflowStep.CREATED, ? [WorkflowStep.CREATED, WorkflowStep.FIRST_INITIAL_FORM, WorkflowStep.FIRST_LOCATION]
WorkflowStep.FIRST_INITIAL_FORM, : [WorkflowStep.CREATED, WorkflowStep.FIRST_INITIAL_FORM];
]); this.pushWorkflowSteps(req, completedSteps);
req.workflow.currentStep = WorkflowStep.FIRST_LOCATION; req.workflow.currentStep = skipLocation ? WorkflowStep.FIRST_VOICE : WorkflowStep.FIRST_LOCATION;
req.workflow.nextStep = WorkflowStep.FIRST_VOICE; req.workflow.nextStep = skipLocation ? WorkflowStep.FIRST_DESCRIPTION : WorkflowStep.FIRST_VOICE;
const firstIdx = this.getPartyIndex(req, PartyRole.FIRST); const firstIdx = this.getPartyIndex(req, PartyRole.FIRST);
const guiltyUserId = req.parties?.[firstIdx]?.person?.userId; const guiltyUserId = req.parties?.[firstIdx]?.person?.userId;
@@ -8716,9 +8719,12 @@ export class RequestManagementService {
(req as any).markModified("expert"); (req as any).markModified("expert");
} }
} else { } else {
this.pushWorkflowSteps(req, [WorkflowStep.SECOND_INITIAL_FORM]); const completedSteps = skipLocation
req.workflow.currentStep = WorkflowStep.SECOND_LOCATION; ? [WorkflowStep.SECOND_INITIAL_FORM, WorkflowStep.SECOND_LOCATION]
req.workflow.nextStep = WorkflowStep.SECOND_VOICE; : [WorkflowStep.SECOND_INITIAL_FORM];
this.pushWorkflowSteps(req, completedSteps);
req.workflow.currentStep = skipLocation ? WorkflowStep.SECOND_VOICE : WorkflowStep.SECOND_LOCATION;
req.workflow.nextStep = skipLocation ? WorkflowStep.SECOND_DESCRIPTION : WorkflowStep.SECOND_VOICE;
} }
} }
@@ -9558,6 +9564,17 @@ export class RequestManagementService {
const req = await this.blameRequestDbService.findById(requestId); const req = await this.blameRequestDbService.findById(requestId);
if (!req) throw new NotFoundException("Request not found"); if (!req) throw new NotFoundException("Request not found");
await this.verifyExpertAccessForBlameV2(req, actor); await this.verifyExpertAccessForBlameV2(req, actor);
// V4/V5: location step is skipped — store whatever is sent but do not
// validate against workflow phase (the step was auto-completed at inquiry time).
if ((req as any).isMadeByFileMaker) {
const role = this.resolvePartyRoleV3(req, partyRole);
const idx = this.getPartyIndex(req, role);
if (idx !== -1 && body) req.parties[idx].location = body as any;
await (req as any).save();
return { requestId: req._id, publicId: req.publicId, partyRole: role };
}
const role = this.resolvePartyRoleV3(req, partyRole); const role = this.resolvePartyRoleV3(req, partyRole);
this.assertBlameV3PartyDetailPhase(req, role); this.assertBlameV3PartyDetailPhase(req, role);