diff --git a/src/controllers/02-user-controller.ts b/src/controllers/02-user-controller.ts index 360c2f2..afeb757 100644 --- a/src/controllers/02-user-controller.ts +++ b/src/controllers/02-user-controller.ts @@ -30,6 +30,7 @@ import { } from "../services/keycloak"; import { isSystem } from "../utils/keycloak"; import { fileLocation, listFile } from "../utils/minio"; +import { filterStatus } from "../services/prisma"; if (!process.env.MINIO_BUCKET) { throw Error("Require MinIO bucket."); @@ -300,14 +301,6 @@ export class UserController extends Controller { @Query() pageSize: number = 30, @Query() status?: Status, ) { - const filterStatus = (val?: Status) => { - if (!val) return {}; - - return val !== Status.CREATED && val !== Status.ACTIVE - ? { status: val } - : { OR: [{ status: Status.CREATED }, { status: Status.ACTIVE }] }; - }; - const where = { OR: [ { firstName: { contains: query }, zipCode, userType, ...filterStatus(status) }, diff --git a/src/controllers/03-customer-branch-controller.ts b/src/controllers/03-customer-branch-controller.ts index c3b70e9..7fe51e4 100644 --- a/src/controllers/03-customer-branch-controller.ts +++ b/src/controllers/03-customer-branch-controller.ts @@ -20,6 +20,7 @@ import HttpError from "../interfaces/http-error"; import minio from "../services/minio"; import { isSystem } from "../utils/keycloak"; import { branchRelationPermInclude, createPermCheck } from "../services/permission"; +import { filterStatus } from "../services/prisma"; if (!process.env.MINIO_BUCKET) { throw Error("Require MinIO bucket."); @@ -150,14 +151,6 @@ export class CustomerBranchController extends Controller { @Query() page: number = 1, @Query() pageSize: number = 30, ) { - const filterStatus = (val?: Status) => { - if (!val) return {}; - - return val !== Status.CREATED && val !== Status.ACTIVE - ? { status: val } - : { OR: [{ status: Status.CREATED }, { status: Status.ACTIVE }] }; - }; - const where = { OR: [ { registerName: { contains: query } }, diff --git a/src/controllers/03-customer-controller.ts b/src/controllers/03-customer-controller.ts index 6f7a536..9af0a15 100644 --- a/src/controllers/03-customer-controller.ts +++ b/src/controllers/03-customer-controller.ts @@ -20,6 +20,7 @@ import HttpStatus from "../interfaces/http-status"; import HttpError from "../interfaces/http-error"; import { isSystem } from "../utils/keycloak"; import { branchRelationPermInclude, createPermCheck } from "../services/permission"; +import { filterStatus } from "../services/prisma"; if (!process.env.MINIO_BUCKET) { throw Error("Require MinIO bucket."); @@ -137,12 +138,6 @@ export class CustomerController extends Controller { @Query() pageSize: number = 30, @Query() includeBranch: boolean = false, ) { - const filterStatus = (val?: Status) => { - if (!val) return {}; - return val !== Status.CREATED && val !== Status.ACTIVE - ? { status: val } - : { OR: [{ status: Status.CREATED }, { status: Status.ACTIVE }] }; - }; const where = { OR: [ { namePrefix: { contains: query } },