Merge branch 'add-request-data-messenger' into develop
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 7s
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 7s
This commit is contained in:
commit
afca10983d
3 changed files with 53 additions and 0 deletions
5
prisma/migrations/20250403074007_add/migration.sql
Normal file
5
prisma/migrations/20250403074007_add/migration.sql
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
-- AlterTable
|
||||
ALTER TABLE "RequestData" ADD COLUMN "defaultMessengerId" TEXT;
|
||||
|
||||
-- AddForeignKey
|
||||
ALTER TABLE "RequestData" ADD CONSTRAINT "RequestData_defaultMessengerId_fkey" FOREIGN KEY ("defaultMessengerId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||
|
|
@ -493,6 +493,7 @@ model User {
|
|||
|
||||
requestWorkStepStatus RequestWorkStepStatus[]
|
||||
userTask UserTask[]
|
||||
RequestData RequestData[]
|
||||
}
|
||||
|
||||
model UserResponsibleArea {
|
||||
|
|
@ -1469,6 +1470,9 @@ model RequestData {
|
|||
|
||||
flow Json?
|
||||
|
||||
defaultMessenger User? @relation(fields: [defaultMessengerId], references: [id])
|
||||
defaultMessengerId String?
|
||||
|
||||
requestWork RequestWork[]
|
||||
|
||||
createdAt DateTime @default(now())
|
||||
|
|
|
|||
|
|
@ -230,6 +230,35 @@ export class RequestDataController extends Controller {
|
|||
|
||||
return record;
|
||||
}
|
||||
|
||||
@Post("updata-messenger")
|
||||
@Security("keycloak")
|
||||
async updateRequestData(
|
||||
@Request() req: RequestWithUser,
|
||||
@Body()
|
||||
boby: {
|
||||
defaultMessengerId: string;
|
||||
requestDataId: string[];
|
||||
},
|
||||
) {
|
||||
const record = await prisma.requestData.updateManyAndReturn({
|
||||
where: {
|
||||
id: { in: boby.requestDataId },
|
||||
quotation: {
|
||||
registeredBranch: {
|
||||
OR: permissionCond(req.user),
|
||||
},
|
||||
},
|
||||
},
|
||||
data: {
|
||||
defaultMessengerId: boby.defaultMessengerId,
|
||||
},
|
||||
});
|
||||
|
||||
if (record.length <= 0) throw notFoundError("Request Data");
|
||||
|
||||
return record[0];
|
||||
}
|
||||
}
|
||||
|
||||
@Route("/api/v1/request-data/{requestDataId}")
|
||||
|
|
@ -887,6 +916,21 @@ export class RequestListController extends Controller {
|
|||
update: payload,
|
||||
});
|
||||
|
||||
if (record.responsibleUserId === null) {
|
||||
await prisma.requestWorkStepStatus.update({
|
||||
where: {
|
||||
step_requestWorkId: {
|
||||
step: step,
|
||||
requestWorkId,
|
||||
},
|
||||
responsibleUserId: null,
|
||||
},
|
||||
data: {
|
||||
responsibleUserId: record.requestWork?.request.defaultMessengerId,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
switch (payload.workStatus) {
|
||||
case "Ready":
|
||||
if (record.requestWork.request.requestDataStatus === "Pending") {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue