diff --git a/src/controllers/branch-controller.ts b/src/controllers/branch-controller.ts index 34257bd..39e05c2 100644 --- a/src/controllers/branch-controller.ts +++ b/src/controllers/branch-controller.ts @@ -72,6 +72,10 @@ function lineImageLoc(id: string) { return `branch/line-qr-${id}`; } +function branchImageLoc(id: string) { + return `branch/branch-img-${id}`; +} + @Route("api/branch") @Tags("Branch") @Security("keycloak") @@ -197,10 +201,8 @@ export class BranchController extends Controller { ? await Promise.all( record.contact.map(async (v) => Object.assign(v, { - qrCodeImageUrl: await minio.presignedGetObject( - MINIO_BUCKET, - `branch/contact-${record.id}`, - ), + imageUrl: await minio.presignedGetObject(MINIO_BUCKET, branchImageLoc(v.id)), + qrCodeImageUrl: await minio.presignedGetObject(MINIO_BUCKET, lineImageLoc(v.id)), }), ), ) @@ -293,6 +295,8 @@ export class BranchController extends Controller { return Object.assign(record, { contact: await prisma.branchContact.findMany({ where: { branchId: record.id } }), + imageUrl: await minio.presignedGetObject(MINIO_BUCKET, branchImageLoc(record.id)), + imageUploadUrl: await minio.presignedPutObject(MINIO_BUCKET, branchImageLoc(record.id)), qrCodeImageUrl: await minio.presignedGetObject( MINIO_BUCKET, lineImageLoc(record.id), @@ -395,6 +399,8 @@ export class BranchController extends Controller { } return Object.assign(record, { + imageUrl: await minio.presignedGetObject(MINIO_BUCKET, branchImageLoc(record.id)), + imageUploadUrl: await minio.presignedPutObject(MINIO_BUCKET, branchImageLoc(record.id)), qrCodeImageUrl: await minio.presignedGetObject( MINIO_BUCKET, lineImageLoc(record.id), @@ -430,6 +436,9 @@ export class BranchController extends Controller { await minio.removeObject(MINIO_BUCKET, lineImageLoc(branchId), { forceDelete: true, }); + await minio.removeObject(MINIO_BUCKET, branchImageLoc(branchId), { + forceDelete: true, + }); return await prisma.branch.delete({ include: {