chamomind/jws-backend
chamomind/jws-backend
6
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'chamomind/feat/20250709' into develop
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 5s
Details

Browse source
This commit is contained in:
Kanjana 2025-07-09 17:41:31 +07:00
commit 36c9c25f61
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/07-task-controller.ts
View file

@ -70,8 +70,9 @@ const permissionCheckCompany = createPermCheck((_) => true);
@Tags("Task Order") @Tags("Task Order")
export class TaskController extends Controller { export class TaskController extends Controller {
@Get("stats") @Get("stats")
async getTaskOrderStats() { async getTaskOrderStats(@Request() req: RequestWithUser) {
const task = await prisma.taskOrder.groupBy({ const task = await prisma.taskOrder.groupBy({
where: { registeredBranch: { OR: permissionCondCompany(req.user) } },
by: ["taskOrderStatus"], by: ["taskOrderStatus"],
_count: true, _count: true,
}); });

6
src/controllers/10-business-type-controller.ts
View file

@ -44,6 +44,8 @@ export class businessTypeController extends Controller {
const [result, total] = await prisma.$transaction([ const [result, total] = await prisma.$transaction([
prisma.businessType.findMany({ prisma.businessType.findMany({
where, where,
take: pageSize,
skip: (page - 1) * pageSize,
}), }),
prisma.businessType.count({ where }), prisma.businessType.count({ where }),
]); ]);
@ -84,7 +86,7 @@ export class businessTypeController extends Controller {
}); });
if (!record) throw notFoundError("BusinessType"); if (!record) throw notFoundError("BusinessType");
return await prisma.businessType.update({ return await tx.businessType.update({
where: { id: businessTypeId }, where: { id: businessTypeId },
data: { data: {
...body, ...body,
@ -103,7 +105,7 @@ export class businessTypeController extends Controller {
}); });
if (!record) throw notFoundError("BusinessType"); if (!record) throw notFoundError("BusinessType");
return await prisma.businessType.delete({ return await tx.businessType.delete({
where: { id: businessTypeId }, where: { id: businessTypeId },
}); });
}); });