refactor:the logic for saving wordpress xml file with dynamic name and validating condition

Author: AishDani

upload-api/src/routes/index.ts

@@ -97,15 +97,17 @@ router.get('/validator', express.json(), fileOperationLimiter, async function (r
     const cmsType = config?.cmsType?.toLowerCase();
 
     if (config?.isLocalPath) {
-      const fileName = config?.localPath?.split?.('/')?.pop?.();
+      const fileName = path.basename(config?.localPath || "");
+      //const fileName = config?.localPath?.replace(/\/$/, "")?.split?.('/')?.pop?.();
+
       if (!fileName) {
         res.send('Filename could not be determined from the local path.');
       }
 
       if (fileName) {
         const name = fileName?.split?.('.')?.[0];
         const fileExt = fileName?.split('.')?.pop() ?? '';
-        const bodyStream = createReadStream(config?.localPath);
+        const bodyStream = createReadStream(config?.localPath?.replace(/\/$/, ""));
 
         bodyStream.on('error', (error: any) => {
           console.error(error);
@@ -137,7 +139,7 @@ router.get('/validator', express.json(), fileOperationLimiter, async function (r
             const data = await handleFileProcessing(fileExt, xmlData, cmsType,name);
             res.status(data?.status || 200).json(data);
             if (data?.status === 200) {
-              const filePath = path.join(__dirname, '..', '..', 'extracted_files', "data.json");
+              const filePath = path.join(__dirname, '..', '..', 'extracted_files', `${name}.json`);
               createMapper(filePath, projectId, app_token, affix, config);
             }
           });
@@ -168,59 +170,59 @@ router.get('/validator', express.json(), fileOperationLimiter, async function (r
             }
           });
         } 
-    } else {
-      const params = {
-        Bucket: config?.awsData?.bucketName,
-        Key: config?.awsData?.buketKey
-      };
-      const getObjectCommand = new GetObjectCommand(params);
-      // Get the object from S3
-      const s3File = await client.send(getObjectCommand);
-      //file Name From key
-      const fileName = params?.Key?.split?.('/')?.pop?.() ?? '';
-      //file ext from fileName
-      const fileExt = fileName?.split?.('.')?.pop?.() ?? 'test';
-
-      if (!s3File.Body) {
-        throw new Error('Empty response body from S3');
-      }
-
-      const bodyStream: Readable = s3File.Body as Readable;
+    } 
+  }else {
+    const params = {
+      Bucket: config?.awsData?.bucketName,
+      Key: config?.awsData?.buketKey
+    };
+    const getObjectCommand = new GetObjectCommand(params);
+    // Get the object from S3
+    const s3File = await client.send(getObjectCommand);
+    //file Name From key
+    const fileName = params?.Key?.split?.('/')?.pop?.() ?? '';
+    //file ext from fileName
+    const fileExt = fileName?.split?.('.')?.pop?.() ?? 'test';
+
+    if (!s3File.Body) {
+      throw new Error('Empty response body from S3');
+    }
 
-      // Create a writable stream to save the downloaded zip file
-      const zipFileStream = createWriteStream(`${fileName}`);
+    const bodyStream: Readable = s3File.Body as Readable;
 
-      // // Pipe the S3 object's body to the writable stream
-      bodyStream.pipe(zipFileStream);
+    // Create a writable stream to save the downloaded zip file
+    const zipFileStream = createWriteStream(`${fileName}`);
 
-      // Create a writable stream to save the downloaded zip file
-      let zipBuffer: Buffer | null = null;
+    // // Pipe the S3 object's body to the writable stream
+    bodyStream.pipe(zipFileStream);
 
-      // Collect the data from the stream into a buffer
-      bodyStream.on('data', (chunk) => {
-        if (zipBuffer === null) {
-          zipBuffer = chunk;
-        } else {
-          zipBuffer = Buffer.concat([zipBuffer, chunk]);
-        }
-      });
+    // Create a writable stream to save the downloaded zip file
+    let zipBuffer: Buffer | null = null;
 
-      //buffer fully stremd
-      bodyStream.on('end', async () => {
-        if (!zipBuffer) {
-          throw new Error('No data collected from the stream.');
-        }
+    // Collect the data from the stream into a buffer
+    bodyStream.on('data', (chunk) => {
+      if (zipBuffer === null) {
+        zipBuffer = chunk;
+      } else {
+        zipBuffer = Buffer.concat([zipBuffer, chunk]);
+      }
+    });
 
-        const data = await handleFileProcessing(fileExt, zipBuffer, cmsType,fileName);
-        res.json(data);
-        res.send('file valited sucessfully.');
-        const filePath = path.join(__dirname, '..', '..', 'extracted_files', fileName);
-        console.log("🚀 ~ bodyStream.on ~ filePath:", filePath)
-        createMapper(filePath, projectId, app_token, affix, config);
-      });
-    }
+    //buffer fully stremd
+    bodyStream.on('end', async () => {
+      if (!zipBuffer) {
+        throw new Error('No data collected from the stream.');
+      }
 
-  } }
+      const data = await handleFileProcessing(fileExt, zipBuffer, cmsType,fileName);
+      res.json(data);
+      res.send('file valited sucessfully.');
+      const filePath = path.join(__dirname, '..', '..', 'extracted_files', fileName);
+      console.log("🚀 ~ bodyStream.on ~ filePath:", filePath)
+      createMapper(filePath, projectId, app_token, affix, config);
+    });
+  }
+}
   catch (err: any) {
     console.error('🚀 ~ router.get ~ err:', err);
   }

upload-api/src/services/fileProcessing.ts

@@ -39,7 +39,7 @@ const handleFileProcessing = async (fileExt: string, zipBuffer: any, cmsType: st
       const $ = Cheerio.load(zipBuffer, { xmlMode: true });
       const fixedXml = $.xml(); 
       const parsedJson = await parseXmlToJson(fixedXml);
-      const isSaved = await saveJson(parsedJson,"data.json");
+      const isSaved = await saveJson(parsedJson,`${name}.json`);
       if (isSaved) {
         logger.info('Validation success:', {
           status: HTTP_CODES?.OK,