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

Merge branch 'develop'
All checks were successful
Spell Check / Spell Check with Typos (push) Successful in 3s
Details

Browse source
This commit is contained in:
Methapon2001 2025-08-22 09:42:03 +07:00
commit 893eb4cca5
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
prisma/migrations/20250814060937_add_updated_at_to_work_step/migration.sql Normal file
View file

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "RequestWorkStepStatus" ADD COLUMN "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

1
prisma/schema.prisma
View file

@ -1612,6 +1612,7 @@ model RequestWork {
model RequestWorkStepStatus { model RequestWorkStepStatus {
step Int step Int
workStatus RequestWorkStatus @default(Pending) workStatus RequestWorkStatus @default(Pending)
updatedAt DateTime @default(now()) @updatedAt
requestWork RequestWork @relation(fields: [requestWorkId], references: [id], onDelete: Cascade) requestWork RequestWork @relation(fields: [requestWorkId], references: [id], onDelete: Cascade)
requestWorkId String requestWorkId String

2
src/controllers/03-customer-branch-controller.ts
View file

@ -623,7 +623,7 @@ export class CustomerBranchFileController extends Controller {
}, },
}); });
if (!data) throw notFoundError("Customer Branch"); if (!data) throw notFoundError("Customer Branch");
await permissionCheck(user, data.customer.registeredBranch); await permissionCheckCompany(user, data.customer.registeredBranch);
} }
@Get("attachment") @Get("attachment")

4
src/controllers/03-employee-controller.ts
View file

@ -65,7 +65,9 @@ function globalAllow(user: RequestWithUser["user"]) {
return user.roles?.some((v) => listAllowed.includes(v)) || false; return user.roles?.some((v) => listAllowed.includes(v)) || false;
} }
const permissionCondCompany = createPermCondition((_) => true);
const permissionCond = createPermCondition(globalAllow); const permissionCond = createPermCondition(globalAllow);
const permissionCheckCompany = createPermCheck((_) => true);
const permissionCheck = createPermCheck(globalAllow); const permissionCheck = createPermCheck(globalAllow);
type EmployeeCreate = { type EmployeeCreate = {
@ -669,7 +671,7 @@ export class EmployeeFileController extends Controller {
}, },
}); });
if (!data) throw notFoundError("Employee"); if (!data) throw notFoundError("Employee");
await permissionCheck(user, data.customerBranch.customer.registeredBranch); await permissionCheckCompany(user, data.customerBranch.customer.registeredBranch);
} }
@Get("image") @Get("image")