Merge pull request #54 from Chia-Network/feature/association-perfection

feat: perfect associations, seed association data, eager loading
Chia-Network · Dec 16, 2021 · cef53d1 · cef53d1
2 parents 4dc71a6 + 5c011a2
commit cef53d1
Show file tree

Hide file tree

Showing 26 changed files with 227 additions and 171 deletions.
diff --git a/migrations/20211201194720-create-party.cjs b/migrations/20211201194720-create-party.cjs
@@ -1,4 +1,5 @@
 'use strict';
+
 module.exports = {
   up: async (queryInterface, Sequelize) => {
     await queryInterface.createTable('parties', {
@@ -17,9 +18,6 @@ module.exports = {
       registry: {
         type: Sequelize.STRING,
       },
-      owner: {
-        type: Sequelize.STRING,
-      },
       createdAt: {
         allowNull: false,
         type: Sequelize.DATE,

diff --git a/migrations/20211215213314-qualification-units-junction.cjs b/migrations/20211215213314-qualification-units-junction.cjs
@@ -5,6 +5,8 @@ module.exports = {
     await queryInterface.createTable('qualification_unit', {
       unitId: Sequelize.INTEGER,
       qualificationId: Sequelize.INTEGER,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE,
     });
   },
 

diff --git a/...s/20211215231227-vintage-unit-junction.js → .../20211215231227-vintage-unit-junction.cjs b/...s/20211215231227-vintage-unit-junction.js → .../20211215231227-vintage-unit-junction.cjs
@@ -5,6 +5,8 @@ module.exports = {
     await queryInterface.createTable('vintage_unit', {
       unitId: Sequelize.INTEGER,
       vintageId: Sequelize.INTEGER,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE,
     });
   },
 

diff --git a/seeders/20211209204301-add-projects.cjs b/seeders/20211209204301-add-projects.cjs
@@ -1,9 +1,23 @@
 'use strict';
 const ProjectStub = require('../src/models/projects/projects.stub.json');
+const CoBenifetStub = require('../src/models/co-benefits/co-benefits.stub.json');
+const RelatedProjectStub = require('../src/models/related-projects/related-projects.stub.json');
+const QualificationStub = require('../src/models/qualifications/qualifications.stub.json');
+const RatingsStub = require('../src/models/ratings/ratings.stub.json');
+const VintagesStub = require('../src/models/vintages/vintages.stub.json');
+const LocationsStub = require('../src/models/locations/locations.stub.json');
 
 module.exports = {
-  up: async (queryInterface) =>
-    queryInterface.bulkInsert('projects', ProjectStub, {}),
+  up: async (queryInterface) => {
+    await queryInterface.bulkInsert('projects', ProjectStub, {});
+    await queryInterface.bulkInsert('coBenefits', CoBenifetStub, {});
+    await queryInterface.bulkInsert('relatedProjects', RelatedProjectStub, {});
+    await queryInterface.bulkInsert('qualifications', QualificationStub, {});
+    await queryInterface.bulkInsert('projectRatings', RatingsStub, {});
+    await queryInterface.bulkInsert('vintages', VintagesStub, {});
+    await queryInterface.bulkInsert('projectLocations', LocationsStub, {});
+  },
+
   down: async (queryInterface) => {
     await queryInterface.bulkDelete('projects');
   },

diff --git a/seeders/20211209205139-add-units.cjs b/seeders/20211209205139-add-units.cjs
@@ -1,10 +1,22 @@
 'use strict';
 const UnitStub = require('../src/models/units/units.stub.json');
-
+const JunctionStub = [
+  {
+    unitId: 1,
+    qualificationId: 1,
+  },
+  {
+    unitId: 1,
+    qualificationId: 2,
+  },
+];
 module.exports = {
-  up: async (queryInterface) =>
-    queryInterface.bulkInsert('Units', UnitStub, {}),
+  up: async (queryInterface) => {
+    await queryInterface.bulkInsert('units', UnitStub, {});
+    await queryInterface.bulkInsert('qualification_unit', JunctionStub, {});
+  },
+
   down: async (queryInterface) => {
-    await queryInterface.bulkDelete('Units');
+    await queryInterface.bulkDelete('units');
   },
 };
diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js
@@ -33,7 +33,13 @@ export const findAll = async (req, res) => {
 
   res.json(
     await Unit.findAll({
-      include: [Qualification, Vintage],
+      include: [
+        {
+          model: Qualification,
+          as: 'qualification',
+        },
+        Vintage,
+      ],
     }),
   );
 };

diff --git a/src/models/co-benefits/co-benefits.stub.json b/src/models/co-benefits/co-benefits.stub.json
@@ -1,17 +1,22 @@
 [
   {
-    "cobenefit": "TEST_COBENEFIT_1"
+    "benefit": "TEST_COBENEFIT_1",
+    "projectId": 1
   },
   {
-    "cobenefit": "TEST_COBENEFIT_2"
+    "benefit": "TEST_COBENEFIT_2",
+    "projectId": 1
   },
   {
-    "cobenefit": "TEST_COBENEFIT_3"
+    "benefit": "TEST_COBENEFIT_3",
+    "projectId": 1
   },
   {
-    "cobenefit": "TEST_COBENEFIT_4"
+    "benefit": "TEST_COBENEFIT_4",
+    "projectId": 1
   },
   {
-    "cobenefit": "TEST_COBENEFIT_5"
+    "benefit": "TEST_COBENEFIT_5",
+    "projectId": 1
   }
 ]
diff --git a/src/models/co-benefits/co-benifets.modeltypes.cjs b/src/models/co-benefits/co-benifets.modeltypes.cjs
@@ -2,13 +2,13 @@ const Sequelize = require('sequelize');
 
 module.exports = {
   id: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     primaryKey: true,
+    autoIncrement: true,
   },
   benefit: Sequelize.STRING,
-  owner: Sequelize.STRING,
   projectId: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     onDelete: 'CASCADE',
   },
   createdAt: Sequelize.DATE,

diff --git a/src/models/locations/locations.modeltypes.cjs b/src/models/locations/locations.modeltypes.cjs
@@ -2,14 +2,14 @@ const Sequelize = require('sequelize');
 
 module.exports = {
   id: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     primaryKey: true,
+    autoIncrement: true,
   },
   countryRegion: Sequelize.STRING,
   country: Sequelize.STRING,
-  owner: Sequelize.STRING,
   projectId: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     onDelete: 'CASCADE',
   },
   createdAt: Sequelize.DATE,

diff --git a/src/models/locations/locations.stub.json b/src/models/locations/locations.stub.json
@@ -1,22 +1,22 @@
 [
   {
-    "in_country_region": true,
-    "host_country": "United States"
+    "countryRegion": "United States",
+    "projectId": 1
   },
   {
-    "in_country_region": true,
-    "host_country": "United States"
+    "countryRegion": "United States",
+    "projectId": 1
   },
   {
-    "in_country_region": false,
-    "host_country": "China"
+    "countryRegion": "China",
+    "projectId": 2
   },
   {
-    "in_country_region": false,
-    "host_country": "Russia"
+    "countryRegion": "Russia",
+    "projectId": 2
   },
   {
-    "in_country_region": true,
-    "host_country": "United States"
+    "countryRegion": "United States",
+    "projectId": 2
   }
 ]
diff --git a/src/models/projects/projects.model.js b/src/models/projects/projects.model.js
@@ -57,7 +57,6 @@ class Project extends Model {
                     validationApproach MATCH ":search" OR
                     projectTag MATCH ":search" OR
                     estimatedAnnualAverageEmissionReduction MATCH ":search" OR
-                    owner MATCH ":search"
                     ORDER BY rank DESC`;
 
     return sequelize.query(sql, {

diff --git a/src/models/projects/projects.modeltypes.cjs b/src/models/projects/projects.modeltypes.cjs
@@ -2,8 +2,9 @@ const Sequelize = require('sequelize');
 
 module.exports = {
   id: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     primaryKey: true,
+    autoIncrement: true,
   },
   warehouseProjectId: Sequelize.STRING,
   projectID: Sequelize.STRING,
@@ -28,7 +29,6 @@ module.exports = {
   validationDate: Sequelize.DATE,
   projectTag: Sequelize.STRING,
   estimatedAnnualAverageEmissionReduction: Sequelize.STRING,
-  owner: Sequelize.STRING,
   createdAt: Sequelize.DATE,
   updatedAt: Sequelize.DATE,
 };
diff --git a/src/models/qualifications/qualifications.model.js b/src/models/qualifications/qualifications.model.js
@@ -17,7 +17,7 @@ class Qualification extends Model {
     // https://gist.github.com/elliette/20ddc4e827efd9d62bc98752e7a62610#some-important-addendums
     Qualification.belongsToMany(Unit, {
       through: 'qualification_unit',
-      as: 'qualification',
+      as: 'unit',
     });
   }
 }

diff --git a/src/models/qualifications/qualifications.modeltypes.cjs b/src/models/qualifications/qualifications.modeltypes.cjs
@@ -2,19 +2,18 @@ const Sequelize = require('sequelize');
 
 module.exports = {
   id: {
-    allowNull: false,
     autoIncrement: true,
     primaryKey: true,
     type: Sequelize.INTEGER,
   },
-  qualificationId: Sequelize.NUMBER,
+  qualificationId: Sequelize.INTEGER,
   qualificationLink: Sequelize.STRING,
-  projectId: Sequelize.NUMBER,
+  projectId: Sequelize.INTEGER,
   type: Sequelize.STRING,
   label: Sequelize.STRING,
   creditingPeriodStartDate: Sequelize.DATE,
   creditingPeriodEndDate: Sequelize.DATE,
-  unitId: Sequelize.NUMBER,
+  unitId: Sequelize.INTEGER,
   createdAt: Sequelize.DATE,
   updatedAt: Sequelize.DATE,
 };
diff --git a/src/models/qualifications/qualifications.stub.json b/src/models/qualifications/qualifications.stub.json
@@ -1,14 +1,12 @@
 [
   {
     "id": "1",
-    "projectId": 1,
+    "projectId": 2,
     "type": "basic type",
     "label": "qualification 1",
     "creditingPeriodStartDate": "2011-10-05T14:48:00.000Z",
     "creditingPeriodEndDate": "2022-10-05T14:48:00.000Z",
-    "validityStartDate": "2011-11-05T14:41:00.000Z",
-    "validityEndDate": "2022-11-05T14:41:00.000Z",
-    "unitQuantity": 1,
+    "unitId": 1,
     "qualificationLink": "https://qualification.link/1"
   },
   {
@@ -18,45 +16,30 @@
     "label": "qualification 2",
     "creditingPeriodStartDate": "2011-10-05T14:48:00.000Z",
     "creditingPeriodEndDate": "2022-10-05T14:48:00.000Z",
-    "validityStartDate": "2011-11-05T14:41:00.000Z",
-    "validityEndDate": "2022-11-05T14:41:00.000Z",
-    "unitQuantity": 1,
     "qualificationLink": "https://qualification.link/2"
   },
   {
     "id": "3",
-    "projectId": 1,
     "type": "basic type",
     "label": "qualification 3",
     "creditingPeriodStartDate": "2010-10-05T14:48:00.000Z",
     "creditingPeriodEndDate": "2022-10-05T14:48:00.000Z",
-    "validityStartDate": "2011-10-05T14:41:00.000Z",
-    "validityEndDate": "2021-11-05T14:41:00.000Z",
-    "unitQuantity": 10,
     "qualificationLink": "https://qualification.link/3"
   },
   {
     "id": "4",
-    "projectId": 1,
     "type": "basic type",
     "label": "qualification 4",
     "creditingPeriodStartDate": "2011-10-05T14:48:00.000Z",
     "creditingPeriodEndDate": "2022-10-05T14:48:00.000Z",
-    "validityStartDate": "2011-11-05T14:41:00.000Z",
-    "validityEndDate": "2022-11-05T14:41:00.000Z",
-    "unitQuantity": 1,
     "qualificationLink": "https://qualification.link/4"
   },
   {
     "id": "5",
-    "projectId": 1,
     "type": "basic type",
     "label": "qualification 5",
     "creditingPeriodStartDate": "2010-10-05T14:48:00.000Z",
     "creditingPeriodEndDate": "2021-10-05T14:48:00.000Z",
-    "validityStartDate": "2010-11-05T14:41:00.000Z",
-    "validityEndDate": "2021-11-05T14:41:00.000Z",
-    "unitQuantity": 5,
     "qualificationLink": "https://qualification.link/5"
   }
 ]
diff --git a/src/models/ratings/ratings.modeltypes.cjs b/src/models/ratings/ratings.modeltypes.cjs
@@ -2,15 +2,16 @@ const Sequelize = require('sequelize');
 
 module.exports = {
   id: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     primaryKey: true,
+    autoIncrement: true,
   },
-  ratingType: Sequelize.STRING,
+  type: Sequelize.STRING,
   rating: Sequelize.NUMBER,
   link: Sequelize.STRING,
   scale: Sequelize.STRING,
   projectId: {
-    type: Sequelize.NUMBER,
+    type: Sequelize.INTEGER,
     onDelete: 'CASCADE',
   },
   createdAt: Sequelize.DATE,