feat: controller resolves all relationships in response

Chia-Network · Dec 14, 2021 · f0b819c · f0b819c
1 parent d41dbb9
commit f0b819c
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 34 deletions.
diff --git a/migrations/20211201194416-create-qualification.cjs b/migrations/20211201194416-create-qualification.cjs
@@ -6,49 +6,55 @@ module.exports = {
         allowNull: false,
         autoIncrement: true,
         primaryKey: true,
-        type: Sequelize.INTEGER
+        type: Sequelize.INTEGER,
       },
       projectId: {
-        type: Sequelize.NUMBER
+        type: Sequelize.NUMBER,
+      },
+      qualificationId: {
+        type: Sequelize.NUMBER,
+      },
+      qualificationLink: {
+        type: Sequelize.STRING,
       },
       type: {
-        type: Sequelize.STRING
+        type: Sequelize.STRING,
       },
       label: {
-        type: Sequelize.STRING
+        type: Sequelize.STRING,
       },
       creditingPeriodStartDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       creditingPeriodEndDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       validityStartDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       validityEndDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       unitQuantity: {
-        type: Sequelize.NUMBER
+        type: Sequelize.NUMBER,
       },
       owner: {
-        type: Sequelize.STRING
+        type: Sequelize.STRING,
       },
       unitId: {
-        type: Sequelize.NUMBER
+        type: Sequelize.NUMBER,
       },
       createdAt: {
         allowNull: false,
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       updatedAt: {
         allowNull: false,
-        type: Sequelize.DATE
-      }
+        type: Sequelize.DATE,
+      },
     });
   },
   down: async (queryInterface, Sequelize) => {
     await queryInterface.dropTable('Qualifications');
-  }
-};
+  },
+};
diff --git a/migrations/20211201194541-create-vintage.cjs b/migrations/20211201194541-create-vintage.cjs
@@ -6,40 +6,43 @@ module.exports = {
         allowNull: false,
         autoIncrement: true,
         primaryKey: true,
-        type: Sequelize.INTEGER
+        type: Sequelize.INTEGER,
       },
       startDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       endDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       verificationApproach: {
-        type: Sequelize.STRING
+        type: Sequelize.STRING,
       },
       verificationDate: {
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       verificationBody: {
-        type: Sequelize.STRING
+        type: Sequelize.STRING,
       },
       owner: {
-        type: Sequelize.STRING
+        type: Sequelize.STRING,
       },
       projectId: {
-        type: Sequelize.NUMBER
+        type: Sequelize.NUMBER,
+      },
+      UnitId: {
+        type: Sequelize.NUMBER,
       },
       createdAt: {
         allowNull: false,
-        type: Sequelize.DATE
+        type: Sequelize.DATE,
       },
       updatedAt: {
         allowNull: false,
-        type: Sequelize.DATE
-      }
+        type: Sequelize.DATE,
+      },
     });
   },
   down: async (queryInterface, Sequelize) => {
     await queryInterface.dropTable('Vintages');
-  }
-};
+  },
+};
diff --git a/src/controllers/project.controller.js b/src/controllers/project.controller.js
@@ -1,5 +1,14 @@
 import { uuid as uuidv4 } from 'uuidv4';
-import { Staging, ProjectMock, Project } from '../models';
+import {
+  Staging,
+  ProjectMock,
+  Project,
+  ProjectLocation,
+  Qualification,
+  Vintage,
+  CoBenefit,
+  RelatedProject,
+} from '../models';
 
 export const create = async (req, res) => {
   // When creating new projects assign a uuid to is so
@@ -25,7 +34,17 @@ export const findAll = async (req, res) => {
     return;
   }
 
-  res.json(await Project.findAll());
+  res.json(
+    await Project.findAll({
+      include: [
+        ProjectLocation,
+        Qualification,
+        Vintage,
+        CoBenefit,
+        RelatedProject,
+      ],
+    }),
+  );
 };
 
 export const findOne = (req, res) => {

diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js
@@ -1,5 +1,5 @@
 import { uuid as uuidv4 } from 'uuidv4';
-import { Staging, UnitMock, Unit } from '../models';
+import { Staging, UnitMock, Unit, Qualification, Vintage } from '../models';
 
 export const create = (req, res) => {
   // When creating new projects assign a uuid to is so
@@ -31,7 +31,11 @@ export const findAll = async (req, res) => {
     return;
   }
 
-  res.json(await Unit.findAll());
+  res.json(
+    await Unit.findAll({
+      include: [Qualification, Vintage],
+    }),
+  );
 };
 
 export const findOne = (req, res) => {

diff --git a/src/models/qualifications/qualifications.model.js b/src/models/qualifications/qualifications.model.js
@@ -20,6 +20,9 @@ Qualification.init(
       primaryKey: true,
       type: Sequelize.INTEGER,
     },
+    qualificationId: {
+      type: Sequelize.NUMBER,
+    },
     qualificationLink: {
       type: Sequelize.STRING,
     },

diff --git a/src/models/units/units.model.js b/src/models/units/units.model.js
@@ -2,11 +2,13 @@
 import Sequelize from 'sequelize';
 const { Model } = Sequelize;
 import { sequelize } from '../database';
-import { Project } from '../projects/index';
+import { Project, Qualification, Vintage } from '../../models';
 
 class Unit extends Model {
   static associate() {
     Unit.belongsTo(Project);
+    Unit.hasMany(Qualification);
+    Unit.hasMany(Vintage);
   }
 }
 

diff --git a/src/models/vintages/vintages.model.js b/src/models/vintages/vintages.model.js
@@ -25,6 +25,7 @@ Vintage.init(
     projectId: Sequelize.NUMBER,
     createdAt: Sequelize.DATE,
     updatedAt: Sequelize.DATE,
+    UnitId: Sequelize.NUMBER,
   },
   {
     sequelize,