feat: branch permission for task order
This commit is contained in:
parent
c09a15b858
commit
0bf7e9f740
2 changed files with 67 additions and 16 deletions
|
|
@ -312,6 +312,7 @@ model Branch {
|
||||||
productGroup ProductGroup[]
|
productGroup ProductGroup[]
|
||||||
quotation Quotation[]
|
quotation Quotation[]
|
||||||
workflowTemplate WorkflowTemplate[]
|
workflowTemplate WorkflowTemplate[]
|
||||||
|
taskOrder TaskOrder[]
|
||||||
}
|
}
|
||||||
|
|
||||||
model BranchBank {
|
model BranchBank {
|
||||||
|
|
@ -481,7 +482,6 @@ model User {
|
||||||
notificationReceive Notification[] @relation("NotificationReceiver")
|
notificationReceive Notification[] @relation("NotificationReceiver")
|
||||||
notificationRead Notification[]
|
notificationRead Notification[]
|
||||||
taskOrderCreated TaskOrder[] @relation("TaskOrderCreatedByUser")
|
taskOrderCreated TaskOrder[] @relation("TaskOrderCreatedByUser")
|
||||||
taskOrderAccepted TaskOrder[]
|
|
||||||
|
|
||||||
requestWorkStepStatus RequestWorkStepStatus[]
|
requestWorkStepStatus RequestWorkStepStatus[]
|
||||||
}
|
}
|
||||||
|
|
@ -1494,8 +1494,8 @@ model TaskOrder {
|
||||||
institution Institution @relation(fields: [institutionId], references: [id])
|
institution Institution @relation(fields: [institutionId], references: [id])
|
||||||
institutionId String
|
institutionId String
|
||||||
|
|
||||||
acceptedBy User? @relation(fields: [acceptedByUserId], references: [id])
|
registeredBranch Branch @relation(fields: [registeredBranchId], references: [id])
|
||||||
acceptedByUserId String?
|
registeredBranchId String
|
||||||
|
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
createdBy User @relation(name: "TaskOrderCreatedByUser", fields: [createdByUserId], references: [id])
|
createdBy User @relation(name: "TaskOrderCreatedByUser", fields: [createdByUserId], references: [id])
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,27 @@ import {
|
||||||
} from "tsoa";
|
} from "tsoa";
|
||||||
import prisma from "../db";
|
import prisma from "../db";
|
||||||
import { notFoundError } from "../utils/error";
|
import { notFoundError } from "../utils/error";
|
||||||
import { TaskStatus } from "@prisma/client";
|
import { RequestWorkStatus, TaskStatus } from "@prisma/client";
|
||||||
import { RequestWithUser } from "../interfaces/user";
|
import { RequestWithUser } from "../interfaces/user";
|
||||||
|
import {
|
||||||
|
branchRelationPermInclude,
|
||||||
|
createPermCheck,
|
||||||
|
createPermCondition,
|
||||||
|
} from "../services/permission";
|
||||||
|
import HttpError from "../interfaces/http-error";
|
||||||
|
import HttpStatus from "../interfaces/http-status";
|
||||||
|
|
||||||
|
const MANAGE_ROLES = ["system", "head_of_admin", "admin", "document_checker"];
|
||||||
|
|
||||||
|
function globalAllow(user: RequestWithUser["user"]) {
|
||||||
|
const allowList = ["system", "head_of_admin"];
|
||||||
|
return allowList.some((v) => user.roles?.includes(v));
|
||||||
|
}
|
||||||
|
|
||||||
|
const permissionCondCompany = createPermCondition((_) => true);
|
||||||
|
|
||||||
|
const permissionCheck = createPermCheck(globalAllow);
|
||||||
|
const permissionCheckCompany = createPermCheck((_) => true);
|
||||||
|
|
||||||
@Route("/api/v1/task")
|
@Route("/api/v1/task")
|
||||||
@Tags("Task Order")
|
@Tags("Task Order")
|
||||||
|
|
@ -40,6 +59,7 @@ export class TaskController extends Controller {
|
||||||
@Get()
|
@Get()
|
||||||
@Security("keycloak")
|
@Security("keycloak")
|
||||||
async getTaskOrderList(
|
async getTaskOrderList(
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
@Query() query: string = "",
|
@Query() query: string = "",
|
||||||
@Query() page = 1,
|
@Query() page = 1,
|
||||||
@Query() pageSize = 30,
|
@Query() pageSize = 30,
|
||||||
|
|
@ -49,6 +69,7 @@ export class TaskController extends Controller {
|
||||||
prisma.taskOrder.findMany({
|
prisma.taskOrder.findMany({
|
||||||
where: {
|
where: {
|
||||||
taskStatus,
|
taskStatus,
|
||||||
|
registeredBranch: { OR: permissionCondCompany(req.user) },
|
||||||
OR: [
|
OR: [
|
||||||
{ code: { contains: query, mode: "insensitive" } },
|
{ code: { contains: query, mode: "insensitive" } },
|
||||||
{ taskName: { contains: query } },
|
{ taskName: { contains: query } },
|
||||||
|
|
@ -58,7 +79,6 @@ export class TaskController extends Controller {
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
institution: true,
|
institution: true,
|
||||||
acceptedBy: true,
|
|
||||||
createdBy: true,
|
createdBy: true,
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
|
|
@ -70,9 +90,9 @@ export class TaskController extends Controller {
|
||||||
|
|
||||||
@Get("{taskId}")
|
@Get("{taskId}")
|
||||||
@Security("keycloak")
|
@Security("keycloak")
|
||||||
async getTaskOrder(@Path() taskId: string) {
|
async getTaskOrder(@Request() req: RequestWithUser, @Path() taskId: string) {
|
||||||
const record = await prisma.taskOrder.findFirst({
|
const record = await prisma.taskOrder.findFirst({
|
||||||
where: { id: taskId },
|
where: { id: taskId, registeredBranch: { OR: permissionCondCompany(req.user) } },
|
||||||
include: {
|
include: {
|
||||||
taskList: {
|
taskList: {
|
||||||
include: {
|
include: {
|
||||||
|
|
@ -84,7 +104,6 @@ export class TaskController extends Controller {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
institution: true,
|
institution: true,
|
||||||
acceptedBy: true,
|
|
||||||
createdBy: true,
|
createdBy: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
@ -95,7 +114,7 @@ export class TaskController extends Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@Security("keycloak")
|
@Security("keycloak", MANAGE_ROLES)
|
||||||
async createTaskOrderList(
|
async createTaskOrderList(
|
||||||
@Request() req: RequestWithUser,
|
@Request() req: RequestWithUser,
|
||||||
@Body()
|
@Body()
|
||||||
|
|
@ -106,6 +125,7 @@ export class TaskController extends Controller {
|
||||||
contactTel: string;
|
contactTel: string;
|
||||||
|
|
||||||
institutionId: string;
|
institutionId: string;
|
||||||
|
registeredBranchId?: string;
|
||||||
|
|
||||||
requestWork: { requestWorkId: string; step: number }[];
|
requestWork: { requestWorkId: string; step: number }[];
|
||||||
},
|
},
|
||||||
|
|
@ -131,6 +151,23 @@ export class TaskController extends Controller {
|
||||||
|
|
||||||
const { requestWork, ...rest } = body;
|
const { requestWork, ...rest } = body;
|
||||||
|
|
||||||
|
const userAffiliatedBranch = await tx.branch.findFirst({
|
||||||
|
include: branchRelationPermInclude(req.user),
|
||||||
|
where: body.registeredBranchId
|
||||||
|
? { id: body.registeredBranchId }
|
||||||
|
: {
|
||||||
|
user: { some: { userId: req.user.sub } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!userAffiliatedBranch) {
|
||||||
|
throw new HttpError(
|
||||||
|
HttpStatus.BAD_REQUEST,
|
||||||
|
"You must be affilated with at least one branch or specify branch to be registered (System permission required).",
|
||||||
|
"reqMinAffilatedBranch",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await permissionCheckCompany(req.user, userAffiliatedBranch);
|
||||||
|
|
||||||
await tx.taskOrder.create({
|
await tx.taskOrder.create({
|
||||||
include: {
|
include: {
|
||||||
taskList: {
|
taskList: {
|
||||||
|
|
@ -139,12 +176,12 @@ export class TaskController extends Controller {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
institution: true,
|
institution: true,
|
||||||
acceptedBy: true,
|
|
||||||
createdBy: true,
|
createdBy: true,
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
...rest,
|
...rest,
|
||||||
code,
|
code,
|
||||||
|
registeredBranchId: userAffiliatedBranch.id,
|
||||||
createdByUserId: req.user.sub,
|
createdByUserId: req.user.sub,
|
||||||
taskList: {
|
taskList: {
|
||||||
connect: requestWork.map((v) => ({ step_requestWorkId: v })),
|
connect: requestWork.map((v) => ({ step_requestWorkId: v })),
|
||||||
|
|
@ -156,6 +193,7 @@ export class TaskController extends Controller {
|
||||||
|
|
||||||
@Put("{taskId}")
|
@Put("{taskId}")
|
||||||
async editTaskById(
|
async editTaskById(
|
||||||
|
@Request() req: RequestWithUser,
|
||||||
@Path() taskId: string,
|
@Path() taskId: string,
|
||||||
@Body()
|
@Body()
|
||||||
body: {
|
body: {
|
||||||
|
|
@ -173,15 +211,19 @@ export class TaskController extends Controller {
|
||||||
const record = await prisma.taskOrder.findFirst({
|
const record = await prisma.taskOrder.findFirst({
|
||||||
where: { id: taskId },
|
where: { id: taskId },
|
||||||
include: {
|
include: {
|
||||||
|
registeredBranch: { include: branchRelationPermInclude(req.user) },
|
||||||
taskList: {
|
taskList: {
|
||||||
include: { requestWork: true },
|
include: { requestWork: true },
|
||||||
},
|
},
|
||||||
institution: true,
|
institution: true,
|
||||||
acceptedBy: true,
|
|
||||||
createdBy: true,
|
createdBy: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (!record) throw notFoundError("Task Order");
|
||||||
|
|
||||||
|
await permissionCheckCompany(req.user, record.registeredBranch);
|
||||||
|
|
||||||
await prisma.taskOrder.update({
|
await prisma.taskOrder.update({
|
||||||
where: { id: taskId },
|
where: { id: taskId },
|
||||||
include: {
|
include: {
|
||||||
|
|
@ -191,7 +233,7 @@ export class TaskController extends Controller {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
institution: true,
|
institution: true,
|
||||||
acceptedBy: true,
|
registeredBranch: true,
|
||||||
createdBy: true,
|
createdBy: true,
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
|
|
@ -217,11 +259,21 @@ export class TaskController extends Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Delete("{taskId}")
|
@Delete("{taskId}")
|
||||||
async deleteTask(@Path() taskId: string) {
|
@Security("keycloak", MANAGE_ROLES)
|
||||||
|
async deleteTask(@Request() req: RequestWithUser, @Path() taskId: string) {
|
||||||
await prisma.$transaction(async (tx) => {
|
await prisma.$transaction(async (tx) => {
|
||||||
let record = await tx.taskOrder.deleteMany({ where: { id: taskId } });
|
let record = await tx.taskOrder.findFirst({
|
||||||
|
where: { id: taskId },
|
||||||
|
include: {
|
||||||
|
registeredBranch: {
|
||||||
|
include: branchRelationPermInclude(req.user),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
if (record.count <= 0) throw notFoundError("Task Order");
|
if (!record) throw notFoundError("Task Order");
|
||||||
|
|
||||||
|
await permissionCheck(req.user, record.registeredBranch);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -247,7 +299,6 @@ export class TaskActionController extends Controller {
|
||||||
where: { id: taskId },
|
where: { id: taskId },
|
||||||
data: {
|
data: {
|
||||||
taskStatus: "InProgress",
|
taskStatus: "InProgress",
|
||||||
acceptedByUserId: req.user.sub,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
await tx.requestWorkStepStatus.updateMany({
|
await tx.requestWorkStepStatus.updateMany({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue