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

feat: reuse function

Browse source
This commit is contained in:
Methapon Metanipat 2024-09-09 14:51:17 +07:00
parent 0893662536
commit d394549566
3 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/02-user-controller.ts
View file

@ -30,6 +30,7 @@ import {
} from "../services/keycloak"; } from "../services/keycloak";
import { isSystem } from "../utils/keycloak"; import { isSystem } from "../utils/keycloak";
import { fileLocation, listFile } from "../utils/minio"; import { fileLocation, listFile } from "../utils/minio";
import { filterStatus } from "../services/prisma";
if (!process.env.MINIO_BUCKET) { if (!process.env.MINIO_BUCKET) {
throw Error("Require MinIO bucket."); throw Error("Require MinIO bucket.");
@ -300,14 +301,6 @@ export class UserController extends Controller {
@Query() pageSize: number = 30, @Query() pageSize: number = 30,
@Query() status?: Status, @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 = { const where = {
OR: [ OR: [
{ firstName: { contains: query }, zipCode, userType, ...filterStatus(status) }, { firstName: { contains: query }, zipCode, userType, ...filterStatus(status) },

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

@ -20,6 +20,7 @@ import HttpError from "../interfaces/http-error";
import minio from "../services/minio"; import minio from "../services/minio";
import { isSystem } from "../utils/keycloak"; import { isSystem } from "../utils/keycloak";
import { branchRelationPermInclude, createPermCheck } from "../services/permission"; import { branchRelationPermInclude, createPermCheck } from "../services/permission";
import { filterStatus } from "../services/prisma";
if (!process.env.MINIO_BUCKET) { if (!process.env.MINIO_BUCKET) {
throw Error("Require MinIO bucket."); throw Error("Require MinIO bucket.");
@ -150,14 +151,6 @@ export class CustomerBranchController extends Controller {
@Query() page: number = 1, @Query() page: number = 1,
@Query() pageSize: number = 30, @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 = { const where = {
OR: [ OR: [
{ registerName: { contains: query } }, { registerName: { contains: query } },

7
src/controllers/03-customer-controller.ts
View file

@ -20,6 +20,7 @@ import HttpStatus from "../interfaces/http-status";
import HttpError from "../interfaces/http-error"; import HttpError from "../interfaces/http-error";
import { isSystem } from "../utils/keycloak"; import { isSystem } from "../utils/keycloak";
import { branchRelationPermInclude, createPermCheck } from "../services/permission"; import { branchRelationPermInclude, createPermCheck } from "../services/permission";
import { filterStatus } from "../services/prisma";
if (!process.env.MINIO_BUCKET) { if (!process.env.MINIO_BUCKET) {
throw Error("Require MinIO bucket."); throw Error("Require MinIO bucket.");
@ -137,12 +138,6 @@ export class CustomerController extends Controller {
@Query() pageSize: number = 30, @Query() pageSize: number = 30,
@Query() includeBranch: boolean = false, @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 = { const where = {
OR: [ OR: [
{ namePrefix: { contains: query } }, { namePrefix: { contains: query } },