feat: datalayer organization setup

Chia-Network · Jan 24, 2022 · 6150001 · 6150001
1 parent 413ea37
commit 6150001
Show file tree

Hide file tree

Showing 39 changed files with 854 additions and 357 deletions.
diff --git a/migrations/20220122141750-create-simulator-table.cjs b/migrations/20220122141750-create-simulator-table.cjs
@@ -0,0 +1,13 @@
+'use strict';
+
+const modelTypes = require('../src/models/simulator/simulator.modeltypes.cjs');
+
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.createTable('simulator', modelTypes);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable('simulator');
+  },
+};
diff --git a/migrations/20220122164836-create-organizatin-tablec.js b/migrations/20220122164836-create-organizatin-tablec.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const modelTypes = require('../src/models/organizations/organizations.modeltypes.cjs');
+
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.createTable('organizations', modelTypes);
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable('organizations');
+  },
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "joi": "^17.5.0",
     "lodash": "^4.17.21",
     "mysql2": "^2.3.3",
+    "random-hash": "^4.0.1",
     "request-promise": "^4.2.6",
     "rxjs": "^7.5.1",
     "sequelize": "^6.12.0-alpha.1",

diff --git a/seeders/20220121232631-add-test-organization.cjs b/seeders/20220121232631-add-test-organization.cjs
@@ -0,0 +1,26 @@
+'use strict';
+const dotenv = require('dotenv');
+dotenv.config();
+
+const metaStub = [
+  {
+    metaKey: 'organizationId',
+    metaValue: 'f1c54511-865e-4611-976c-7c3c1f704662',
+  },
+  {
+    metaKey: 'organizationName',
+    metaValue: 'Demo Org',
+  },
+];
+
+module.exports = {
+  up: async (queryInterface) => {
+    if (process.env.USE_SIMULATOR === 'true') {
+      await queryInterface.bulkInsert('meta', metaStub, {});
+    }
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.bulkDelete('meta');
+  },
+};
diff --git a/src/controllers/organization.controller.js b/src/controllers/organization.controller.js
@@ -1,13 +1,16 @@
 import { Organization } from '../models/organizations';
-import { updateOrganization } from '../fullnode/dataLayerService';
+
 export const findAll = async (req, res) => {
   return res.json(await Organization.getOrgsMap());
 };
 
 export const create = async (req, res) => {
-  const { name, icon, website } = req.body;
+  const { name, icon } = req.body;
   return res.json({
     message: 'New organization created successfully.',
-    orgId: await updateOrganization(name, icon, website),
+    orgId: await Organization.createHomeOrganization(name, icon, 'v1'),
   });
 };
+
+// eslint-disable-next-line
+export const importOrg = async (req, res) => {};
diff --git a/src/controllers/staging.controller.js b/src/controllers/staging.controller.js
@@ -1,12 +1,7 @@
 import _ from 'lodash';
-import * as fullNode from '../fullnode';
 
 import { Staging, Project, Unit } from '../models';
-import {
-  assertStagingRecordExists,
-  assertUnitRecordExists,
-  assertProjectRecordExists,
-} from '../utils/data-assertions';
+import { assertStagingRecordExists } from '../utils/data-assertions';
 
 export const findAll = async (req, res) => {
   try {
@@ -76,69 +71,15 @@ export const findAll = async (req, res) => {
 
 export const commit = async (req, res) => {
   try {
-    const queryResponses = await Staging.findAll();
-
-    await Promise.all(
-      queryResponses.map(async (queryResponse) => {
-        const stagingRecord = queryResponse.dataValues;
-
-        const {
-          id: stagingRecordId,
-          uuid,
-          table,
-          action,
-          commited,
-          data: rawData,
-        } = stagingRecord;
-        let data = JSON.parse(rawData);
-
-        if (table === 'Projects' && !commited) {
-          const customAssertionMessage = `The project record for the warehouseProjectId: ${uuid} does not exist. Please remove ${uuid} from the staging table and try to commit again.`;
-          switch (action) {
-            case 'INSERT':
-              data.warehouseUnitId = uuid;
-              fullNode.createProjectRecord(uuid, data, stagingRecordId);
-              break;
-            case 'UPDATE':
-              await assertProjectRecordExists(uuid, customAssertionMessage);
-              fullNode.updateProjectRecord(uuid, data, stagingRecordId);
-              break;
-            case 'DELETE':
-              await assertProjectRecordExists(uuid, customAssertionMessage);
-              fullNode.deleteProjectRecord(uuid, stagingRecordId);
-              break;
-          }
-        } else if (table === 'Units' && !commited) {
-          const customAssertionMessage = `The unit record for the warehouseUnitId: ${uuid} does not exist. Please remove ${uuid} from the staging table and try to commit again.`;
-          switch (action) {
-            case 'INSERT':
-              fullNode.createUnitRecord(uuid, data, stagingRecordId);
-              break;
-            case 'UPDATE':
-              await assertUnitRecordExists(uuid, customAssertionMessage);
-              fullNode.updateUnitRecord(uuid, data, stagingRecordId);
-              break;
-            case 'DELETE':
-              await assertUnitRecordExists(uuid, customAssertionMessage);
-              fullNode.deleteUnitRecord(uuid, stagingRecordId);
-              break;
-          }
-        }
-
-        // set the commited flag to true
-        await Staging.update(
-          { commited: true },
-          { where: { id: stagingRecordId } },
-        );
-      }),
-    );
-
+    await Staging.pushToDataLayer();
     res.json({ message: 'Staging Table committed to full node' });
   } catch (error) {
     res.status(400).json({
       message: 'Error commiting staging table',
       error: error.message,
     });
+
+    console.trace(error);
   }
 };
 
@@ -176,135 +117,3 @@ export const clean = async (req, res) => {
     });
   }
 };
-
-export const commitV2 = async (req, res) => {
-  try {
-    const queryResponses = await Staging.findAll();
-
-    const changeList = [];
-
-    await Promise.all(
-      queryResponses.map(async (queryResponse) => {
-        const stagingRecord = queryResponse.dataValues;
-
-        const {
-          id: stagingRecordId,
-          uuid,
-          table,
-          action,
-          commited,
-          data: rawData,
-        } = stagingRecord;
-        let data = JSON.parse(rawData);
-
-        if (table === 'Projects' && !commited) {
-          const customAssertionMessage = `The project record for the warehouseProjectId: ${uuid} does not exist. Please remove ${uuid} from the staging table and try to commit again.`;
-          const projectRecord = _.omit(data, 'qualifications', 'vintages');
-          // const qualificationsRecords = data.qualifications;
-          // const vintageRecords = data.vintages;
-
-          console.log('!@@');
-
-          switch (action) {
-            case 'INSERT':
-              data.warehouseProjectId = uuid;
-
-              changeList.push([
-                {
-                  action: 'delete',
-                  key: new Buffer(`project_${uuid}`).toString('hex'),
-                },
-                {
-                  action: 'insert',
-                  key: new Buffer(`project_${uuid}`).toString('hex'),
-                  value: new Buffer(JSON.stringify(projectRecord)).toString(
-                    'hex',
-                  ),
-                },
-              ]);
-              break;
-            case 'UPDATE':
-              await assertProjectRecordExists(uuid, customAssertionMessage);
-              changeList.push([
-                {
-                  action: 'delete',
-                  key: new Buffer(`project_${uuid}`).toString('hex'),
-                },
-                {
-                  action: 'insert',
-                  key: new Buffer(`project_${uuid}`).toString('hex'),
-                  value: new Buffer(JSON.stringify(data)).toString('hex'),
-                },
-              ]);
-              break;
-            case 'DELETE':
-              await assertProjectRecordExists(uuid, customAssertionMessage);
-              changeList.push([
-                {
-                  action: 'delete',
-                  key: new Buffer(`project_${uuid}`).toString('hex'),
-                },
-              ]);
-              break;
-          }
-        } else if (table === 'Units' && !commited) {
-          const customAssertionMessage = `The unit record for the warehouseUnitId: ${uuid} does not exist. Please remove ${uuid} from the staging table and try to commit again.`;
-          const unitRecord = _.omit(data, 'qualifications', 'vintage');
-          switch (action) {
-            case 'INSERT':
-              changeList.push({
-                action: 'delete',
-                key: new Buffer(`unit_${uuid}`).toString('hex'),
-              });
-              changeList.push({
-                action: 'insert',
-                key: new Buffer(`unit_${uuid}`).toString('hex'),
-                value: new Buffer(JSON.stringify(unitRecord)).toString('hex'),
-              });
-
-              break;
-            case 'UPDATE':
-              await assertUnitRecordExists(uuid, customAssertionMessage);
-              changeList.push([
-                {
-                  action: 'delete',
-                  key: new Buffer(`unit_${uuid}`).toString('hex'),
-                },
-                {
-                  action: 'insert',
-                  key: new Buffer(`unit_${uuid}`).toString('hex'),
-                  value: new Buffer(JSON.stringify(unitRecord)).toString('hex'),
-                },
-              ]);
-              break;
-            case 'DELETE':
-              await assertUnitRecordExists(uuid, customAssertionMessage);
-              changeList.push([
-                {
-                  action: 'delete',
-                  key: new Buffer(`unit_${uuid}`).toString('hex'),
-                },
-              ]);
-              break;
-          }
-        }
-
-        // set the commited flag to true
-        await Staging.update(
-          { commited: true },
-          { where: { id: stagingRecordId } },
-        );
-      }),
-    );
-
-    console.log(changeList);
-    await fullNode.pushChangeListToRegistryTable('units', changeList);
-
-    res.json({ message: 'Staging Table committed to full node' });
-  } catch (error) {
-    res.status(400).json({
-      message: 'Error commiting staging table',
-      error: error.message,
-    });
-  }
-};
diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js
@@ -36,7 +36,7 @@ export const create = async (req, res) => {
     newRecord.warehouseUnitId = uuid;
 
     // All new units are assigned to the home orgUid
-    const orgUid = _.head(Object.keys(await Organization.getHomeOrg()));
+    const { orgUid } = await Organization.getHomeOrg();
     newRecord.orgUid = orgUid;
     newRecord.unitOwnerOrgUid = orgUid;
 

diff --git a/src/fullnode/data-layer-utils.js b/src/fullnode/data-layer-utils.js
@@ -0,0 +1,28 @@
+export const changeListFactory = (action, id, record) => {
+  console.log({ action, id, record });
+  switch (action) {
+    case 'INSERT':
+      return {
+        action: 'insert',
+        key: Buffer.from(id).toString('hex'),
+        value: Buffer.from(JSON.stringify(record)).toString('hex'),
+      };
+    case 'UPDATE':
+      return [
+        {
+          action: 'delete',
+          key: Buffer.from(id).toString('hex'),
+        },
+        {
+          action: 'insert',
+          key: Buffer.from(id).toString('hex'),
+          value: Buffer.from(JSON.stringify(record)).toString('hex'),
+        },
+      ];
+    case 'DELETE':
+      return {
+        action: 'delete',
+        key: Buffer.from(id).toString('hex'),
+      };
+  }
+};