@punks/backend-entity-manager 0.0.405 → 0.0.407

package/dist/cjs/index.js

@@ -22865,40 +22865,53 @@ exports.DataExportService = class DataExportService {
     }
     async exportData(data, input) {
         const file = await this.extractData(data, input);
-        const downloadUrl = await this.uploadExportFile(file, {
-            dataName: input.name,
+        const { downloadUrl, fileName } = await this.uploadExportFile(file, {
+            dataName: input.dataName,
+            fileName: input.fileName,
             format: input.format,
         });
         return {
             downloadUrl,
-            file,
+            file: {
+                fileName,
+                content: file.content,
+                contentType: file.contentType,
+            },
         };
     }
     async extractData(data, input) {
         const content = new DataExportSerializer().serialize(data, {
             columns: input.columns,
             format: input.format,
-            name: input.name,
+            name: input.dataName,
         });
         return {
             content: content.content,
             contentType: content.contentType,
         };
     }
-    async uploadExportFile(file, { dataName, format, }) {
-        const filePath = this.buildExportFilePath(dataName, format);
+    async uploadExportFile(file, { dataName, fileName, format, }) {
+        const fileNameWithExtension = this.buildExportFileName(fileName, format);
+        const filePath = this.buildExportFilePath(dataName, fileNameWithExtension);
         await this.defaultBucketProvider.fileUpload({
             bucket: this.defaultFileProvider.defaultBucket,
             filePath,
             content: file.content,
             contentType: file.contentType,
         });
-        return await this.defaultFileProvider.getFileProviderDownloadUrl({
+        const downloadUrl = await this.defaultFileProvider.getFileProviderDownloadUrl({
             reference: filePath,
         });
+        return {
+            downloadUrl,
+            fileName: fileNameWithExtension,
+        };
+    }
+    buildExportFileName(fileName, format) {
+        return `${fileName}.${format}`;
     }
-    buildExportFilePath(dataName, format) {
-        return `/data-export/${dataName}/${backendCore.createDayPath(new Date())}/${backendCore.newUuid()}_${dataName}.${format}`;
+    buildExportFilePath(dataName, fileName) {
+        return `/data-export/${dataName}/${backendCore.createDayPath(new Date())}/${backendCore.newUuid()}_${fileName}`;
     }
     get defaultFileProvider() {
         return this.registry