pure-orm 2.3.0 → 3.0.0

package/package.json

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

package/src/bo/base-bo.js

@@ -185,8 +185,8 @@ module.exports = ({ getBusinessObjects }) =>
             return null;
           }, null);
           const parentHeirarchy = [
-            ...nodes.slice(0, indexOfOldestParent + 1).reverse(),
-            root
+            root,
+            ...nodes.slice(0, indexOfOldestParent + 1).reverse()
           ];
           const nodeItPointsTo = parentHeirarchy.find(parent => {
             const index = Object.values(bo.constructor.references).indexOf(

package/src/bo/base-bo.spec.js

@@ -20,6 +20,8 @@ const ten = require('../../test-utils/ten/results.json');
 const eleven = require('../../test-utils/eleven/results.json');
 const twelve = require('../../test-utils/twelve/results.json');
 const Prompt = require('../../test-utils/twelve/bo/prompt');
+const thirteen = require('../../test-utils/thirteen/results.json');
+const Member = require('../../test-utils/thirteen/bo/member');
 
 test('Bo#parseFromDatabase where multiple rows reduce to one nested object (with all one-to-one or one-to-many tables)', () => {
   const order = Order.createOneFromDatabase(one);
@@ -545,3 +547,39 @@ test('Bo#parseFromDatabase 12', () => {
   // Ideally the below should work
   // expect(prompt.fromMember.id).toEqual(1);
 });
+
+// Issue occcurs in nestClump
+// Problem when a table has records that are supposed to nest under root
+// but nest under other stuff below it instead
+// Member
+//  Recommendations [1]
+//   Brand
+//    Recommendations [1]
+//   Passion
+//    Recommendations [2]
+// -- instead of correct --
+// Member
+//  Recommendations[4]
+//   Brand
+//   Passion
+test('Bo#parseFromDatabase 13', () => {
+  const members = Member.createFromDatabase(thirteen);
+  const member = members.models[0];
+  expect(member.recommendations.models.length).toEqual(4);
+  expect(member.recommendations.models[0].brand.id).toEqual(2);
+  expect(member.recommendations.models[0].product.id).toEqual(7);
+  expect(member.recommendations.models[0].category.id).toEqual(1);
+  expect(member.recommendations.models[0].recommendationAudiences.models[0].audience.id).toEqual(1);
+  expect(member.recommendations.models[1].brand.id).toEqual(2);
+  expect(member.recommendations.models[1].product.id).toEqual(1);
+  expect(member.recommendations.models[1].category.id).toEqual(2);
+  expect(member.recommendations.models[1].recommendationAudiences.models[0].audience.id).toEqual(1);
+  expect(member.recommendations.models[2].brand.id).toEqual(3);
+  expect(member.recommendations.models[2].product.id).toEqual(27);
+  expect(member.recommendations.models[2].category.id).toEqual(3);
+  expect(member.recommendations.models[2].recommendationAudiences.models[0].audience.id).toEqual(1);
+  expect(member.recommendations.models[3].brand.id).toEqual(6);
+  expect(member.recommendations.models[3].product.id).toEqual(75);
+  expect(member.recommendations.models[3].category.id).toEqual(4);
+  expect(member.recommendations.models[3].recommendationAudiences.models[0].audience.id).toEqual(1);
+});

package/test-utils/thirteen/bo/audience.js

@@ -0,0 +1,18 @@
+const Base = require('./base');
+const Audiences = require('./audiences');
+
+class Audience extends Base {
+  get BoCollection() {
+    return Audiences;
+  }
+
+  static get tableName() {
+    return 'audience';
+  }
+
+  static get sqlColumnsData() {
+    return ['id'];
+  }
+}
+
+module.exports = Audience;

package/test-utils/thirteen/bo/audiences.js

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

package/test-utils/thirteen/bo/base.js

@@ -0,0 +1,5 @@
+const { createBaseBO } = require('pure-orm');
+const getBusinessObjects = require('../business-objects');
+
+const constructor = createBaseBO({ getBusinessObjects });
+module.exports = constructor;

package/test-utils/thirteen/bo/brand.js

@@ -0,0 +1,18 @@
+const Base = require('./base');
+const Brands = require('./brands');
+
+class Brand extends Base {
+  get BoCollection() {
+    return Brands;
+  }
+
+  static get tableName() {
+    return 'brand';
+  }
+
+  static get sqlColumnsData() {
+    return ['id'];
+  }
+}
+
+module.exports = Brand;

package/test-utils/thirteen/bo/brands.js

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

package/test-utils/thirteen/bo/categories.js

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

package/test-utils/thirteen/bo/category.js

@@ -0,0 +1,18 @@
+const Base = require('./base');
+const Categories = require('./categories');
+
+class Category extends Base {
+  get BoCollection() {
+    return Categories;
+  }
+
+  static get tableName() {
+    return 'category';
+  }
+
+  static get sqlColumnsData() {
+    return ['id'];
+  }
+}
+
+module.exports = Category;

package/test-utils/thirteen/bo/member.js

@@ -0,0 +1,18 @@
+const Base = require('./base');
+const Members = require('./members');
+
+class Member extends Base {
+  get BoCollection() {
+    return Members;
+  }
+
+  static get tableName() {
+    return 'member';
+  }
+
+  static get sqlColumnsData() {
+    return ['id'];
+  }
+}
+
+module.exports = Member;

package/test-utils/thirteen/bo/members.js

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

package/test-utils/thirteen/bo/passion.js

@@ -0,0 +1,18 @@
+const Base = require('./base');
+const Passions = require('./passions');
+
+class Passion extends Base {
+  get BoCollection() {
+    return Passions;
+  }
+
+  static get tableName() {
+    return 'passion';
+  }
+
+  static get sqlColumnsData() {
+    return ['id'];
+  }
+}
+
+module.exports = Passion;

package/test-utils/thirteen/bo/passions.js

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

package/test-utils/thirteen/bo/product.js

@@ -0,0 +1,19 @@
+const Base = require('./base');
+const Brand = require('./brand');
+const Products = require('./products');
+
+class Product extends Base {
+  get BoCollection() {
+    return Products;
+  }
+
+  static get tableName() {
+    return 'product';
+  }
+
+  static get sqlColumnsData() {
+    return ['id', { column: 'brand_id', references: Brand }];
+  }
+}
+
+module.exports = Product;

package/test-utils/thirteen/bo/products.js

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

package/test-utils/thirteen/bo/recommendation-audience.js

@@ -0,0 +1,24 @@
+const Base = require('./base');
+const RecommendationAudiences = require('./recommendation-audiences');
+const Recommendation = require('./recommendation');
+const Audience = require('./audience');
+
+class RecommendationAudience extends Base {
+  get BoCollection() {
+    return RecommendationAudiences;
+  }
+
+  static get tableName() {
+    return 'recommendation_audience';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      { column: 'recommendation_id', references: Recommendation },
+      { column: 'audience_id', references: Audience }
+    ];
+  }
+}
+
+module.exports = RecommendationAudience;

package/test-utils/thirteen/bo/recommendation-audiences.js

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

package/test-utils/thirteen/bo/recommendation.js

@@ -0,0 +1,30 @@
+const Base = require('./base');
+const Recommendations = require('./recommendations');
+const Member = require('./member');
+const Brand = require('./brand');
+const Product = require('./product');
+const Category = require('./category');
+const Passion = require('./passion');
+
+class Recommendation extends Base {
+  get BoCollection() {
+    return Recommendations;
+  }
+
+  static get tableName() {
+    return 'recommendation';
+  }
+
+  static get sqlColumnsData() {
+    return [
+      'id',
+      { column: 'member_id', references: Member },
+      { column: 'brand_id', references: Brand },
+      { column: 'product_id', references: Product },
+      { column: 'category_id', references: Category },
+      { column: 'passion_id', references: Passion }
+    ];
+  }
+}
+
+module.exports = Recommendation;

package/test-utils/thirteen/bo/recommendations.js

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

package/test-utils/thirteen/business-objects.js

@@ -0,0 +1,14 @@
+/* eslint-disable global-require */
+const getBusinessObjects = () => [
+  // These need to be imported here to get around circular dependencies
+  require('./bo/member'),
+  require('./bo/recommendation'),
+  require('./bo/brand'),
+  require('./bo/product'),
+  require('./bo/category'),
+  require('./bo/passion'),
+  require('./bo/recommendation-audience'),
+  require('./bo/audience')
+];
+
+module.exports = getBusinessObjects;

package/test-utils/thirteen/results.json

@@ -0,0 +1,74 @@
+[
+  {
+    "member#id": 1,
+    "recommendation#id": 1,
+    "recommendation#member_id": 1,
+    "recommendation#brand_id": 2,
+    "recommendation#product_id": 7,
+    "recommendation#category_id": 1,
+    "recommendation#passion_id": 2,
+    "brand#id": 2,
+    "product#id": 7,
+    "product#brand_id": 2,
+    "category#id": 1,
+    "passion#id": 2,
+    "recommendation_audience#id": 1,
+    "recommendation_audience#recommendation_id": 1,
+    "recommendation_audience#audience_id": 1,
+    "audience#id": 1
+  },
+  {
+    "member#id": 1,
+    "recommendation#id": 2,
+    "recommendation#member_id": 1,
+    "recommendation#brand_id": 2,
+    "recommendation#product_id": 1,
+    "recommendation#category_id": 2,
+    "recommendation#passion_id": 2,
+    "brand#id": 2,
+    "product#id": 1,
+    "product#brand_id": 2,
+    "category#id": 2,
+    "passion#id": 2,
+    "recommendation_audience#id": 2,
+    "recommendation_audience#recommendation_id": 2,
+    "recommendation_audience#audience_id": 1,
+    "audience#id": 1
+  },
+  {
+    "member#id": 1,
+    "recommendation#id": 3,
+    "recommendation#member_id": 1,
+    "recommendation#brand_id": 3,
+    "recommendation#product_id": 27,
+    "recommendation#category_id": 3,
+    "recommendation#passion_id": 2,
+    "brand#id": 3,
+    "product#id": 27,
+    "product#brand_id": 3,
+    "category#id": 3,
+    "passion#id": 2,
+    "recommendation_audience#id": 3,
+    "recommendation_audience#recommendation_id": 3,
+    "recommendation_audience#audience_id": 1,
+    "audience#id": 1
+  },
+  {
+    "member#id": 1,
+    "recommendation#id": 4,
+    "recommendation#member_id": 1,
+    "recommendation#brand_id": 6,
+    "recommendation#product_id": 75,
+    "recommendation#category_id": 4,
+    "recommendation#passion_id": 2,
+    "brand#id": 6,
+    "product#id": 75,
+    "product#brand_id": 6,
+    "category#id": 4,
+    "passion#id": 2,
+    "recommendation_audience#id": 4,
+    "recommendation_audience#recommendation_id": 4,
+    "recommendation_audience#audience_id": 1,
+    "audience#id": 1
+  }
+]