Merge pull request #47 from curiosta/feat/add-product-sync

Feat/add product sync
curiosta · Oct 31, 2023 · b37c0a7 · b37c0a7
2 parents 5867fab + 87c8d21
commit b37c0a7
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,6 @@ build
 .cache
 
 .env.*
-!.env.template
+!.env.template
+
+dump.rdb
diff --git a/dump.rdb b/dump.rdb
diff --git a/src/api/routes/admin/sheets/helpers/mapSheetProduct.ts b/src/api/routes/admin/sheets/helpers/mapSheetProduct.ts
@@ -1,5 +1,5 @@
 import { Product, ProductStatus } from "@medusajs/medusa";
-import { CreateProductInput } from "@medusajs/medusa/dist/types/product";
+import { CreateProductInput, UpdateProductInput } from "@medusajs/medusa/dist/types/product";
 import { ulid } from "ulid";
 
 
@@ -13,7 +13,12 @@ export type CreateProduct = Omit<Partial<Product>, 'variants' | 'categories'> &
 
 export type CreateProductResponse = CreateProductInput & { id: string, rowNumber: number }
 
-export const mapSheetProduct = (product: CreateProduct): CreateProductResponse => {
+export type UpdateProductResponse = UpdateProductInput & { id: string, rowNumber: number }
+
+
+export const mapSheetProduct = (product: CreateProduct): CreateProductResponse | UpdateProductResponse => {
+
+  const options = product.options?.length ? [{ id: product.options[0].id, value: 'one size' }] : undefined
   return ({
     id: product.id,
     rowNumber: product.rowNumber,
@@ -25,6 +30,7 @@ export const mapSheetProduct = (product: CreateProduct): CreateProductResponse =
     variants: [
       {
         title: 'one size',
+        options,
         inventory_quantity: product.stock || 0,
         prices: [
           {

diff --git a/src/api/routes/admin/sheets/index.ts b/src/api/routes/admin/sheets/index.ts
@@ -1,4 +1,4 @@
-import { ProductStatus, authenticate } from "@medusajs/medusa"
+import { ProductOption, ProductStatus, authenticate } from "@medusajs/medusa"
 import express, { Router } from "express";
 import CategoryService from "../../../../services/category";
 import GoogleSheetAPIService, { ProductData } from "../../../../services/google-sheet-api";
@@ -7,7 +7,7 @@ import { mapSheetProduct } from "./helpers/mapSheetProduct";
 
 type CategoriesID = { id: string }[];
 
-type SheetProductWithCategories = ProductData & { categories: CategoriesID };
+type SheetProductWithExtras = ProductData & { categories: CategoriesID, options?: ProductOption[] };
 
 export const SheetsRouter = (router: Router) => {
   router.use('/admin/sheets', express.json(), authenticate());
@@ -24,9 +24,14 @@ export const SheetsRouter = (router: Router) => {
       const sheetData = await googleSheetService.getProductDataBySheetId();
 
       const promises = sheetData.map(async (entry) => {
-        const location = await categoryService.getCategoryByName(entry.Location);
+        const location = await categoryService.getCategoryByName(entry.Location.split('/').pop().trim());
         const category = await categoryService.getCategoryByName(entry.Category);
-
+        let options;
+        try {
+          const product = await productService.retrieve(entry["Product ID"], { relations: ['options'] })
+          options = product.options;
+        } catch (error) {
+        }
         const categories: { id: string }[] = []
 
         if (location) {
@@ -36,23 +41,27 @@ export const SheetsRouter = (router: Router) => {
           categories.push({ id: category.id })
         }
 
-        return { ...entry, categories }
+        return { ...entry, categories, options }
       });
 
       let results = (await Promise.allSettled(promises)).filter(r => r.status === 'fulfilled').map((r: any) => r.value)
 
-      results = results.map((product: SheetProductWithCategories) => {
+      results = results.map((product: SheetProductWithExtras) => {
         return mapSheetProduct({
           id: product['Product ID'],
           title: product['Product title'],
           description: product.Description,
           stock: product.Stocks,
           categories: product.categories,
           rowNumber: product.rowNumber,
-          status: product.Draft ? ProductStatus.DRAFT : ProductStatus.PUBLISHED
+          status: product.Draft ? ProductStatus.DRAFT : ProductStatus.PUBLISHED,
+          options: product.options
         })
       });
 
+
+
+
       const bulkAddResult = await productService.addBulkProducts(results)
       const savedProductIdAndRowNumber = bulkAddResult.saved.map((p) => ({ id: p.id, rowNumber: p.rowNumber }))
 

diff --git a/src/api/routes/admin/sheets/sync-categories.ts b/src/api/routes/admin/sheets/sync-categories.ts
@@ -11,8 +11,6 @@ export const SheetsSyncCategoriesRouter = (router: Router) => {
     const googleSheetService = req.scope.resolve('googleSheetApiService') as GoogleSheetAPIService;
     const categoryService = req.scope.resolve('categoryService') as CategoryService;
 
-    console.log('\n\n\n\n', process.env, '\n\n\n\n');
-
     if (typeof req.query.sheetId === 'string') {
       googleSheetService.sheetId = req.query.sheetId
     }

diff --git a/src/services/category.ts b/src/services/category.ts
@@ -6,6 +6,7 @@ class CategoryService extends ProductCategoryService {
     super(container)
   }
   async retrieveAllCategoriesName() {
+
     const retrieveAllCategories = `
       SELECT name FROM product_category WHERE handle NOT LIKE 'loc:%'
     `

diff --git a/src/services/product.ts b/src/services/product.ts
@@ -66,7 +66,6 @@ class ProductService extends BaseProductService {
 
   async addBulkProducts(products: ((CreateProductInput | UpdateProductInput) & { id: string; rowNumber: number; })[]) {
     await this.loginAdmin();
-
     const promises = products.map((product, i) => {
       return new Promise<Partial<Product & { rowNumber: number }>>(async (resolve, reject) => {
         if (product.id) {
@@ -77,18 +76,21 @@ class ProductService extends BaseProductService {
           } catch (error) {
             productExists = false;
           }
+          try {
+            if (productExists) {
+              const { id, rowNumber, ...updateProduct } = product as UpdateProductInput & { id: string; rowNumber: number; };
+              const { product: updatedProduct } = await this.updateProductWithFetch(id, updateProduct)
+              resolve({ ...updatedProduct, rowNumber });
+            } else {
 
-          if (productExists) {
-            const { id, rowNumber, ...updateProduct } = product as UpdateProductInput & { id: string; rowNumber: number; };
-            const { product: updatedProduct } = await this.updateProductWithFetch(id, updateProduct)
-            resolve({ ...updatedProduct, rowNumber });
-          } else {
-
-            const { id, rowNumber, ...createProduct } = product as CreateProductInput & { id: string; rowNumber: number; }
+              const { id, rowNumber, ...createProduct } = product as CreateProductInput & { id: string; rowNumber: number; }
 
-            const { product: createdProduct } = await this.createProductWithFetch(createProduct);
+              const { product: createdProduct } = await this.createProductWithFetch(createProduct);
 
-            resolve({ ...createdProduct, rowNumber })
+              resolve({ ...createdProduct, rowNumber })
+            }
+          } catch (error) {
+            console.log('An error occurred!', error.response.data);
           }
         } else {
           const { id, rowNumber, ...createProduct } = product as CreateProductInput & { id: string, rowNumber: number; }
@@ -112,7 +114,6 @@ class ProductService extends BaseProductService {
       }
 
     } catch (error) {
-      console.log(error);
     }
   }
 }