@things-factory/integration-sellercraft 5.0.0-alpha.9 → 5.0.0-y.0

package/server/controllers/sellercraft-api/decorators.ts

@@ -2,6 +2,7 @@ import Debug from 'debug'
 const debug = Debug('things-factory:integration-marketplace:store-api-decorator')
 
 import { Sellercraft } from '../../service'
+import { createPayloadLog } from '@things-factory/integration-base'
 
 const NOOP = v => v
 
@@ -35,6 +36,8 @@ export const api = (target: Object, property: string, descriptor: TypedPropertyD
       { store, method: httpMethod, path, request: denormalized, platformAction }
     ])
 
+    createPayloadLog(store.accountId, path, denormalized, response, request?.context)
+
     debug('response', response)
 
     return await normalize(response, { store })

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-categories.ts

@@ -7,30 +7,10 @@ export function ingestChannelCategories() {
     denormalize(req) {
       const { categories } = req
 
-      let newCategories = categories.map(category => {
-        return {
-          native_category_id: category.categoryId.toString(),
-          channel_code: category.channelCode,
-          channel_country: category.countryCode,
-          category_name: category.categoryName,
-          is_leaf: category.isLeaf,
-          is_active: category.isActive,
-          children_categories: category.childrenCategories.map(childrenCategory => {
-            return {
-              native_category_id: category.categoryId.toString(),
-              channel_code: category.channelCode,
-              channel_country: category.countryCode,
-              category_name: childrenCategory.categoryName,
-              is_leaf: childrenCategory.isLeaf,
-              is_active: childrenCategory.isActive,
-              children_categories: {}
-            }
-          })
-        }
-      })
+      let newCategories = mapCategories(categories)
 
       return {
-        payload: [ ...newCategories ]
+        payload: [...newCategories]
       }
     },
     normalize(res) {
@@ -38,3 +18,20 @@ export function ingestChannelCategories() {
     }
   }
 }
+
+function mapCategories(categories) {
+  if (!categories) return null
+  categories = categories.map(category => {
+    let children_categories = mapCategories(category.childrenCategories)
+    return {
+      native_category_id: category.categoryId.toString(),
+      channel_code: category.channelCode,
+      channel_country: category.countryCode,
+      category_name: category.categoryName,
+      is_leaf: children_categories.length == 0 ? true : false,
+      is_active: category.isActive,
+      children_categories
+    }
+  })
+  return categories
+}

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-order-package.ts

@@ -38,10 +38,10 @@ export function ingestChannelOrderPackage() {
         name: shipper_last_mile.name
       }
 
-      return {
+      let newOrderPackage: any = {
         channel_shop_id,
         native_order_id,
-        native_package_id,
+        native_package_id: native_package_id.toString(),
         shipping_tracking_code,
         shipping_type_value,
         warehouse_code,
@@ -50,6 +50,10 @@ export function ingestChannelOrderPackage() {
         shipper_last_mile,
         order_item_ids
       }
+
+      return {
+        payload: { ...newOrderPackage }
+      }
     },
     normalize(res) {
       return res

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-order.ts

@@ -1,4 +1,4 @@
-/* https://docs.sellercraft.co/docs/api-integrations/b3A6MTY4NjQxODU-initiate-order-shipment */
+/* https://docs.sellercraft.co/docs/api-integrations/b3A6MjQzODQ4OTg-ingest-channel-order */
 
 import { ORDER_STATUS } from '../../../constants'
 
@@ -13,14 +13,20 @@ export function ingestChannelOrder() {
         return {
           organisation_id: order.organisationId,
           channel_shop_id: order.channelShopId,
-          native_order_id: order.id,
-          ordered_at_date: new Date(order.createdAt).toISOString(),
-          ordered_at_time: new Date(order.createdAt).toISOString(),
-          updated_at_date: new Date(order.updatedAt).toISOString(),
-          updated_at_time: new Date(order.updatedAt).toISOString(),
+          native_order_id: order.id.toString(),
+          ordered_at_date: new Date(order.createdAt).toISOString().slice(0, -5) + 'Z',
+          ordered_at_time: new Date(order.createdAt).toISOString().slice(0, -5) + 'Z',
+          updated_at_date: new Date(order.updatedAt).toISOString().slice(0, -5) + 'Z',
+          updated_at_time: new Date(order.updatedAt).toISOString().slice(0, -5) + 'Z',
           customer_first_name: order.custFirstName,
           customer_last_name: order.custLastName,
-          charges: [],
+          charges: order.charges.map(charge => {
+            return {
+              charge_type_value: charge.name,
+              amount_gross: parseFloat(charge.grossAmount) || 0,
+              amount_nett: parseFloat(charge.nettAmount) || 0
+            }
+          }),
           address_shipping: {
             first_name: order.shipFirstName,
             last_name: order.shipLastName,
@@ -49,16 +55,16 @@ export function ingestChannelOrder() {
             phone_1: order.billPhone1,
             phone_2: order.billPhone2
           },
-          order_items: order.orderItems.map(orderItem => {
+          order_items: order.mappedOrderItems.map(orderItem => {
             return {
               native_item_id: orderItem.id.toString(),
               native_variant_id: orderItem.variationId.toString(),
               currency_code: orderItem.currency,
-              ordered_at_date: new Date(order.createdAt).toISOString(),
-              ordered_at_time: new Date(order.createdAt).toISOString(),
-              updated_at_date: new Date(order.updatedAt).toISOString(),
-              updated_at_time: new Date(order.updatedAt).toISOString(),
-              sla_expires_at: order?.slaExpiresAt,
+              ordered_at_date: new Date(order.createdAt).toISOString().slice(0, -5) + 'Z',
+              ordered_at_time: new Date(order.createdAt).toISOString().slice(0, -5) + 'Z',
+              updated_at_date: new Date(order.updatedAt).toISOString().slice(0, -5) + 'Z',
+              updated_at_time: new Date(order.updatedAt).toISOString().slice(0, -5) + 'Z',
+              sla_expires_at: orderItem?.slaExpiresAt ? new Date(orderItem.slaExpiresAt).toISOString() : null,
               charges: orderItem.charges.map(charge => {
                 return {
                   charge_type_value: charge.name,
@@ -68,12 +74,13 @@ export function ingestChannelOrder() {
               }),
               order_status_value: ORDER_STATUS[`${order.status}`]
             }
-          })
+          }),
+          seller_logistics: order?.isSOF
         }
       })
 
       return {
-        payload: [ ...newOrders ]
+        payload: [...newOrders]
       }
     },
     normalize(res) {

package/server/controllers/sellercraft-channel-integration/apis/ingest-channel-product.ts

@@ -13,15 +13,17 @@ export function ingestChannelProduct() {
             seller_sku: variant.variationSku,
             native_variant_id: variant.variationId.toString(),
             label: variant.name,
-            is_enabled: variant.isEnabled,
-            is_sellable: variant.isSellable,
+            is_enabled: variant.isEnabled || true,
+            is_sellable: variant.isSellable || true,
             is_deleted: false, // default
-            // variant_attributes: variant?.attributes.map(attribute => {
-            //   return {
-            //     ...attribute,
-            //     native_attribute_id: attribute.native_attribute_id.toString()
-            //   }
-            // }) || [],
+            variant_attributes: variant?.attributes
+              ? variant?.attributes.map(attribute => {
+                  return {
+                    ...attribute,
+                    native_attribute_id: attribute?.native_attribute_id?.toString()
+                  }
+                })
+              : [],
             stock_locked: variant?.stockLocked ? variant.stockLocked : 0,
             native_stock_reported: variant?.stockReported ? variant.stockReported : 0,
             price_full: variant.fullPrice || 0,
@@ -29,7 +31,7 @@ export function ingestChannelProduct() {
             inventory_products: variant?.inventoryProducts
               ? variant.inventoryProducts.map(inventoryProduct => {
                   return {
-                    quantity: inventoryProduct.qty,
+                    quantity: inventoryProduct.qty || 0,
                     name: inventoryProduct.name,
                     inventory_sku: inventoryProduct.sku,
                     product_versions: inventoryProduct?.productVersions
@@ -43,13 +45,14 @@ export function ingestChannelProduct() {
                             package_weight_gram: productVersion?.packageWeightGram
                               ? productVersion.packageWeightGram
                               : 0,
-                            stock_available: productVersion.qty || 0
+                            stock_available: productVersion.qty
                           }
                         })
                       : []
                   }
                 })
-              : []
+              : [],
+            extra_metadata: variant?.extraMetadata
           }
         })
 
@@ -61,21 +64,24 @@ export function ingestChannelProduct() {
           native_category_id: product.categoryId.toString(),
           native_product_id: product.productId.toString(),
           label: product.name,
-          brand: product.brand,
-          is_verified: product.isVerified,
-          flexible_attributes: product.channelCode == 'WCM' ? true : false, // add channels that do not support category_attributes ingestion
-          images: product.images.map(image => {
-            return {
-              file_url: image.url
-            }
-          }),
-          // product_attributes: product.attributes.map(attribute => {
-          //   return {
-          //     ...attribute,
-          //     native_attribute_id: attribute.native_attribute_id.toString()
-          //   }
-          // }),
-          variants: productVariations
+          brand: product.brand || '',
+          is_verified: product.isVerified || true,
+          flexible_attributes: product.channelCode == 'WCM' || product.channelCode == 'MGT' || product.channelCode == 'SPF' ? true : false, // add channels that do not support category_attributes ingestion
+          images:
+            product?.images?.map(image => {
+              return {
+                file_url: image.url
+              }
+            }) || [],
+          product_attributes:
+            product?.attributes?.map(attribute => {
+              return {
+                ...attribute,
+                native_attribute_id: attribute.native_attribute_id.toString()
+              }
+            }) || [],
+          variants: productVariations,
+          has_all_variants: product.channelCode == 'MGT' ? false : true
         }
       })
 

package/server/controllers/sellercraft-channel-integration/sellercraft-channel-integration.ts

@@ -1,5 +1,6 @@
 import fetch from 'node-fetch'
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
+import { createPayloadLog } from '@things-factory/integration-base'
 
 const debug = require('debug')('things-factory:integration-sellercraft:sellercraft')
 
@@ -21,7 +22,7 @@ export class SellercraftChannelIntegration {
   }
 
   generateRequestId() {
-    return uuid()
+    return uuidv4()
   }
 
   async post(path: string, data: any = {}) {
@@ -43,10 +44,16 @@ export class SellercraftChannelIntegration {
       body: jsondata
     })
 
+    const result = await response.json()
+    try {
+      createPayloadLog(JSON.parse(jsondata)[0]?.channel_shop_id || requestId, fullPath, jsondata, result, {
+        state: { domain: null }
+      })
+    } catch (e) {}
     if (response.ok) {
-      return await response.json()
+      return result
     } else {
-      throw new Error(`response code - ${response.status}, ${response.statusText}`)
+      throw new Error(`(${response.status}) ${result.detail}`)
     }
   }
 
@@ -71,7 +78,8 @@ export class SellercraftChannelIntegration {
     if (response.ok) {
       return await response.json()
     } else {
-      throw new Error(`response code - ${response.status}, ${response.statusText}`)
+      const result = await response.json()
+      throw new Error(`(${response.status}) ${result.message}`)
     }
   }
 
@@ -100,7 +108,8 @@ export class SellercraftChannelIntegration {
     if (response.ok) {
       return await response.json()
     } else {
-      throw new Error(`response code - ${response.status}, ${response.statusText}`)
+      const result = await response.json()
+      throw new Error(`(${response.status}) ${result.message}`)
     }
   }
 }