storemw-core-api 1.0.35 → 1.0.37

package/dist/controllers/file/fileController.js

@@ -50,21 +50,26 @@ const uploadFiles = async (req, res, next) => {
         const storageProviderName = configs_1.config.FILE_STORAGE_PROVIDER_NAME;
         const storageProviderOptions = {
             basePath: `${configs_1.config.FILE_STORAGE_LOCAL_BASE_PATH}`,
-            baseUrl: `${configs_1.config.FILE_STORAGE_LOCAL_BASE_URL}`
+            publicBaseUrl: `${configs_1.config.FILE_STORAGE_LOCAL_BASE_URL}`,
+            skipFoldernameByModuleRef: false,
+            skipFoldernameByDate: false
         };
+        // google cloud storage
+        // const storageProviderName = "gcloud"
+        // const storageProviderOptions = {
+        //     bucketName: `chinlai-erp-delivery`,
+        //     basePath: `today`,
+        //     credentials: `${path.resolve(process.cwd(), "config/chinlai-erp-api-253ac2637a8e.json")}`,
+        //     publicBaseUrl: `https://storage.googleapis.com/${process.env.GCLOUD_BUCKET}`,
+        //     skipFoldernameByModuleRef: true,
+        //     skipFoldernameByDate: true
+        // }
         const imageCompressionOptions = configs_1.config.FILE_UPLOAD_IMAGE_MAX_WIDTH && configs_1.config.FILE_UPLOAD_IMAGE_QUALITY
             ? {
                 maxWidth: Number(configs_1.config.FILE_UPLOAD_IMAGE_MAX_WIDTH),
                 quality: Number(configs_1.config.FILE_UPLOAD_IMAGE_QUALITY),
             }
             : undefined;
-        // google cloud storage
-        // const storageProviderName = "gcloud"
-        // const storageProviderOptions = {
-        //     bucketName: process.env.GCLOUD_BUCKET!,
-        //     credentials: process.env.GCLOUD_KEY_FILE!,
-        //     publicBaseUrl: `https://storage.googleapis.com/${process.env.GCLOUD_BUCKET}`
-        // }
         const fileService = (0, services_1.FileService)({
             ...(0, utils_1.getDefaultServiceProps)(req),
         });

package/dist/controllers/file/fileController.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileController.js","sourceRoot":"","sources":["../../../src/controllers/file/fileController.ts"],"names":[],"mappings":"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","sourcesContent":["import { Request, Response, NextFunction } from \"express\";\n\nimport { getDefaultServiceProps, sendSuccess, sendError, HTTP_STATUS } from \"@/utils\"\n\nimport { FileService, FileUploadProps, FileImageCompressionOptions } from \"@/services\"\nimport {\n    schemaFileDeletePayload,\n    schemaFileUploadPayload,\n} from \"@/schema/payload\";\n\nimport { QueryList } from \"@/schema/middleware/route\";\n\nimport { config } from \"@/configs\";\n\nconst getRootName = (toSingular: boolean) => {\n\n    let rootName = toSingular ? \"file\" : \"files\";\n\n    return rootName\n}\n\n/** file/:fileId : get file */\nexport const getFile = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n    try {\n\n        const { fileId } = req.params;\n        // const requestQuery = req.query as unknown as QueryList;\n        // const requestDocumentType = documentType as FileServiceProps[\"documentType\"];\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        const data = await fileService.getFile({ id: Number(fileId) })\n\n        return sendSuccess(res, data, \"Retrieved successfully\", getRootName(true));\n\n    } catch (error: any) {\n        next(error)\n    }\n}\n\n/** files : upload files */\nexport const uploadFiles = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n    try {\n\n        let reqBody = req.body\n        let reqFiles = req.files\n\n        const request = schemaFileUploadPayload.parse({\n            field_ref: reqBody.field_ref,\n            field_module: reqBody.field_module,\n            description: reqBody.description,\n            tagName: reqBody.tag_name,\n            label: reqBody.label,\n            refId: Number(reqBody.ref_id),\n            files: Array.isArray(reqFiles) ? reqFiles.map((file: any) => ({\n                originalname: file.originalname,\n                mimetype: file.mimetype,\n                size: file.size,\n                buffer: file.buffer,\n            })) : [],\n        });\n\n        // hardcode here\n        // local storage\n        const storageProviderName = config.FILE_STORAGE_PROVIDER_NAME as FileUploadProps[\"storageProviderName\"]\n        const storageProviderOptions = {\n            basePath: `${config.FILE_STORAGE_LOCAL_BASE_PATH}`,\n            baseUrl: `${config.FILE_STORAGE_LOCAL_BASE_URL}`\n        }\n        const imageCompressionOptions: FileImageCompressionOptions | undefined\n            = config.FILE_UPLOAD_IMAGE_MAX_WIDTH && config.FILE_UPLOAD_IMAGE_QUALITY\n                ? {\n                    maxWidth: Number(config.FILE_UPLOAD_IMAGE_MAX_WIDTH),\n                    quality: Number(config.FILE_UPLOAD_IMAGE_QUALITY),\n                }\n                : undefined;\n\n        // google cloud storage\n        // const storageProviderName = \"gcloud\"\n        // const storageProviderOptions = {\n        //     bucketName: process.env.GCLOUD_BUCKET!,\n        //     credentials: process.env.GCLOUD_KEY_FILE!,\n        //     publicBaseUrl: `https://storage.googleapis.com/${process.env.GCLOUD_BUCKET}`\n        // }\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        });\n\n        const payload: FileUploadProps = {\n            field_ref: reqBody.field_ref,\n            field_module: reqBody.field_module,\n            description: request.description,\n            label: request.label,\n            tagName: request.tagName ?? \"\",\n            refId: request.refId ?? 0,\n            storageProviderName,\n            storageProviderOptions,\n            ...(imageCompressionOptions ? { imageCompressionOptions } : {}),\n            files: request.files.map(file => ({\n                buffer: file.buffer,\n                originalName: file.originalname,\n                mimeType: file.mimetype,\n                sizeBytes: file.size,\n            })),\n        };\n\n        const response = await fileService.uploadFiles(payload);\n\n        return sendSuccess(res, response, \"Files uploaded successfully\");\n\n    } catch (error) {\n        next(error);\n    }\n};\n\n/** file/:fileId : update file */\nexport const updateFile = async (req: Request, res: Response, next: NextFunction): Promise<void> => {\n    try {\n\n        const { fileId } = req.params;\n        // const requestDocumentType = req.body.scope.target as FileServiceProps[\"documentType\"]\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        let response: any = {}\n\n        let reqScope = req.body.scope\n        let reqPayload = req.body.payload\n\n\n        // const { schemaUpdate, key } = documentSalesMap[requestDocumentType as keyof typeof documentSalesMap];\n\n        // const request = schemaUpdate.parse({\n        //     scope: { target: reqScope.target, action: reqScope.action },\n        //     payload: {\n        //         ...buildDocumentPayloadFromRequest(reqPayload),\n        //         profile: buildDocumentProfileFromRequest(reqPayload.profile),\n        //         shipping: buildDocumentProfileOtherFromRequest(reqPayload.shipping),\n        //         billing: buildDocumentProfileOtherFromRequest(reqPayload.billing),\n        //         ...(reqPayload?.items ? { items: buildDocumentItemsFromRequest(reqPayload.items) } : {}),\n        //         ...(reqPayload?.totals ? { totals: buildDocumentTotalsFromRequest(reqPayload.totals) } : {}),\n        //     },\n        // });\n\n        // const payload: DocumentUpdateProps = {\n        //     documentId: Number(documentId),\n        //     documentType: requestDocumentType,\n        //     data: {\n        //         ...buildDocumentPayloadToService(request.payload),\n        //         [key]: {\n        //             profile: buildDocumentProfileToService(request.payload.profile),\n        //             shipping: buildDocumentProfileOtherToService(request.payload.shipping),\n        //             billing: buildDocumentProfileOtherToService(request.payload.billing),\n        //             ...(request.payload?.items ? { items: buildDocumentItemsToService(request.payload.items) } : {}),\n        //             ...(request.payload?.totals ? { totals: buildDocumentTotalsToService(request.payload.totals) } : {}),\n        //         },\n        //     } as any,\n        // };\n\n        // const result = await fileService.updateFile(payload);\n\n        // response = {\n        //     [getRootName(true)]: result,\n        // };\n\n        sendSuccess(res, response, `File updated successfully`)\n\n    } catch (error: any) {\n        next(error)\n    }\n};\n\n/** files : list files */\nexport const listFiles = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n    try {\n\n        const requestQuery = req.query as unknown as QueryList;\n        // const requestDocumentType = req.params.documentType as FileServiceProps[\"documentType\"];\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        const { data, total } = await fileService.listFiles({\n            ...requestQuery,\n        });\n\n        let response = {\n            [`${getRootName(false)}`]: data,\n            total,\n        }\n\n        return sendSuccess(res, response, \"Retrieved successfully\");\n\n    } catch (error: any) {\n        next(error)\n    }\n};\n\n/** files/delete : delete files */\nexport const deleteFiles = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n    try {\n\n        // const requestDocumentType = req.body.scope.target as FileServiceProps[\"documentType\"]\n        // const requestQuery = req.query as unknown as QueryList;\n        // const requestFileId = Number(req.params.fileId)\n\n        const request = schemaFileDeletePayload.parse(req.body)\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        const payload = {\n            fileIds: request.payload.ids.map(i => BigInt(i))\n        }\n\n        const data = await fileService.removeFiles(payload);\n\n        return sendSuccess(res, data, \"Deleted\", getRootName(false));\n\n    } catch (error: any) {\n        next(error)\n    }\n};\n\n/** file/data_types : get file data types */\n// export const getFileDataTypes = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n//     try {\n\n//         const requestQuery = req.query as unknown as QueryList;\n//         // const requestDocumentType = req.params.documentType as FileServiceProps[\"documentType\"];\n\n//         const fileService = FileService({\n//             ...getDefaultServiceProps(req),\n//         })\n\n//         const data = fileService.getFileDataTypes();\n\n//         let response = {\n//             data_types: data\n//         }\n\n//         return sendSuccess(res, response, \"Retrieved successfully\");\n\n//     } catch (error: any) {\n//         next(error)\n//     }\n// };\n"]}
+{"version":3,"file":"fileController.js","sourceRoot":"","sources":["../../../src/controllers/file/fileController.ts"],"names":[],"mappings":"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","sourcesContent":["import { Request, Response, NextFunction } from \"express\";\n\nimport path from \"path\";\n\nimport { getDefaultServiceProps, sendSuccess, sendError, HTTP_STATUS } from \"@/utils\"\n\nimport { FileService, FileUploadProps, FileImageCompressionOptions } from \"@/services\"\nimport {\n    schemaFileDeletePayload,\n    schemaFileUploadPayload,\n} from \"@/schema/payload\";\n\nimport { QueryList } from \"@/schema/middleware/route\";\n\nimport { config } from \"@/configs\";\n\nconst getRootName = (toSingular: boolean) => {\n\n    let rootName = toSingular ? \"file\" : \"files\";\n\n    return rootName\n}\n\n/** file/:fileId : get file */\nexport const getFile = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n    try {\n\n        const { fileId } = req.params;\n        // const requestQuery = req.query as unknown as QueryList;\n        // const requestDocumentType = documentType as FileServiceProps[\"documentType\"];\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        const data = await fileService.getFile({ id: Number(fileId) })\n\n        return sendSuccess(res, data, \"Retrieved successfully\", getRootName(true));\n\n    } catch (error: any) {\n        next(error)\n    }\n}\n\n/** files : upload files */\nexport const uploadFiles = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n    try {\n\n        let reqBody = req.body\n        let reqFiles = req.files\n\n        const request = schemaFileUploadPayload.parse({\n            field_ref: reqBody.field_ref,\n            field_module: reqBody.field_module,\n            description: reqBody.description,\n            tagName: reqBody.tag_name,\n            label: reqBody.label,\n            refId: Number(reqBody.ref_id),\n            files: Array.isArray(reqFiles) ? reqFiles.map((file: any) => ({\n                originalname: file.originalname,\n                mimetype: file.mimetype,\n                size: file.size,\n                buffer: file.buffer,\n            })) : [],\n        });\n\n        // hardcode here\n        // local storage\n        const storageProviderName = config.FILE_STORAGE_PROVIDER_NAME as FileUploadProps[\"storageProviderName\"]\n        const storageProviderOptions = {\n            basePath: `${config.FILE_STORAGE_LOCAL_BASE_PATH}`,\n            publicBaseUrl: `${config.FILE_STORAGE_LOCAL_BASE_URL}`,\n            skipFoldernameByModuleRef: false,\n            skipFoldernameByDate: false\n        }\n\n        // google cloud storage\n        // const storageProviderName = \"gcloud\"\n        // const storageProviderOptions = {\n        //     bucketName: `chinlai-erp-delivery`,\n        //     basePath: `today`,\n        //     credentials: `${path.resolve(process.cwd(), \"config/chinlai-erp-api-253ac2637a8e.json\")}`,\n        //     publicBaseUrl: `https://storage.googleapis.com/${process.env.GCLOUD_BUCKET}`,\n        //     skipFoldernameByModuleRef: true,\n        //     skipFoldernameByDate: true\n        // }\n\n        const imageCompressionOptions: FileImageCompressionOptions | undefined\n            = config.FILE_UPLOAD_IMAGE_MAX_WIDTH && config.FILE_UPLOAD_IMAGE_QUALITY\n                ? {\n                    maxWidth: Number(config.FILE_UPLOAD_IMAGE_MAX_WIDTH),\n                    quality: Number(config.FILE_UPLOAD_IMAGE_QUALITY),\n                }\n                : undefined;\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        });\n\n        const payload: FileUploadProps = {\n            field_ref: reqBody.field_ref,\n            field_module: reqBody.field_module,\n            description: request.description,\n            label: request.label,\n            tagName: request.tagName ?? \"\",\n            refId: request.refId ?? 0,\n            storageProviderName,\n            storageProviderOptions,\n            ...(imageCompressionOptions ? { imageCompressionOptions } : {}),\n            files: request.files.map(file => ({\n                buffer: file.buffer,\n                originalName: file.originalname,\n                mimeType: file.mimetype,\n                sizeBytes: file.size,\n            })),\n        };\n\n        const response = await fileService.uploadFiles(payload);\n\n        return sendSuccess(res, response, \"Files uploaded successfully\");\n\n    } catch (error) {\n        next(error);\n    }\n};\n\n/** file/:fileId : update file */\nexport const updateFile = async (req: Request, res: Response, next: NextFunction): Promise<void> => {\n    try {\n\n        const { fileId } = req.params;\n        // const requestDocumentType = req.body.scope.target as FileServiceProps[\"documentType\"]\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        let response: any = {}\n\n        let reqScope = req.body.scope\n        let reqPayload = req.body.payload\n\n\n        // const { schemaUpdate, key } = documentSalesMap[requestDocumentType as keyof typeof documentSalesMap];\n\n        // const request = schemaUpdate.parse({\n        //     scope: { target: reqScope.target, action: reqScope.action },\n        //     payload: {\n        //         ...buildDocumentPayloadFromRequest(reqPayload),\n        //         profile: buildDocumentProfileFromRequest(reqPayload.profile),\n        //         shipping: buildDocumentProfileOtherFromRequest(reqPayload.shipping),\n        //         billing: buildDocumentProfileOtherFromRequest(reqPayload.billing),\n        //         ...(reqPayload?.items ? { items: buildDocumentItemsFromRequest(reqPayload.items) } : {}),\n        //         ...(reqPayload?.totals ? { totals: buildDocumentTotalsFromRequest(reqPayload.totals) } : {}),\n        //     },\n        // });\n\n        // const payload: DocumentUpdateProps = {\n        //     documentId: Number(documentId),\n        //     documentType: requestDocumentType,\n        //     data: {\n        //         ...buildDocumentPayloadToService(request.payload),\n        //         [key]: {\n        //             profile: buildDocumentProfileToService(request.payload.profile),\n        //             shipping: buildDocumentProfileOtherToService(request.payload.shipping),\n        //             billing: buildDocumentProfileOtherToService(request.payload.billing),\n        //             ...(request.payload?.items ? { items: buildDocumentItemsToService(request.payload.items) } : {}),\n        //             ...(request.payload?.totals ? { totals: buildDocumentTotalsToService(request.payload.totals) } : {}),\n        //         },\n        //     } as any,\n        // };\n\n        // const result = await fileService.updateFile(payload);\n\n        // response = {\n        //     [getRootName(true)]: result,\n        // };\n\n        sendSuccess(res, response, `File updated successfully`)\n\n    } catch (error: any) {\n        next(error)\n    }\n};\n\n/** files : list files */\nexport const listFiles = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n    try {\n\n        const requestQuery = req.query as unknown as QueryList;\n        // const requestDocumentType = req.params.documentType as FileServiceProps[\"documentType\"];\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        const { data, total } = await fileService.listFiles({\n            ...requestQuery,\n        });\n\n        let response = {\n            [`${getRootName(false)}`]: data,\n            total,\n        }\n\n        return sendSuccess(res, response, \"Retrieved successfully\");\n\n    } catch (error: any) {\n        next(error)\n    }\n};\n\n/** files/delete : delete files */\nexport const deleteFiles = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n    try {\n\n        // const requestDocumentType = req.body.scope.target as FileServiceProps[\"documentType\"]\n        // const requestQuery = req.query as unknown as QueryList;\n        // const requestFileId = Number(req.params.fileId)\n\n        const request = schemaFileDeletePayload.parse(req.body)\n\n        const fileService = FileService({\n            ...getDefaultServiceProps(req),\n        })\n\n        const payload = {\n            fileIds: request.payload.ids.map(i => BigInt(i))\n        }\n\n        const data = await fileService.removeFiles(payload);\n\n        return sendSuccess(res, data, \"Deleted\", getRootName(false));\n\n    } catch (error: any) {\n        next(error)\n    }\n};\n\n/** file/data_types : get file data types */\n// export const getFileDataTypes = async (req: Request, res: Response, next: NextFunction): Promise<any> => {\n\n//     try {\n\n//         const requestQuery = req.query as unknown as QueryList;\n//         // const requestDocumentType = req.params.documentType as FileServiceProps[\"documentType\"];\n\n//         const fileService = FileService({\n//             ...getDefaultServiceProps(req),\n//         })\n\n//         const data = fileService.getFileDataTypes();\n\n//         let response = {\n//             data_types: data\n//         }\n\n//         return sendSuccess(res, response, \"Retrieved successfully\");\n\n//     } catch (error: any) {\n//         next(error)\n//     }\n// };\n"]}

package/dist/models/file/FileModel.d.ts

@@ -31,6 +31,7 @@ export declare const ModelFileFields: {
     batch_code: "batch_code";
     refer_id_1: "refer_id_1";
     refer_id_2: "refer_id_2";
+    storage_provider_name: "storage_provider_name";
 };
 export type ModelFile = files;
 export type ModelFileOmitFields = typeof primaryKey | DefaultOmitFields;
@@ -61,7 +62,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
     accountId: number;
     actionUserId: number;
 }) => {
-    primaryKey: "createdatetime" | "createuserid" | "updatedatetime" | "updateuserid" | "isdelete" | "istrash" | "accountid" | "remark" | "description" | "file_id" | "field_module" | "field_ref" | "tag_name" | "asset_path" | "asset_url" | "file_label" | "file_name" | "content_type" | "foldername_year" | "foldername_month" | "foldername_day" | "input_type" | "input_file_size_bytes" | "input_file_name" | "file_size_bytes" | "file_compress_format" | "batch_code" | "refer_id_1" | "refer_id_2";
+    primaryKey: "createdatetime" | "createuserid" | "updatedatetime" | "updateuserid" | "isdelete" | "istrash" | "accountid" | "remark" | "description" | "file_id" | "field_module" | "field_ref" | "tag_name" | "asset_path" | "asset_url" | "file_label" | "file_name" | "content_type" | "foldername_year" | "foldername_month" | "foldername_day" | "input_type" | "input_file_size_bytes" | "input_file_name" | "file_size_bytes" | "file_compress_format" | "batch_code" | "refer_id_1" | "refer_id_2" | "storage_provider_name";
     getFields: (prefix?: string, excludeKeywords?: string[]) => Promise<{
         name: string;
         type: string;
@@ -98,6 +99,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }>;
     createMany: ({ dataList, disableRollback, }: {
         dataList: Omit<any, DefaultOmitFields>[];
@@ -132,6 +134,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }[]>;
     get: ({ id, where, include, }: {
         id?: number;
@@ -167,6 +170,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     } | null>;
     list: ({ where, orderBy, offset, limit, include }?: any) => Promise<{
         createdatetime: Date | null;
@@ -198,12 +202,13 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }[]>;
     count: ({ where }?: {
         where?: Record<string, any>;
     }) => Promise<number>;
     aggregate: ({ field, operation, where, }: {
-        field: "createdatetime" | "createuserid" | "updatedatetime" | "updateuserid" | "isdelete" | "istrash" | "accountid" | "remark" | "description" | "file_id" | "field_module" | "field_ref" | "tag_name" | "asset_path" | "asset_url" | "file_label" | "file_name" | "content_type" | "foldername_year" | "foldername_month" | "foldername_day" | "input_type" | "input_file_size_bytes" | "input_file_name" | "file_size_bytes" | "file_compress_format" | "batch_code" | "refer_id_1" | "refer_id_2";
+        field: "createdatetime" | "createuserid" | "updatedatetime" | "updateuserid" | "isdelete" | "istrash" | "accountid" | "remark" | "description" | "file_id" | "field_module" | "field_ref" | "tag_name" | "asset_path" | "asset_url" | "file_label" | "file_name" | "content_type" | "foldername_year" | "foldername_month" | "foldername_day" | "input_type" | "input_file_size_bytes" | "input_file_name" | "file_size_bytes" | "file_compress_format" | "batch_code" | "refer_id_1" | "refer_id_2" | "storage_provider_name";
         operation?: "sum" | "avg" | "min" | "max" | "count";
         where?: Record<string, any>;
     }) => Promise<number>;
@@ -240,6 +245,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
             batch_code: string | null;
             refer_id_1: bigint;
             refer_id_2: bigint;
+            storage_provider_name: string | null;
         }>;
         disableRollback?: Boolean;
     }) => Promise<{
@@ -272,6 +278,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }>;
     updateMany: ({ dataList, disableRollback, }: {
         dataList: {
@@ -306,6 +313,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
                 batch_code: string | null;
                 refer_id_1: bigint;
                 refer_id_2: bigint;
+                storage_provider_name: string | null;
             }>;
         }[];
         disableRollback?: boolean;
@@ -339,6 +347,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }[]>;
     trash: ({ ids }: {
         ids: number[];
@@ -372,6 +381,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }[]>;
     remove: ({ ids, where }: {
         ids?: number[];
@@ -406,6 +416,7 @@ export declare const FileModel: ({ prisma, accountId, actionUserId }: {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }[]>;
     raw: <T = any>(query: string, params?: any[]) => Promise<T[]>;
     rawExec: (query: string, params?: any[]) => Promise<number>;

package/dist/services/file/FileGoogleCloudStorageProvider.d.ts

@@ -3,12 +3,16 @@ import { FileStorageProviderResult } from "./FileStorageProviderRegistry";
 export interface FileGoogleCloudProviderOptions {
     bucketName: string;
     basePath?: string;
+    skipFoldernameByModuleRef?: boolean;
+    skipFoldernameByDate?: boolean;
     publicBaseUrl?: string;
     credentials?: string;
 }
 export declare const FileGoogleCloudStorageProvider: (options: FileGoogleCloudProviderOptions) => {
-    uploadFile: <T extends FileModuleRef>({ field_ref, field_module, buffer, fileName, }: T & {
+    uploadFile: <T extends FileModuleRef>({ field_ref, field_module, buffer, mimeType, foldernameDate, fileName, }: T & {
         buffer: Buffer;
+        mimeType: string;
+        foldernameDate?: string;
         fileName: string;
     }) => Promise<FileStorageProviderResult>;
 };

package/dist/services/file/FileGoogleCloudStorageProvider.js

@@ -7,28 +7,38 @@ exports.FileGoogleCloudStorageProvider = void 0;
 const storage_1 = require("@google-cloud/storage");
 const path_1 = __importDefault(require("path"));
 const crypto_1 = require("crypto");
+const utils_1 = require("../../utils");
 const FileGoogleCloudStorageProvider = (options) => {
-    const { bucketName, basePath = "uploads", publicBaseUrl = `https://storage.googleapis.com/${options.bucketName}`, credentials, } = options;
+    const { bucketName, basePath = "", skipFoldernameByModuleRef = false, skipFoldernameByDate = false, publicBaseUrl, credentials, } = options;
     const storage = new storage_1.Storage(credentials ? { keyFilename: credentials } : undefined);
     const bucket = storage.bucket(bucketName);
     /**
      * Upload file to Google Cloud Storage.
      * Files will be stored under: basePath/ref/module/YYYY/MM/DD/
      */
-    const uploadFile = async ({ field_ref, field_module, buffer, fileName, }) => {
-        const now = new Date();
-        const year = now.getFullYear().toString();
-        const month = (now.getMonth() + 1).toString().padStart(2, "0");
-        const day = now.getDate().toString().padStart(2, "0");
+    const uploadFile = async ({ field_ref, field_module, buffer, mimeType, foldernameDate, fileName, }) => {
+        const now = (0, utils_1.dayjs)(foldernameDate).isValid() ? (0, utils_1.dayjs)(foldernameDate) : (0, utils_1.dayjs)();
+        const year = now.format("YYYY");
+        const month = now.format("MM");
+        const day = now.format("DD");
+        let finalPublicBaseUrl = `https://storage.googleapis.com/${bucketName}`;
+        let dirParts = [];
+        if (skipFoldernameByModuleRef === false) {
+            dirParts.push(field_ref, field_module);
+        }
+        if (skipFoldernameByDate === false) {
+            dirParts.push(year, month, day);
+        }
+        const finalBasePath = path_1.default.join(basePath, ...dirParts);
+        finalPublicBaseUrl = [finalPublicBaseUrl, basePath, ...dirParts].filter(Boolean).join('/');
         const ext = path_1.default.extname(fileName);
-        const base = path_1.default.basename(fileName, ext);
         const uniqueName = `${(0, crypto_1.randomUUID)()}${ext}`; // `${base}-${randomUUID()}${ext}`;
-        const objectPath = `${basePath}/${field_ref}/${field_module}/${year}/${month}/${day}/${uniqueName}`;
+        const objectPath = `${finalBasePath}/${uniqueName}`;
         const file = bucket.file(objectPath);
         await file.save(buffer, {
             resumable: false,
             metadata: {
-                contentType: "application/octet-stream",
+                contentType: mimeType || "application/octet-stream",
             },
         });
         try {
@@ -38,16 +48,19 @@ const FileGoogleCloudStorageProvider = (options) => {
             console.warn("⚠️ Failed to make file public:", err);
         }
         const assetPath = objectPath;
-        const assetUrl = `${publicBaseUrl}/${objectPath}`;
+        const assetUrl = `${finalPublicBaseUrl}/${uniqueName}`;
         return {
             assetPath,
             assetUrl,
             filename: uniqueName,
-            folderName: {
-                day: Number(day),
-                month: Number(month),
-                year: Number(year)
-            }
+            basePath: finalBasePath,
+            ...(skipFoldernameByDate === false ? {
+                folderName: {
+                    day: Number(day),
+                    month: Number(month),
+                    year: Number(year)
+                }
+            } : {})
         };
     };
     return { uploadFile };

package/dist/services/file/FileGoogleCloudStorageProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileGoogleCloudStorageProvider.js","sourceRoot":"","sources":["../../../src/services/file/FileGoogleCloudStorageProvider.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAgD;AAChD,gDAAwB;AACxB,mCAAoC;AAa7B,MAAM,8BAA8B,GAAG,CAAC,OAAuC,EAAE,EAAE;IAEtF,MAAM,EACF,UAAU,EACV,QAAQ,GAAG,SAAS,EACpB,aAAa,GAAG,kCAAkC,OAAO,CAAC,UAAU,EAAE,EACtE,WAAW,GACd,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAE1C;;;OAGG;IACH,MAAM,UAAU,GAAG,KAAK,EAEtB,EACE,SAAS,EACT,YAAY,EACZ,MAAM,EACN,QAAQ,GAIX,EAAsC,EAAE;QAErC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAEtD,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,GAAG,IAAA,mBAAU,GAAE,GAAG,GAAG,EAAE,CAAC,CAAE,mCAAmC;QAChF,MAAM,UAAU,GAAG,GAAG,QAAQ,IAAI,SAAS,IAAI,YAAY,IAAI,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QACpG,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAErC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACpB,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAE;gBACN,WAAW,EAAE,0BAA0B;aAC1C;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC5B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,QAAQ,GAAG,GAAG,aAAa,IAAI,UAAU,EAAE,CAAC;QAElD,OAAO;YACH,SAAS;YACT,QAAQ;YACR,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE;gBACR,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC;gBAChB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;gBACpB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;aACrB;SACJ,CAAC;IACN,CAAC,CAAC;IAEF,OAAO,EAAE,UAAU,EAAE,CAAC;AAE1B,CAAC,CAAC;AArEW,QAAA,8BAA8B,kCAqEzC","sourcesContent":["import { Storage } from \"@google-cloud/storage\";\nimport path from \"path\";\nimport { randomUUID } from \"crypto\";\n\nimport { FileModuleRef } from \"./FileService\";\n\nimport { FileStorageProviderResult } from \"./FileStorageProviderRegistry\"\n\nexport interface FileGoogleCloudProviderOptions {\n    bucketName: string;\n    basePath?: string; // e.g. \"uploads\"\n    publicBaseUrl?: string; // e.g. \"[https://storage.googleapis.com/](https://storage.googleapis.com/)<bucket>\"\n    credentials?: string; // path to service account key JSON\n}\n\nexport const FileGoogleCloudStorageProvider = (options: FileGoogleCloudProviderOptions) => {\n\n    const {\n        bucketName,\n        basePath = \"uploads\",\n        publicBaseUrl = `https://storage.googleapis.com/${options.bucketName}`,\n        credentials,\n    } = options;\n\n    const storage = new Storage(credentials ? { keyFilename: credentials } : undefined);\n    const bucket = storage.bucket(bucketName);\n\n    /**\n     * Upload file to Google Cloud Storage.\n     * Files will be stored under: basePath/ref/module/YYYY/MM/DD/\n     */\n    const uploadFile = async <\n        T extends FileModuleRef\n    >({\n        field_ref,\n        field_module,\n        buffer,\n        fileName,\n    }: T & {\n        buffer: Buffer;\n        fileName: string;\n    }): Promise<FileStorageProviderResult> => {\n\n        const now = new Date();\n        const year = now.getFullYear().toString();\n        const month = (now.getMonth() + 1).toString().padStart(2, \"0\");\n        const day = now.getDate().toString().padStart(2, \"0\");\n\n        const ext = path.extname(fileName);\n        const base = path.basename(fileName, ext);\n        const uniqueName = `${randomUUID()}${ext}`;  // `${base}-${randomUUID()}${ext}`;\n        const objectPath = `${basePath}/${field_ref}/${field_module}/${year}/${month}/${day}/${uniqueName}`;\n        const file = bucket.file(objectPath);\n\n        await file.save(buffer, {\n            resumable: false,\n            metadata: {\n                contentType: \"application/octet-stream\",\n            },\n        });\n\n        try {\n            await file.makePublic();\n        } catch (err) {\n            console.warn(\"⚠️ Failed to make file public:\", err);\n        }\n\n        const assetPath = objectPath;\n        const assetUrl = `${publicBaseUrl}/${objectPath}`;\n\n        return {\n            assetPath,\n            assetUrl,\n            filename: uniqueName,\n            folderName: {\n                day: Number(day),\n                month: Number(month),\n                year: Number(year)\n            }\n        };\n    };\n\n    return { uploadFile };\n\n};\n"]}
+{"version":3,"file":"FileGoogleCloudStorageProvider.js","sourceRoot":"","sources":["../../../src/services/file/FileGoogleCloudStorageProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Storage } from \"@google-cloud/storage\";\nimport path from \"path\";\nimport { randomUUID } from \"crypto\";\n\nimport { dayjs } from \"@/utils\";\n\nimport { FileModuleRef } from \"./FileService\";\n\nimport { FileStorageProviderResult } from \"./FileStorageProviderRegistry\"\n\nexport interface FileGoogleCloudProviderOptions {\n    bucketName: string;\n    basePath?: string; // e.g. \"uploads\"\n    skipFoldernameByModuleRef?: boolean; // skip the folder [ref]/[module]\n    skipFoldernameByDate?: boolean; // skip the yyyy/mm/dd folder structure\n    publicBaseUrl?: string; // e.g. \"[https://storage.googleapis.com/](https://storage.googleapis.com/)<bucket>\"\n    credentials?: string; // path to service account key JSON\n}\n\nexport const FileGoogleCloudStorageProvider = (options: FileGoogleCloudProviderOptions) => {\n\n    const {\n        bucketName,\n        basePath = \"\",\n        skipFoldernameByModuleRef = false,\n        skipFoldernameByDate = false,\n        publicBaseUrl,\n        credentials,\n    } = options;\n\n    const storage = new Storage(credentials ? { keyFilename: credentials } : undefined);\n    const bucket = storage.bucket(bucketName);\n\n    /**\n     * Upload file to Google Cloud Storage.\n     * Files will be stored under: basePath/ref/module/YYYY/MM/DD/\n     */\n    const uploadFile = async <\n        T extends FileModuleRef\n    >({\n        field_ref,\n        field_module,\n        buffer,\n        mimeType,\n        foldernameDate,\n        fileName,\n    }: T & {\n        buffer: Buffer;\n        mimeType: string;\n        foldernameDate?: string;  // organize the foldername y/m/d using this date\n        fileName: string;\n    }): Promise<FileStorageProviderResult> => {\n\n        const now = dayjs(foldernameDate).isValid() ? dayjs(foldernameDate) : dayjs();\n        const year = now.format(\"YYYY\");\n        const month = now.format(\"MM\");\n        const day = now.format(\"DD\");\n\n        let finalPublicBaseUrl = `https://storage.googleapis.com/${bucketName}`\n        let dirParts = []\n\n        if (skipFoldernameByModuleRef === false) {\n            dirParts.push(field_ref, field_module)\n        }\n\n        if (skipFoldernameByDate === false) {\n            dirParts.push(year, month, day)\n        }\n\n        const finalBasePath = path.join(basePath, ...dirParts)\n        finalPublicBaseUrl = [finalPublicBaseUrl, basePath, ...dirParts].filter(Boolean).join('/');\n\n        const ext = path.extname(fileName);\n        const uniqueName = `${randomUUID()}${ext}`;  // `${base}-${randomUUID()}${ext}`;\n        const objectPath = `${finalBasePath}/${uniqueName}`;\n        const file = bucket.file(objectPath);\n\n        await file.save(buffer, {\n            resumable: false,\n            metadata: {\n                contentType: mimeType || \"application/octet-stream\",\n            },\n        });\n\n        try {\n            await file.makePublic();\n        } catch (err) {\n            console.warn(\"⚠️ Failed to make file public:\", err);\n        }\n\n        const assetPath = objectPath;\n        const assetUrl = `${finalPublicBaseUrl}/${uniqueName}`;\n\n        return {\n            assetPath,\n            assetUrl,\n            filename: uniqueName,\n            basePath: finalBasePath,\n            ...(skipFoldernameByDate === false ? {\n                folderName: {\n                    day: Number(day),\n                    month: Number(month),\n                    year: Number(year)\n                }\n            } : {})\n        };\n    };\n\n    return { uploadFile };\n\n};\n"]}

package/dist/services/file/FileLocalStorageProvider.d.ts

@@ -2,11 +2,15 @@ import { FileModuleRef } from "./FileService";
 import { FileStorageProviderResult } from "./FileStorageProviderRegistry";
 export interface FileLocalProviderOptions {
     basePath?: string;
-    baseUrl?: string;
+    skipFoldernameByModuleRef?: boolean;
+    skipFoldernameByDate?: boolean;
+    publicBaseUrl?: string;
 }
-export declare const FileLocalStorageProvider: (options?: FileLocalProviderOptions) => {
-    uploadFile: <T extends FileModuleRef>({ field_ref, field_module, buffer, fileName, }: T & {
+export declare const FileLocalStorageProvider: (options: FileLocalProviderOptions) => {
+    uploadFile: <T extends FileModuleRef>({ field_ref, field_module, buffer, mimeType, foldernameDate, fileName, }: T & {
         buffer: Buffer;
+        mimeType: string;
+        foldernameDate?: string;
         fileName: string;
     }) => Promise<FileStorageProviderResult>;
 };

package/dist/services/file/FileLocalStorageProvider.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileLocalStorageProvider = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const utils_1 = require("../../utils");
 const crypto_1 = require("crypto");
 const FileLocalStorageProvider = (options) => {
-    const basePath = options?.basePath ?? path_1.default.join(process.cwd(), "uploads");
-    const baseUrl = options?.baseUrl ?? "/uploads";
+    const { basePath = options?.basePath ?? path_1.default.join(process.cwd(), "uploads"), skipFoldernameByModuleRef = false, skipFoldernameByDate = false, publicBaseUrl = options?.publicBaseUrl ?? `/uploads`, } = options;
     const ensureDir = (dir) => {
         if (!fs_1.default.existsSync(dir))
             fs_1.default.mkdirSync(dir, { recursive: true });
@@ -18,29 +18,41 @@ const FileLocalStorageProvider = (options) => {
      * Upload file to local storage.
      * Files will be stored under: basePath/ref/module/YYYY/MM/DD/
      */
-    const uploadFile = async ({ field_ref, field_module, buffer, fileName, }) => {
-        const now = new Date();
-        const year = now.getFullYear().toString();
-        const month = (now.getMonth() + 1).toString().padStart(2, "0");
-        const day = now.getDate().toString().padStart(2, "0");
-        const dir = path_1.default.join(basePath, field_ref, field_module, year, month, day);
+    const uploadFile = async ({ field_ref, field_module, buffer, mimeType, foldernameDate, fileName, }) => {
+        const now = (0, utils_1.dayjs)(foldernameDate).isValid() ? (0, utils_1.dayjs)(foldernameDate) : (0, utils_1.dayjs)();
+        const year = now.format("YYYY");
+        const month = now.format("MM");
+        const day = now.format("DD");
+        let finalPublicBaseUrl = `${publicBaseUrl}`;
+        let dirParts = [];
+        if (skipFoldernameByModuleRef === false) {
+            dirParts.push(field_ref, field_module);
+        }
+        if (skipFoldernameByDate === false) {
+            dirParts.push(year, month, day);
+        }
+        const finalBasePath = path_1.default.join(basePath, ...dirParts);
+        const dir = finalBasePath;
+        finalPublicBaseUrl = [finalPublicBaseUrl, ...dirParts].filter(Boolean).join('/');
         ensureDir(dir);
         const ext = path_1.default.extname(fileName);
-        // const base = path.basename(fileName, ext);
         const uniqueName = `${(0, crypto_1.randomUUID)()}${ext}`; // `${base}-${randomUUID()}${ext}`;
         const filePath = path_1.default.join(dir, uniqueName);
         await fs_1.default.promises.writeFile(filePath, buffer);
         const assetPath = path_1.default.relative(process.cwd(), filePath);
-        const assetUrl = `${baseUrl}/${field_ref}/${field_module}/${year}/${month}/${day}/${uniqueName}`;
+        const assetUrl = `${finalPublicBaseUrl}/${uniqueName}`;
         return {
             assetPath,
             assetUrl,
             filename: uniqueName,
-            folderName: {
-                day: Number(day),
-                month: Number(month),
-                year: Number(year)
-            }
+            basePath: finalBasePath,
+            ...(skipFoldernameByDate === false ? {
+                folderName: {
+                    day: Number(day),
+                    month: Number(month),
+                    year: Number(year)
+                }
+            } : {})
         };
     };
     return { uploadFile };

package/dist/services/file/FileLocalStorageProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileLocalStorageProvider.js","sourceRoot":"","sources":["../../../src/services/file/FileLocalStorageProvider.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,mCAAoC;AAW7B,MAAM,wBAAwB,GAAG,CAAC,OAAkC,EAAE,EAAE;IAE3E,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,UAAU,CAAC;IAE/C,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE;QAC9B,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,YAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;IAEF;;;OAGG;IACH,MAAM,UAAU,GAAG,KAAK,EAEtB,EACE,SAAS,EACT,YAAY,EACZ,MAAM,EACN,QAAQ,GAIX,EAAsC,EAAE;QAErC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAEtD,MAAM,GAAG,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3E,SAAS,CAAC,GAAG,CAAC,CAAC;QAEf,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,6CAA6C;QAC7C,MAAM,UAAU,GAAG,GAAG,IAAA,mBAAU,GAAE,GAAG,GAAG,EAAE,CAAC,CAAC,mCAAmC;QAC/E,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAE5C,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAE9C,MAAM,SAAS,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,GAAG,OAAO,IAAI,SAAS,IAAI,YAAY,IAAI,IAAI,IAAI,KAAK,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QAEjG,OAAO;YACH,SAAS;YACT,QAAQ;YACR,QAAQ,EAAE,UAAU;YACpB,UAAU,EAAE;gBACR,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC;gBAChB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;gBACpB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;aACrB;SACJ,CAAC;IACN,CAAC,CAAC;IAEF,OAAO,EAAE,UAAU,EAAE,CAAC;AAE1B,CAAC,CAAC;AAzDW,QAAA,wBAAwB,4BAyDnC","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport { randomUUID } from \"crypto\";\n\nimport { FileModuleRef } from \"./FileService\";\n\nimport { FileStorageProviderResult } from \"./FileStorageProviderRegistry\"\n\nexport interface FileLocalProviderOptions {\n    basePath?: string; // e.g. \"uploads\"\n    baseUrl?: string;  // e.g. \"/uploads\" or \"[http://localhost:3000/uploads](http://localhost:3000/uploads)\"\n}\n\nexport const FileLocalStorageProvider = (options?: FileLocalProviderOptions) => {\n\n    const basePath = options?.basePath ?? path.join(process.cwd(), \"uploads\");\n    const baseUrl = options?.baseUrl ?? \"/uploads\";\n\n    const ensureDir = (dir: string) => {\n        if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });\n    };\n\n    /**\n     * Upload file to local storage.\n     * Files will be stored under: basePath/ref/module/YYYY/MM/DD/\n     */\n    const uploadFile = async <\n        T extends FileModuleRef\n    >({\n        field_ref,\n        field_module,\n        buffer,\n        fileName,\n    }: T & {\n        buffer: Buffer;\n        fileName: string;\n    }): Promise<FileStorageProviderResult> => {\n\n        const now = new Date();\n        const year = now.getFullYear().toString();\n        const month = (now.getMonth() + 1).toString().padStart(2, \"0\");\n        const day = now.getDate().toString().padStart(2, \"0\");\n\n        const dir = path.join(basePath, field_ref, field_module, year, month, day);\n        ensureDir(dir);\n\n        const ext = path.extname(fileName);\n        // const base = path.basename(fileName, ext);\n        const uniqueName = `${randomUUID()}${ext}`; // `${base}-${randomUUID()}${ext}`;\n        const filePath = path.join(dir, uniqueName);\n\n        await fs.promises.writeFile(filePath, buffer);\n\n        const assetPath = path.relative(process.cwd(), filePath);\n        const assetUrl = `${baseUrl}/${field_ref}/${field_module}/${year}/${month}/${day}/${uniqueName}`;\n\n        return {\n            assetPath,\n            assetUrl,\n            filename: uniqueName,\n            folderName: {\n                day: Number(day),\n                month: Number(month),\n                year: Number(year)\n            }\n        };\n    };\n\n    return { uploadFile };\n\n};\n"]}
+{"version":3,"file":"FileLocalStorageProvider.js","sourceRoot":"","sources":["../../../src/services/file/FileLocalStorageProvider.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\nimport { dayjs } from \"@/utils\";\n\nimport { randomUUID } from \"crypto\";\n\nimport { FileModuleRef } from \"./FileService\";\n\nimport { FileStorageProviderResult } from \"./FileStorageProviderRegistry\"\n\nexport interface FileLocalProviderOptions {\n    basePath?: string; // e.g. \"uploads\"\n    skipFoldernameByModuleRef?: boolean; // skip the folder [ref]/[module]\n    skipFoldernameByDate?: boolean; // skip the yyyy/mm/dd folder structure\n    publicBaseUrl?: string;  // e.g. \"/uploads\" or \"[http://localhost:3000/uploads](http://localhost:3000/uploads)\"\n}\n\nexport const FileLocalStorageProvider = (options: FileLocalProviderOptions) => {\n\n    const {\n        basePath = options?.basePath ?? path.join(process.cwd(), \"uploads\"),\n        skipFoldernameByModuleRef = false,\n        skipFoldernameByDate = false,\n        publicBaseUrl = options?.publicBaseUrl ?? `/uploads`,\n    } = options;\n\n    const ensureDir = (dir: string) => {\n        if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });\n    };\n\n    /**\n     * Upload file to local storage.\n     * Files will be stored under: basePath/ref/module/YYYY/MM/DD/\n     */\n    const uploadFile = async <\n        T extends FileModuleRef\n    >({\n        field_ref,\n        field_module,\n        buffer,\n        mimeType,\n        foldernameDate,\n        fileName,\n    }: T & {\n        buffer: Buffer;\n        mimeType: string;\n        foldernameDate?: string;  // organize the foldername y/m/d using this date\n        fileName: string;\n    }): Promise<FileStorageProviderResult> => {\n\n\n        const now = dayjs(foldernameDate).isValid() ? dayjs(foldernameDate) : dayjs();\n        const year = now.format(\"YYYY\");\n        const month = now.format(\"MM\");\n        const day = now.format(\"DD\");\n\n        let finalPublicBaseUrl = `${publicBaseUrl}`\n        let dirParts = []\n\n        if (skipFoldernameByModuleRef === false) {\n            dirParts.push(field_ref, field_module)\n        }\n\n        if (skipFoldernameByDate === false) {\n            dirParts.push(year, month, day)\n        }\n\n        const finalBasePath = path.join(basePath, ...dirParts)\n        const dir = finalBasePath\n        finalPublicBaseUrl = [finalPublicBaseUrl, ...dirParts].filter(Boolean).join('/');\n\n        ensureDir(dir);\n\n        const ext = path.extname(fileName);\n        const uniqueName = `${randomUUID()}${ext}`; // `${base}-${randomUUID()}${ext}`;\n        const filePath = path.join(dir, uniqueName);\n\n        await fs.promises.writeFile(filePath, buffer);\n\n        const assetPath = path.relative(process.cwd(), filePath);\n        const assetUrl = `${finalPublicBaseUrl}/${uniqueName}`;\n\n        return {\n            assetPath,\n            assetUrl,\n            filename: uniqueName,\n            basePath: finalBasePath,\n            ...(skipFoldernameByDate === false ? {\n                folderName: {\n                    day: Number(day),\n                    month: Number(month),\n                    year: Number(year)\n                }\n            } : {})\n        };\n    };\n\n    return { uploadFile };\n\n};\n"]}

package/dist/services/file/FileService.d.ts

@@ -33,6 +33,7 @@ export type File = {
     inputFileName: string;
     fileSizeBytes: number;
     fileCompressFormat: string;
+    storageProviderName: string;
     foldernameDay: number;
     foldernameMonth: number;
     foldernameYear: number;
@@ -105,5 +106,6 @@ export declare const FileService: (props: FileServiceProps) => {
         batch_code: string | null;
         refer_id_1: bigint;
         refer_id_2: bigint;
+        storage_provider_name: string | null;
     }[]>;
 };

package/dist/services/file/FileService.js

@@ -51,7 +51,8 @@ const getCreatePayload = (data) => {
         [`${models_1.ModelFileFields.input_type}`]: data.inputType,
         [`${models_1.ModelFileFields.refer_id_1}`]: data.referId1,
         [`${models_1.ModelFileFields.refer_id_2}`]: data.referId2,
-        [`${models_1.ModelFileFields.remark}`]: data.remark
+        [`${models_1.ModelFileFields.remark}`]: data.remark,
+        [`${models_1.ModelFileFields.storage_provider_name}`]: data.storageProviderName,
     };
 };
 const compressImageBuffer = async (buffer, mimeType, options = {}) => {
@@ -128,6 +129,7 @@ const FileService = (props) => {
                 field_ref,
                 field_module,
                 buffer: bufferToUpload,
+                mimeType,
                 fileName: fileOriginalName
             });
             const fieldRef = field_ref;
@@ -142,9 +144,9 @@ const FileService = (props) => {
             const inputFileName = fileOriginalName ?? "";
             const fileSizeBytes = outputSizeBytes ?? 0;
             // const fileCompressFormat = ``
-            const foldernameDay = uploadResult.folderName.day;
-            const foldernameMonth = uploadResult.folderName.month;
-            const foldernameYear = uploadResult.folderName.year;
+            const foldernameDay = uploadResult?.folderName?.day ?? "";
+            const foldernameMonth = uploadResult?.folderName?.month ?? "";
+            const foldernameYear = uploadResult?.folderName?.year ?? "";
             const payload = {
                 data: {
                     fieldRef,
@@ -163,6 +165,7 @@ const FileService = (props) => {
                     inputFileName,
                     fileSizeBytes,
                     fileCompressFormat,
+                    storageProviderName,
                     foldernameDay,
                     foldernameMonth,
                     foldernameYear,
@@ -262,7 +265,7 @@ const FileService = (props) => {
                 file_id: { in: fileIds }
             }
         });
-        console.log('filesToDelete', filesToDelete);
+        // console.log('filesToDelete', filesToDelete)
         // 2️⃣ Delete the physical files
         for (const file of filesToDelete) {
             const assetPath = file.asset_path;