rerobe-js-orm 3.0.10 → 3.0.12

package/lib/factories/Merchant/MerchantFromFormState.js

@@ -4,7 +4,6 @@ const MerchantFactory_1 = require("./MerchantFactory");
 const Merchant_1 = require("../../models/Merchant");
 class MerchantFromFormState extends MerchantFactory_1.default {
     createMerchant(fs) {
-        var _a;
         const MerchantMutableData = {
             name: fs.fields.name.inputValue,
             type: fs.fields.type.selectedValue,
@@ -18,7 +17,6 @@ class MerchantFromFormState extends MerchantFactory_1.default {
             timeZone: fs.fields.timeZone.selectedValue,
             unitSystem: fs.fields.unitSystem.selectedValue,
             defaultWeightUnit: fs.fields.defaultWeightUnit.selectedValue,
-            defaultLocation: (_a = fs.props) === null || _a === void 0 ? void 0 : _a.defaultLocation,
             webhooks: fs.fields.webhooks.selectedValues,
             primaryDomain: fs.fields.primaryDomain.inputValue,
             socialLinks: fs.fields.socialLinks.selectedValue,

package/lib/helpers/Utilities.d.ts

@@ -21,4 +21,9 @@ export default class Utilities {
         firstName: string;
         lastName: string;
     };
+    formatTimestamp(timestampMillis: number): {
+        createdAtDay: string;
+        createdAtMonth: string;
+        createdAtHour: string;
+    };
 }

package/lib/helpers/Utilities.js

@@ -146,5 +146,27 @@ class Utilities {
         }
         return res;
     }
+    formatTimestamp(timestampMillis) {
+        if (typeof timestampMillis !== 'number' || Number.isNaN(new Date(timestampMillis).valueOf())) {
+            return {
+                createdAtDay: '',
+                createdAtMonth: '',
+                createdAtHour: '',
+            };
+        }
+        const dateObj = new Date(timestampMillis);
+        const year = dateObj.getUTCFullYear();
+        const month = (dateObj.getUTCMonth() + 1).toString().padStart(2, '0'); // Months are 0-indexed in JS
+        const day = dateObj.getUTCDate().toString().padStart(2, '0');
+        const hour = dateObj.getUTCHours().toString().padStart(2, '0');
+        const createdAtDay = `${year}-${month}-${day}`;
+        const createdAtMonth = `${year}-${month}`;
+        const createdAtHour = `${year}-${month}-${day} ${hour}`;
+        return {
+            createdAtDay,
+            createdAtMonth,
+            createdAtHour,
+        };
+    }
 }
 exports.default = Utilities;

package/lib/models/Merchant.js

@@ -91,7 +91,6 @@ class Merchant extends Base_1.default {
             timeZone: this.timeZone,
             unitSystem: this.unitSystem,
             defaultWeightUnit: this.defaultWeightUnit,
-            defaultLocation: this.defaultLocation,
             primaryDomain: this.primaryDomain,
             webhooks: this.webhooks,
             socialLinks: this.socialLinks,

package/lib/models/Order.d.ts

@@ -103,11 +103,17 @@ export default class Order extends Base {
     toObj(): ReRobeOrderObj;
     generateSchemaForTypesense(name?: string): {
         default_sorting_field: string;
-        fields: {
+        fields: ({
             facet: boolean;
             name: string;
             type: string;
-        }[];
+            optional?: undefined;
+        } | {
+            facet: boolean;
+            name: string;
+            type: string;
+            optional: boolean;
+        })[];
         name: string;
     };
     toObjForTypesense(): TypesenseOrderObj;

package/lib/models/Order.js

@@ -308,6 +308,24 @@ class Order extends Base_1.default {
                     name: 'merchantId',
                     type: 'string',
                 },
+                {
+                    facet: true,
+                    name: 'createdAtHour',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'createdAtDay',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'createdAtMonth',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name: 'dev_orders_20220809',
         };
@@ -316,11 +334,16 @@ class Order extends Base_1.default {
         const image = this.lineItems && this.lineItems[0] && this.lineItems[0].image && this.lineItems[0].image.originalSrc
             ? this.lineItems[0].image.originalSrc
             : 'https://res.cloudinary.com/ribbn/image/fetch/e_blur:1000,o_20,q_50/https://cdn.shopify.com/s/files/1/0261/9686/9172/products/7AC16810-F519-4665-8891-7163EB29FBB7_1000x1000.jpg%3Fv%3D1634827512';
+        const createdAtTimestamp = this.utilities.sanitizeMillisTimeStamp(this.createdAtTimestamp);
+        const { createdAtHour, createdAtDay, createdAtMonth } = this.utilities.formatTimestamp(createdAtTimestamp);
         const stagedObj = {
             id: this.utilities.sanitizeString(this.documentId),
             documentId: this.utilities.sanitizeString(this.documentId),
             userId: this.utilities.sanitizeString(this.userId),
-            createdAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.createdAtTimestamp),
+            createdAtTimestamp,
+            createdAtHour,
+            createdAtDay,
+            createdAtMonth,
             updatedAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.updatedAtTimestamp),
             merchantId: this.utilities.sanitizeString(this.merchantId),
             image: this.utilities.sanitizeString(image),

package/lib/models/Product.d.ts

@@ -24,9 +24,9 @@ export default class Product extends Base {
             optional?: undefined;
         } | {
             facet: boolean;
-            optional: boolean;
             name: string;
             type: string;
+            optional: boolean;
         })[];
         name: string;
     };

package/lib/models/Product.js

@@ -261,6 +261,8 @@ class Product extends Base_1.default {
         };
     }
     toObjForTypesense() {
+        const createdAtTimestamp = this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.createdAtTimestamp);
+        const { createdAtHour, createdAtDay, createdAtMonth } = this.utilities.formatTimestamp(createdAtTimestamp);
         const stagedObj = {
             brand: this.utilities.sanitizeString(this.filterAttributes.brand),
             size: this.utilities.sanitizeString(this.filterAttributes.size),
@@ -290,7 +292,10 @@ class Product extends Base_1.default {
             title: this.utilities.sanitizeString(this.attributes.title),
             vendorName: this.utilities.sanitizeString(this.attributes.vendorName),
             vendorId: this.utilities.sanitizeString(this.attributes.vendorId),
-            createdAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.createdAtTimestamp),
+            createdAtTimestamp,
+            createdAtHour,
+            createdAtDay,
+            createdAtMonth,
             updatedAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.updatedAtTimestamp),
             sellRequestReviewTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellRequestReviewTimestamp),
             sellRequestReviewDraftTimestamp: this.utilities.sanitizeMillisTimeStamp(this.timestampAttributes.sellRequestReviewDraftTimestamp),
@@ -463,6 +468,7 @@ class Product extends Base_1.default {
                     facet: true,
                     name: 'size',
                     type: 'string',
+                    optional: true,
                 },
                 {
                     facet: true,
@@ -510,7 +516,7 @@ class Product extends Base_1.default {
                 },
                 {
                     facet: false,
-                    optional: false,
+                    optional: true,
                     name: 'merchantId',
                     type: 'string',
                 },
@@ -738,6 +744,24 @@ class Product extends Base_1.default {
                     name: 'materialComposition..*.value',
                     type: 'int32',
                 },
+                {
+                    facet: true,
+                    name: 'createdAtHour',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'createdAtDay',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'createdAtMonth',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name,
         };

package/lib/models/User.d.ts

@@ -50,11 +50,17 @@ export default class User extends Base {
     toCustomerInputObjForRibbn(): RibbnCustomerObj;
     generateSchemaForTypesense(name?: string): {
         default_sorting_field: string;
-        fields: {
+        fields: ({
             facet: boolean;
             name: string;
             type: string;
-        }[];
+            optional?: undefined;
+        } | {
+            facet: boolean;
+            name: string;
+            type: string;
+            optional: boolean;
+        })[];
         name: string;
     };
     toObjForTypesense(merchantId: string): TypesenseUserObj;

package/lib/models/User.js

@@ -295,16 +295,39 @@ class User extends Base_1.default {
                     name: 'registrationSource',
                     type: 'string',
                 },
+                {
+                    facet: true,
+                    name: 'createdAtHour',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'createdAtDay',
+                    type: 'string',
+                    optional: true,
+                },
+                {
+                    facet: true,
+                    name: 'createdAtMonth',
+                    type: 'string',
+                    optional: true,
+                },
             ],
             name: 'prod_customers_20220907',
         };
     }
     toObjForTypesense(merchantId) {
+        const createdAtTimestamp = this.utilities.sanitizeMillisTimeStamp(this.createdAtTimestamp);
+        const { createdAtHour, createdAtDay, createdAtMonth } = this.utilities.formatTimestamp(createdAtTimestamp);
         const stagedObj = {
             id: this.utilities.sanitizeString(this.documentId),
             documentId: this.utilities.sanitizeString(this.documentId),
             userId: this.utilities.sanitizeString(this.uid),
-            createdAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.createdAtTimestamp),
+            createdAtTimestamp,
+            createdAtHour,
+            createdAtDay,
+            createdAtMonth,
             updatedAtTimestamp: this.utilities.sanitizeMillisTimeStamp(this.updatedAtTimestamp),
             merchantId: this.utilities.sanitizeString(merchantId),
             firstName: this.utilities.sanitizeString(this.firstName),

package/lib/types/merchant-types.d.ts

@@ -19,7 +19,6 @@ declare type MerchantMutableData = {
     timeZone: string;
     unitSystem: UnitSystemTypes | string | null;
     defaultWeightUnit: MetricWeightTypes | ImperialWeightTypes | string | null;
-    defaultLocation: string;
     primaryDomain: string;
     webhooks: MerchantWebHook[];
     socialLinks: SocialLinksType | null;
@@ -35,6 +34,7 @@ declare type MerchantSystemOnlyMutableData = {
     sharedSecret: string;
     ribbnId: string;
     webshopHomePageId: string;
+    defaultLocation: string;
 };
 declare type MerchantObj = MerchantMutableData & MerchantSystemOnlyMutableData;
 declare type MerchantTypes = 'INDIVIDUAL' | 'BUSINESS';

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

@@ -763,4 +763,7 @@ declare type TypesenseOrderObj = {
     productBrands: string[];
     tags: string[];
     merchantId: string;
+    createdAtDay: string;
+    createdAtMonth: string;
+    createdAtHour: string;
 };

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

@@ -299,5 +299,8 @@ declare type TypesenseProductObj = {
     reservedBy: string[];
     'inventoryLocations.ids': string[];
     'materialComposition.names': string[];
+    createdAtDay: string;
+    createdAtMonth: string;
+    createdAtHour: string;
     [key: string]: any;
 };

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

@@ -164,4 +164,7 @@ declare type TypesenseUserObj = {
     lastOrderTimestamp: number;
     lastUploadTimestamp: number;
     registrationSource: string;
+    createdAtDay: string;
+    createdAtMonth: string;
+    createdAtHour: string;
 };

package/package.json

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