Merge branch 'develop' into feat/fts

Chia-Network · Dec 15, 2021 · fe0b754 · fe0b754
2 parents e787862 + f3f81e9
commit fe0b754
Show file tree

Hide file tree

Showing 12 changed files with 199 additions and 35 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,6 +1,14 @@
 import { uuid as uuidv4 } from 'uuidv4';
-import { Staging, ProjectMock, Project } from '../models';
-import { sequelize } from "../models/database.js";
+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
@@ -36,7 +44,15 @@ export const findAll = async (req, res) => {
     }
 
   } else {
-    res.json(await Project.findAll());
+    res.json(await Project.findAll({
+      include: [
+        ProjectLocation,
+        Qualification,
+        Vintage,
+        CoBenefit,
+        RelatedProject,
+      ],
+    }));
   }
 
 };

diff --git a/src/controllers/staging.controller.js b/src/controllers/staging.controller.js
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import * as fullNode from '../fullnode;';
 import { Staging, StagingMock, Project, Unit } from '../models';
 
 export const findAll = async (req, res) => {
@@ -50,6 +51,42 @@ export const findAll = async (req, res) => {
   res.json(response);
 };
 
+export const commit = async (req, res) => {
+  const queryResponse = await Staging.findAll();
+  const stagingRecords = queryResponse.dataValues;
+  stagingRecords.forEach(async (stagingRecord) => {
+    const { uuid, table, action, data: rawData } = stagingRecord;
+    const data = JSON.parse(rawData);
+
+    if (table === 'Projects') {
+      switch (action) {
+        case 'INSERT':
+          fullNode.createProjectRecord(uuid, data);
+          break;
+        case 'UPDATE':
+          fullNode.updateProjectRecord(uuid, data);
+          break;
+        case 'DELETE':
+          fullNode.deleteProjectRecord(uuid);
+          break;
+      }
+    } else if (table === 'Unit') {
+      switch (action) {
+        case 'INSERT':
+          fullNode.createUnitRecord(uuid, data);
+          break;
+        case 'UPDATE':
+          fullNode.updateUnitRecord(uuid, data);
+          break;
+        case 'DELETE':
+          fullNode.deleteUnitRecord(uuid);
+          break;
+      }
+    }
+  });
+  res.json({ message: 'Not implemented' });
+};
+
 export const destroy = (req, res) => {
   Staging.destroy({
     where: {

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/fullnode/fullnode.js b/src/fullnode/fullnode.js
@@ -0,0 +1,25 @@
+import * as simulator from './simulator';
+
+export const updateProjectRecord = async (uuid, record) => {
+  await simulator.updateProjectRecord(uuid, record);
+};
+
+export const createProjectRecord = async (uuid, record) => {
+  await simulator.createProjectRecord(uuid, record);
+};
+
+export const deleteProjectRecord = async (uuid) => {
+  await simulator.deleteProjectRecord(uuid);
+};
+
+export const updateUnitRecord = async (uuid, record) => {
+  await simulator.updateUnitRecord(uuid, record);
+};
+
+export const createUnitRecord = async (uuid, record) => {
+  await simulator.createUnitRecord(uuid, record);
+};
+
+export const deleteUnitRecord = async (uuid) => {
+  await simulator.deleteUnitRecord(uuid);
+};
diff --git a/src/fullnode/index.js b/src/fullnode/index.js
@@ -0,0 +1 @@
+export * from './fullnode';
diff --git a/src/fullnode/simulator.js b/src/fullnode/simulator.js
@@ -0,0 +1,64 @@
+import { Project, Unit } from '../models';
+const THIRTY_SEC = 30000;
+
+// Simulate 30 seconds passing before commited to node
+
+export const updateProjectRecord = async (uuid, record) => {
+  await deleteProjectRecord(uuid);
+  await createProjectRecord(uuid, record);
+};
+
+export const createProjectRecord = (uuid, record) => {
+  return new Promise(async (resolve) => {
+    setTimeout(() => {
+      await Project.create({
+        ...record,
+        warehouseProjectId: uuid,
+      });
+      resolve();
+    }, THIRTY_SEC);
+  });
+};
+
+export const deleteProjectRecord = (uuid) => {
+  return new Promise(async (resolve) => {
+    setTimeout(() => {
+      await Project.destroy({
+        where: {
+          warehouseProjectId: uuid,
+        },
+      });
+      resolve();
+    }, THIRTY_SEC);
+  });
+};
+
+export const updateUnitRecord = async (uuid, record) => {
+  await deleteUnitRecord(uuid);
+  await createUnitRecord(uuid, record);
+};
+
+export const createUnitRecord = (uuid, record) => {
+  return new Promise(async (resolve) => {
+    setTimeout(() => {
+      await Unit.create({
+        uuid,
+        ...record,
+      });
+      resolve();
+    }, THIRTY_SEC);
+  });
+};
+
+export const deleteUnitRecord = (uuid) => {
+  return new Promise(async (resolve) => {
+    setTimeout(() => {
+      await Unit.destroy({
+        where: {
+          uuid,
+        },
+      });
+      resolve();
+    }, THIRTY_SEC);
+  });
+};
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,

diff --git a/src/routes/v1/resources/stagings.js b/src/routes/v1/resources/stagings.js
@@ -22,4 +22,6 @@ StagingRouter.delete(
   StagingController.destroy,
 );
 
+StagingRouter.post('/commit', StagingController.commit);
+
 export { StagingRouter };