Merge remote-tracking branch 'origin/develop'

Author: desoindx

src/db/upload.ts

@@ -135,11 +135,17 @@ export const checkUploadsStatus = async (uploadsId: string[]) => {
 
   return Promise.all(
     uploads
-      .filter((upload) =>
-        upload.products.every((product) => product.status === Status.Done || product.status === Status.Error),
+      .filter(
+        (upload) =>
+          upload.products.every((product) => product.status === Status.Done || product.status === Status.Error) &&
+          upload.reUploadProducts.every(
+            (product) => product.product.status === Status.Done || product.product.status === Status.Error,
+          ),
       )
       .map(async (upload) => {
-        const allDone = upload.products.every((product) => product.status === Status.Done)
+        const allDone =
+          upload.products.every((product) => product.status === Status.Done) &&
+          upload.reUploadProducts.every((product) => product.product.status === Status.Done)
         if (allDone) {
           return completeUpload(upload)
         } else {

src/scripts/generateCSV.ts

@@ -44,7 +44,7 @@ const generate = (name: string, length?: string) => {
       countryMaking: faker.helpers.arrayElement(Object.keys(countries)),
       countrySpinning: faker.helpers.arrayElement(Object.keys(countries)),
       impressionMapping: faker.helpers.arrayElement(["", ...Object.keys(impressionMapping)]),
-      impressionPercentage: faker.number.float({ min: 0, max: 1 }),
+      impressionPercentage: faker.number.float({ min: 0, max: 0.8 }),
       mass: faker.number.float({ min: 0.01 }),
       price: faker.number.float({ min: 1, max: 1000 }),
       airTransportRatio: faker.number.float({ min: 0, max: 1 }),

src/utils/queue/uploads.test.ts

@@ -3,7 +3,7 @@ import chardet from "chardet"
 import { parseCSV } from "../csv/parse"
 import { createProducts } from "../../db/product"
 import { failUpload, completeUpload } from "../../services/upload"
-import { getFirstFileUpload, updateUploadToPending } from "../../db/upload"
+import { checkUploadsStatus, getFirstFileUpload, updateUploadToPending } from "../../db/upload"
 import { downloadFileFromS3 } from "../s3/bucket"
 import { FileUpload } from "../../db/upload"
 import { Status } from "../../../prisma/src/prisma"
@@ -22,6 +22,7 @@ const mockedParseCSV = parseCSV as jest.MockedFunction<typeof parseCSV>
 const mockedCreateProducts = createProducts as jest.MockedFunction<typeof createProducts>
 const mockedFailUpload = failUpload as jest.MockedFunction<typeof failUpload>
 const mockedCompleteUpload = completeUpload as jest.MockedFunction<typeof completeUpload>
+const mockedCheckUploadStatus = checkUploadsStatus as jest.MockedFunction<typeof checkUploadsStatus>
 const mockedGetFirstFileUpload = getFirstFileUpload as jest.MockedFunction<typeof getFirstFileUpload>
 const mockedUpdateUploadToPending = updateUploadToPending as jest.MockedFunction<typeof updateUploadToPending>
 const mockedDownloadFileFromS3 = downloadFileFromS3 as jest.MockedFunction<typeof downloadFileFromS3>
@@ -43,6 +44,7 @@ describe("processUploadsToQueue", () => {
       },
     },
     products: [{ status: Status.Pending }],
+    reUploadProducts: [],
   } satisfies FileUpload
 
   const mockBuffer = Buffer.from("csv,data,here")
@@ -130,7 +132,7 @@ describe("processUploadsToQueue", () => {
     expect(mockedParseCSV).toHaveBeenCalledWith(mockBuffer, "latin1", mockUpload)
   })
 
-  it("should complete upload when 0 products are created", async () => {
+  it("should check upload status when 0 products are created", async () => {
     const mockEmptyParsedData = {
       products: [],
       materials: [],
@@ -153,7 +155,7 @@ describe("processUploadsToQueue", () => {
     expect(mockedChardet.detect).toHaveBeenCalledWith(mockBuffer)
     expect(mockedParseCSV).toHaveBeenCalledWith(mockBuffer, "utf-8", mockUpload)
     expect(mockedCreateProducts).toHaveBeenCalledWith(mockEmptyParsedData)
-    expect(mockedCompleteUpload).toHaveBeenCalledWith(mockUpload)
+    expect(mockedCheckUploadStatus).toHaveBeenCalledWith([mockUpload.id])
     expect(mockedFailUpload).not.toHaveBeenCalled()
   })
 

src/utils/queue/uploads.ts

@@ -1,8 +1,8 @@
 import chardet from "chardet"
 import { parseCSV } from "../csv/parse"
 import { createProducts } from "../../db/product"
-import { completeUpload, failUpload } from "../../services/upload"
-import { getFirstFileUpload, updateUploadToPending } from "../../db/upload"
+import { failUpload } from "../../services/upload"
+import { checkUploadsStatus, getFirstFileUpload, updateUploadToPending } from "../../db/upload"
 import { downloadFileFromS3 } from "../s3/bucket"
 import { decryptAndDezipFile } from "../encryption/encryption"
 
@@ -39,7 +39,7 @@ export const processUploadsToQueue = async () => {
     const csvData = await parseCSV(buffer, encoding, upload)
     const numberOfCreatedProduct = await createProducts(csvData)
     if (numberOfCreatedProduct === 0) {
-      await completeUpload(upload)
+      await checkUploadsStatus([upload.id])
     }
     console.log(`Upload processed, ${csvData.products.length} products, ${numberOfCreatedProduct} created`)
   } catch (error) {