rerobe-js-orm 4.6.6 → 4.6.8

package/lib/models/Product.d.ts

@@ -31,7 +31,7 @@ export default class Product extends Base {
     };
     toObjForTextTranslation(): TranslatableAttributes;
     toObjForTypesense(isCanonicalMerchant?: boolean): TypesenseProductObj;
-    private deriveStockStatusFromSystemTags;
+    private deriveStockTimestampsFromSystemTags;
     buildUpdatedFieldsForSalesChannel(): {
         title: string;
         description: string;

package/lib/models/Product.js

@@ -579,9 +579,9 @@ class Product extends Base_1.default {
             stockTakeLatestTimestamp: null,
             stockTakeFirstTimestamp: null,
         };
-        const stockDerivations = this.deriveStockStatusFromSystemTags();
-        stagedObj.stockStatus = stockDerivations.stockStatus;
-        stagedObj.stockStatusTimestamp = this.utilities.sanitizeMillisTimeStamp(stockDerivations.stockStatusTimestamp);
+        const stockDerivations = this.deriveStockTimestampsFromSystemTags();
+        stagedObj.stockStatus = this.utilities.sanitizeString(this.filterAttributes.stockStatus);
+        stagedObj.stockStatusTimestamp = this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.stockStatusTimestamp);
         stagedObj.stockTakeFirstTimestamp = this.utilities.sanitizeMillisTimeStamp(stockDerivations.stockTakeFirstTimestamp);
         stagedObj.stockTakeLatestTimestamp = this.utilities.sanitizeMillisTimeStamp(stockDerivations.stockTakeLatestTimestamp);
         if (((_a = this.consignmentAttributes) === null || _a === void 0 ? void 0 : _a.inventoryLocations) &&
@@ -600,7 +600,7 @@ class Product extends Base_1.default {
         });
         return stagedObj;
     }
-    deriveStockStatusFromSystemTags() {
+    deriveStockTimestampsFromSystemTags() {
         const systemTags = Array.isArray(this.filterAttributes.systemTags) ? this.filterAttributes.systemTags : [];
         const stockTakeTags = systemTags.filter((t) => typeof t === 'string' && t.startsWith('stock-take|'));
         const inTransitTags = systemTags.filter((t) => typeof t === 'string' && t.startsWith('in-transit|'));
@@ -631,31 +631,15 @@ class Product extends Base_1.default {
         const stockTakeLatest = parseLatestAndFirstTs(stockTakeTags).latest;
         const inTransitLatest = parseLatestAndFirstTs(inTransitTags).latest;
         const stockTakeLatestSan = stockTakeLatest ? this.utilities.sanitizeMillisTimeStamp(stockTakeLatest) : null;
+        const inTransitLatestSan = inTransitLatest ? this.utilities.sanitizeMillisTimeStamp(inTransitLatest) : null;
         const stockTakeFirstRaw = stockTakeTags.length ? parseLatestAndFirstTs(stockTakeTags).first : 0;
         const stockTakeFirstSan = stockTakeFirstRaw ? this.utilities.sanitizeMillisTimeStamp(stockTakeFirstRaw) : null;
-        let stockStatus = '';
-        let stockStatusTimestamp = null;
-        if (stockTakeLatest === 0 && inTransitLatest === 0) {
-            stockStatus = '';
-            stockStatusTimestamp = null;
-        }
-        else if (stockTakeLatest >= inTransitLatest) {
-            stockStatus = 'In stock';
-            stockStatusTimestamp = stockTakeLatestSan;
-        }
-        else {
-            stockStatus = 'In transit';
-            stockStatusTimestamp = this.utilities.sanitizeMillisTimeStamp(inTransitLatest);
-        }
-        this.filterAttributes.stockStatus = stockStatus;
-        this.timestampAttributes.stockStatusTimestamp = stockStatusTimestamp;
         this.timestampAttributes.stockTakeFirstTimestamp = stockTakeFirstSan;
         this.timestampAttributes.stockTakeLatestTimestamp = stockTakeLatestSan;
         return {
             stockTakeFirstTimestamp: stockTakeFirstSan,
             stockTakeLatestTimestamp: stockTakeLatestSan,
-            stockStatus,
-            stockStatusTimestamp,
+            inTransitLatestTimestamp: inTransitLatestSan,
         };
     }
     buildUpdatedFieldsForSalesChannel() {

package/lib/types/rerobe-product-types.d.ts

@@ -371,7 +371,7 @@ type TypesenseProductObj = {
     description: string;
     discountType: string;
     discountValue: number;
-    stockStatus: 'In stock' | 'In transit' | '';
+    stockStatus: string;
     stockStatusTimestamp: number | null;
     id: string;
     documentId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "4.6.6",
+  "version": "4.6.8",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",