Merge pull request #265 from Chia-Network/feature/organization-subscribe

refactor: datalayer improvements

src/controllers/project.controller.js

@@ -27,6 +27,7 @@ import {
   assertProjectRecordExists,
   assertCsvFileInRequest,
   assertHomeOrgExists,
+  assetNoPendingCommits,
 } from '../utils/data-assertions';
 
 import { createProjectRecordsFromCsv } from '../utils/csv-utils';
@@ -41,6 +42,7 @@ import {
 export const create = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const newRecord = _.cloneDeep(req.body);
     // When creating new projects assign a uuid to is so
@@ -74,14 +76,6 @@ export const create = async (req, res) => {
       }
     });
 
-    // The new project is getting created in this registry
-    newRecord.currentRegistry = orgUid;
-
-    // Unless we are overriding, a new project originates in this org
-    if (!newRecord.registryOfOrigin) {
-      newRecord.registryOfOrigin = orgUid;
-    }
-
     await Staging.create({
       uuid,
       action: 'INSERT',
@@ -178,6 +172,7 @@ export const findOne = async (req, res) => {
 export const updateFromXLS = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const { files } = req;
 
@@ -206,6 +201,7 @@ export const updateFromXLS = async (req, res) => {
 export const update = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    // await assetNoPendingCommits();
 
     const originalRecord = await assertProjectRecordExists(
       req.body.warehouseProjectId,
@@ -241,6 +237,10 @@ export const update = async (req, res) => {
             childRecord.warehouseProjectId = newRecord.warehouseProjectId;
           }
 
+          if (childRecordKey === 'labels' && childRecord.labelUnits) {
+            childRecord.labelUnits.orgUid = orgUid;
+          }
+
           return childRecord;
         });
       }
@@ -273,12 +273,14 @@ export const update = async (req, res) => {
       message: 'Error adding update to stage',
       error: err.message,
     });
+    console.log(err);
   }
 };
 
 export const destroy = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const originalRecord = await assertProjectRecordExists(
       req.body.warehouseProjectId,
@@ -308,6 +310,7 @@ export const destroy = async (req, res) => {
 export const batchUpload = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const csvFile = assertCsvFileInRequest(req);
     await createProjectRecordsFromCsv(csvFile);

src/controllers/staging.controller.js

@@ -4,6 +4,7 @@ import { Staging } from '../models';
 import {
   assertStagingRecordExists,
   assertHomeOrgExists,
+  assetNoPendingCommits,
 } from '../utils/data-assertions';
 
 export const findAll = async (req, res) => {
@@ -39,6 +40,7 @@ export const findAll = async (req, res) => {
 export const commit = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     await Staging.pushToDataLayer();
     res.json({ message: 'Staging Table committed to full node' });

src/controllers/units.controller.js

@@ -18,6 +18,7 @@ import {
   assertSumOfSplitUnitsIsValid,
   assertCsvFileInRequest,
   assertHomeOrgExists,
+  assetNoPendingCommits,
 } from '../utils/data-assertions';
 
 import { createUnitRecordsFromCsv } from '../utils/csv-utils';
@@ -188,6 +189,7 @@ export const findOne = async (req, res) => {
 export const updateFromXLS = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const { files } = req;
 
@@ -213,6 +215,7 @@ export const updateFromXLS = async (req, res) => {
 export const update = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const originalRecord = await assertUnitRecordExists(
       req.body.warehouseUnitId,
@@ -293,6 +296,7 @@ export const update = async (req, res) => {
 export const destroy = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const originalRecord = await assertUnitRecordExists(
       req.body.warehouseUnitId,
@@ -321,6 +325,7 @@ export const destroy = async (req, res) => {
 export const split = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const originalRecord = await assertUnitRecordExists(
       req.body.warehouseUnitId,
@@ -386,6 +391,7 @@ export const split = async (req, res) => {
 export const batchUpload = async (req, res) => {
   try {
     await assertHomeOrgExists();
+    await assetNoPendingCommits();
 
     const csvFile = assertCsvFileInRequest(req);
     await createUnitRecordsFromCsv(csvFile);

src/fullnode/persistance.js

@@ -31,8 +31,10 @@ export const createDataLayerStore = async () => {
 
   const response = await request(Object.assign({}, getBaseOptions(), options));
 
-  if (response.body.id) {
-    return response.body.id;
+  const data = JSON.parse(response);
+
+  if (data.success) {
+    return data.id;
   }
 
   throw new Error('Error creating new datalayer store');
@@ -47,13 +49,15 @@ export const pushChangeListToDataLayer = async (storeId, changelist) => {
     }),
   };
 
-  const response = request(Object.assign({}, getBaseOptions(), options));
+  const response = await request(Object.assign({}, getBaseOptions(), options));
+
+  const data = JSON.parse(response);
 
-  if (response.body) {
-    return response.body;
+  if (data.success) {
+    return data;
   }
 
-  throw new Error('Error updating datalayer store');
+  console.log(options, data);
 };
 
 export const getRoots = async (storeIds) => {
@@ -64,13 +68,19 @@ export const getRoots = async (storeIds) => {
     }),
   };
 
-  const response = request(Object.assign({}, getBaseOptions(), options));
+  const response = await request(Object.assign({}, getBaseOptions(), options));
 
-  if (response.body) {
-    return response.body;
-  }
+  try {
+    const data = JSON.parse(response);
+
+    if (data.success) {
+      return data;
+    }
 
-  return [];
+    return [];
+  } catch (error) {
+    return [];
+  }
 };
 
 export const getRoot = async (storeId) => {
@@ -81,10 +91,18 @@ export const getRoot = async (storeId) => {
     }),
   };
 
-  const response = request(Object.assign({}, getBaseOptions(), options));
+  const response = await request(Object.assign({}, getBaseOptions(), options));
+
+  try {
+    const data = JSON.parse(response);
 
-  if (response.body && response.body.keys_values) {
-    return response.body.keys_values;
+    if (data.success) {
+      return data;
+    }
+
+    return false;
+  } catch (error) {
+    return false;
   }
 };
 
@@ -97,10 +115,14 @@ export const getStoreData = async (storeId) => {
       }),
     };
 
-    const response = request(Object.assign({}, getBaseOptions(), options));
+    const response = await request(
+      Object.assign({}, getBaseOptions(), options),
+    );
+
+    const data = JSON.parse(response);
 
-    if (response.body && response.body.keys_values) {
-      return response.body.keys_values;
+    if (data.success) {
+      return data;
     }
   }
 

src/fullnode/simulator.js

@@ -32,6 +32,7 @@ export const pushChangeListToDataLayer = async (storeId, changeList) => {
 export const getStoreData = async (storeId) => {
   if (storeId) {
     const results = await Simulator.findAll({
+      attributes: ['key', 'value'],
       where: {
         key: { [Op.like]: `${storeId}%` },
       },