pure-orm 1.3.1 → 2.2.0

package/examples/order-more/bo/customer.js

@@ -0,0 +1,18 @@
+const Base = require('./base');
+const Customers = require('./customers');
+
+class Customer extends Base {
+  get BoCollection() {
+    return Customers;
+  }
+
+  static get tableName() {
+    return 'customer';
+  }
+
+  static get sqlColumnsData() {
+    return ['id', 'email'];
+  }
+}
+
+module.exports = Customer;

package/examples/order-more/bo/customers.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class Customers extends BaseBoCollection {
+  static get Bo() {
+    return require('./customer'); // eslint-disable-line
+  }
+}
+
+module.exports = Customers;

package/examples/order-more/bo/line-item.js

@@ -0,0 +1,33 @@
+const Base = require('./base');
+const LineItems = require('./line-items');
+const ProductVariant = require('./product-variant');
+const Order = require('./order');
+
+class LineItem extends Base {
+  get BoCollection() {
+    return LineItems;
+  }
+
+  static get tableName() {
+    return 'line_item';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      { column: 'product_variant_id', references: ProductVariant },
+      { column: 'order_id', references: Order },
+      'fulfillment_status_id',
+      'fulfillable_quantity',
+      'fulfillment_service',
+      'grams',
+      'price',
+      'quantity',
+      'requires_shipping',
+      'taxable',
+      'total_discount'
+    ];
+  }
+}
+
+module.exports = LineItem;

package/examples/order-more/bo/line-items.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class LineItems extends BaseBoCollection {
+  static get Bo() {
+    return require('./line-item'); // eslint-disable-line
+  }
+}
+
+module.exports = LineItems;

package/examples/order-more/bo/order.js

@@ -0,0 +1,49 @@
+const BaseBo = require('./base');
+const Orders = require('./orders');
+const UtmSource = require('./utm-source');
+const Customer = require('./customer');
+const PhysicalAddress = require('./physical-address');
+
+class Order extends BaseBo {
+  get BoCollection() {
+    return Orders;
+  }
+
+  static get tableName() {
+    return 'order';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      'email',
+      { column: 'customer_id', references: Customer },
+      { column: 'shipping_address_id', references: PhysicalAddress },
+      { column: 'billing_address_id', references: PhysicalAddress },
+      'browser_ip',
+      'browser_user_agent',
+      'kujo_imported_date',
+      'created_date',
+      'cancel_reason',
+      'cancelled_date',
+      'closed_date',
+      'processed_date',
+      'updated_date',
+      'note',
+      'subtotal_price',
+      'taxes_included',
+      'total_discounts',
+      'total_price',
+      'total_tax',
+      'total_weight',
+      'order_status_url',
+      { column: 'utm_source_id', references: UtmSource },
+      'utm_medium_id',
+      'utm_campaign',
+      'utm_content',
+      'utm_term'
+    ];
+  }
+}
+
+module.exports = Order;

package/examples/order-more/bo/orders.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class Orders extends BaseBoCollection {
+  static get Bo() {
+    return require('./order'); // eslint-disable-line
+  }
+}
+
+module.exports = Orders;

package/examples/order-more/bo/parcel-event.js

@@ -0,0 +1,19 @@
+const Base = require('./base');
+const ParcelEvents = require('./parcel-events');
+const Parcel = require('./parcel');
+
+class ParcelEvent extends Base {
+  get BoCollection() {
+    return ParcelEvents;
+  }
+
+  static get tableName() {
+    return 'parcel_event';
+  }
+
+  static get sqlColumnsData() {
+    return ['id', { column: 'parcel_id', references: Parcel }, 'eta', 'status'];
+  }
+}
+
+module.exports = ParcelEvent;

package/examples/order-more/bo/parcel-events.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class ParcelEvents extends BaseBoCollection {
+  static get Bo() {
+    return require('./parcel-event'); // eslint-disable-line
+  }
+}
+
+module.exports = ParcelEvents;

package/examples/order-more/bo/parcel-line-item.js

@@ -0,0 +1,24 @@
+const Base = require('./base');
+const ParcelLineItems = require('./parcel-line-items');
+const LineItem = require('./line-item');
+const Parcel = require('./parcel');
+
+class ParcelLineItem extends Base {
+  get BoCollection() {
+    return ParcelLineItems;
+  }
+
+  static get tableName() {
+    return 'parcel_line_item';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      { column: 'line_item_id', references: LineItem },
+      { column: 'parcel_id', references: Parcel }
+    ];
+  }
+}
+
+module.exports = ParcelLineItem;

package/examples/order-more/bo/parcel-line-items.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class ParcelLineItems extends BaseBoCollection {
+  static get Bo() {
+    return require('./parcel-line-item'); // eslint-disable-line
+  }
+}
+
+module.exports = ParcelLineItems;

package/examples/order-more/bo/parcel.js

@@ -0,0 +1,18 @@
+const BaseBo = require('./base');
+const Parcels = require('./parcels');
+
+class Parcel extends BaseBo {
+  get BoCollection() {
+    return Parcels;
+  }
+
+  static get tableName() {
+    return 'parcel';
+  }
+
+  static get sqlColumnsData() {
+    return ['id'];
+  }
+}
+
+module.exports = Parcel;

package/examples/order-more/bo/parcels.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class Parcels extends BaseBoCollection {
+  static get Bo() {
+    return require('./parcel'); // eslint-disable-line
+  }
+}
+
+module.exports = Parcels;

package/examples/order-more/bo/physical-address.js

@@ -0,0 +1,30 @@
+const Base = require('./base');
+const PhysicalAddresses = require('./physical-addresses');
+
+class PhysicalAddress extends Base {
+  get BoCollection() {
+    return PhysicalAddresses;
+  }
+
+  static get tableName() {
+    return 'physical_address';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      'address1',
+      'address2',
+      'city',
+      'province',
+      'zip',
+      'country',
+      'province_code',
+      'country_code',
+      'latitude',
+      'longitude'
+    ];
+  }
+}
+
+module.exports = PhysicalAddress;

package/examples/order-more/bo/physical-addresses.js

@@ -0,0 +1,12 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class PhysicalAddresses extends BaseBoCollection {
+  static get displayName() {
+    return 'physicalAddresses';
+  }
+  static get Bo() {
+    return require('./physical-address'); // eslint-disable-line
+  }
+}
+
+module.exports = PhysicalAddresses;

package/examples/order-more/bo/refund.js

@@ -0,0 +1,28 @@
+const Base = require('./base');
+const Order = require('./order');
+const Refunds = require('./refunds');
+
+class Refund extends Base {
+  get BoCollection() {
+    return Refunds;
+  }
+
+  static get tableName() {
+    return 'refund';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      { column: 'order_id', references: Order },
+      'shopify_id',
+      'created_date',
+      'processed_date',
+      'kujo_imported_date',
+      'amount',
+      'note',
+      'restock'
+    ];
+  }
+}
+module.exports = Refund;

package/examples/order-more/bo/refunds.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class Refunds extends BaseBoCollection {
+  static get Bo() {
+    return require('./refund'); // eslint-disable-line
+  }
+}
+
+module.exports = Refunds;

package/examples/order-more/bo/shipment-actual-product-variant.js

@@ -0,0 +1,26 @@
+const Base = require('./base');
+const ShipmentActualProductVariants = require('./shipment-actual-product-variants');
+const ActualProductVariant = require('./actual-product-variant');
+const Shipment = require('./shipment');
+
+class ShipmentActualProductVariant extends Base {
+  get BoCollection() {
+    return ShipmentActualProductVariants;
+  }
+
+  static get tableName() {
+    return 'shipment_actual_product_variant';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      { column: 'shipment_id', references: Shipment },
+      { column: 'actual_product_variant_id', references: ActualProductVariant },
+      'quantity',
+      'updated_date'
+    ];
+  }
+}
+
+module.exports = ShipmentActualProductVariant;

package/examples/order-more/bo/shipment-actual-product-variants.js

@@ -0,0 +1,9 @@
+const { BaseBoCollection } = require('../../../src/index');
+
+class ShipmentActualProductVariants extends BaseBoCollection {
+  static get Bo() {
+    return require('./shipment-actual-product-variant'); // eslint-disable-line
+  }
+}
+
+module.exports = ShipmentActualProductVariants;

package/examples/order-more/bo/utm-medium.js

@@ -0,0 +1,13 @@
+const Base = require('./base');
+
+class UtmMedium extends Base {
+  static get tableName() {
+    return 'utm_medium';
+  }
+
+  static get sqlColumnsData() {
+    return ['id', 'value', 'label'];
+  }
+}
+
+module.exports = UtmMedium;

package/examples/order-more/bo/utm-source.js

@@ -0,0 +1,13 @@
+const Base = require('./base');
+
+class UtmSource extends Base {
+  static get tableName() {
+    return 'utm_source';
+  }
+
+  static get sqlColumnsData() {
+    return ['id', 'value', 'label', 'internal'];
+  }
+}
+
+module.exports = UtmSource;

package/examples/order-more/business-objects.js

@@ -9,7 +9,18 @@ const getBusinessObjects = () => [
   require('./bo/size'),
   require('./bo/color'),
   require('./bo/gender'),
-  require('./bo/shipment')
+  require('./bo/shipment'),
+  require('./bo/shipment-actual-product-variant'),
+  require('./bo/refund'),
+  require('./bo/order'),
+  require('./bo/line-item'),
+  require('./bo/customer'),
+  require('./bo/physical-address'),
+  require('./bo/utm-source'),
+  require('./bo/utm-medium'),
+  require('./bo/parcel-line-item'),
+  require('./bo/parcel'),
+  require('./bo/parcel-event')
 ];
 
 module.exports = getBusinessObjects;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pure-orm",
-  "version": "1.3.1",
+  "version": "2.2.0",
   "main": "src/index.js",
   "engines": {
     "node": ">=6"

package/src/bo/base-bo.js

@@ -147,35 +147,60 @@ module.exports = ({ getBusinessObjects }) =>
 
       // Wowzer is this both CPU and Memory inefficient
       clump.forEach(array => {
-        array.forEach(bo => {
+        array.forEach(_bo => {
           const nodeAlreadySeen = nodes.find(
             x =>
-              x.constructor.name === bo.constructor.name &&
-              x.getId() === bo.getId()
+              x.constructor.name === _bo.constructor.name &&
+              x.getId() === _bo.getId()
           );
-          const nodePointingToIt = nodes.find(x => {
-            const index = Object.values(x.constructor.references).indexOf(
-              bo.constructor
-            );
-            if (index === -1) {
+          const bo = nodeAlreadySeen || _bo;
+          const isNodeAlreadySeen = !!nodeAlreadySeen;
+          const nodePointingToIt = nodes.find(node => {
+            const indexes = Object.values(node.constructor.references)
+              .map((x, i) => (x === bo.constructor ? i : null))
+              .filter(x => x != null);
+            if (!indexes.length) {
               return false;
             }
-            const property = Object.keys(x.constructor.references)[index];
-            return x[property] === bo.id;
+            for (const index of indexes) {
+              const property = Object.keys(node.constructor.references)[index];
+              if (node[property] === bo.id) {
+                return true;
+              }
+            }
+            return false;
           });
-          const reversedNodes = nodes.slice().reverse();
-          const nodeItPointsTo = reversedNodes.find(x => {
+          // For first obj type which is has an instance in nodes array,
+          // get its index in nodes array
+          const indexOfOldestParent = array.reduce((answer, obj) => {
+            if (answer != null) {
+              return answer;
+            }
+            const index = nodes.findIndex(
+              n => n.constructor === obj.constructor
+            );
+            if (index !== -1) {
+              return index;
+            }
+            return null;
+          }, null);
+          const parentHeirarchy = [
+            ...nodes.slice(0, indexOfOldestParent + 1).reverse(),
+            root
+          ];
+          const nodeItPointsTo = parentHeirarchy.find(parent => {
             const index = Object.values(bo.constructor.references).indexOf(
-              x.constructor
+              parent.constructor
             );
             if (index === -1) {
               return false;
             }
             const property = Object.keys(bo.constructor.references)[index];
-            return bo[property] === x.id;
+            return bo[property] === parent.id;
           });
-          if (nodeAlreadySeen) {
+          if (isNodeAlreadySeen) {
             if (nodeItPointsTo && !nodePointingToIt) {
+              nodes = [bo, ...nodes];
               return;
             }
             // If the nodePointingToIt (eg, parcel_event) is part of an
@@ -183,24 +208,15 @@ module.exports = ({ getBusinessObjects }) =>
             // nodeAlreadySeen, early return so we don't create it (parcel) on
             // the nodePointingToIt (parcel_event), since it (parcel) has been
             // shown to be the parent (of parcel_events).
-            const ec =
-              nodeAlreadySeen[nodePointingToIt.BoCollection.displayName];
+            const ec = bo[nodePointingToIt.BoCollection.displayName];
             if (ec && ec.models.find(m => m === nodePointingToIt)) {
+              nodes = [bo, ...nodes];
               return;
             }
           }
-          if (!(nodePointingToIt || nodeItPointsTo)) {
-            if (!bo.getId()) {
-              // If the join is fruitless; todo: add a test for this path
-              return;
-            }
-            throw Error(
-              `Could not find how this BO fits: ${JSON.stringify(bo)}`
-            );
-          }
           if (nodePointingToIt) {
             nodePointingToIt[bo.constructor.displayName] = bo;
-          } else {
+          } else if (nodeItPointsTo) {
             let collection = nodeItPointsTo[bo.BoCollection.displayName];
             if (collection) {
               collection.models.push(bo);
@@ -209,6 +225,14 @@ module.exports = ({ getBusinessObjects }) =>
                 { models: [bo] }
               );
             }
+          } else {
+            if (!bo.getId()) {
+              // If the join is fruitless; todo: add a test for this path
+              return;
+            }
+            throw Error(
+              `Could not find how this BO fits: ${JSON.stringify(bo)}`
+            );
           }
           nodes = [bo, ...nodes];
         });