feat: sync remaining count for organizations

src/controllers/governance.controller.js

@@ -37,10 +37,12 @@ export const isCreated = async (req, res) => {
     if (results) {
       return res.json({
         created: true,
+        success: true,
       });
     } else {
       return res.json({
         created: false,
+        success: true,
       });
     }
   } catch (error) {
@@ -116,6 +118,7 @@ export const createGoveranceBody = async (req, res) => {
     return res.json({
       message:
         'Setting up new Governance Body on this node, this can take a few mins',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -141,6 +144,7 @@ export const setDefaultOrgList = async (req, res) => {
 
     return res.json({
       message: 'Committed this new organization list to the datalayer',
+      success: true,
     });
   } catch (error) {
     console.trace(error);
@@ -167,6 +171,7 @@ export const setPickList = async (req, res) => {
 
     return res.json({
       message: 'Committed this pick list to the datalayer',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -191,6 +196,7 @@ export const setGlossary = async (req, res) => {
 
     return res.json({
       message: 'Committed glossary to the datalayer',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -206,6 +212,7 @@ export const sync = async (req, res) => {
     Governance.sync();
     return res.json({
       message: 'Syncing Governance Body',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({

src/controllers/offer.controller.js

@@ -102,6 +102,7 @@ export const importOfferFile = async (req, res) => {
 
     res.json({
       message: 'Offer has been imported for review.',
+      success: true,
     });
   } catch (error) {
     console.trace(error);
@@ -132,6 +133,7 @@ export const commitImportedOfferFile = async (req, res) => {
     res.json({
       message: 'Offer Accepted.',
       tradeId: response.trade_id,
+      success: true,
     });
 
     await Meta.destroy({

src/controllers/organization.controller.js

@@ -1,3 +1,4 @@
+import { Sequelize } from 'sequelize';
 import { sequelize } from '../database';
 import { Organization } from '../models/organizations';
 
@@ -62,6 +63,7 @@ export const createV2 = async (req, res) => {
       return res.json({
         message: 'Your organization already exists.',
         orgId: myOrganization.orgUid,
+        success: false,
       });
     } else {
       const { name } = req.body;
@@ -81,6 +83,7 @@ export const createV2 = async (req, res) => {
       return res.json({
         message:
           'New organization is currently being created. It can take up to 30 mins. Please do not interrupt this process.',
+        success: true,
       });
     }
   } catch (error) {
@@ -104,13 +107,15 @@ export const create = async (req, res) => {
       return res.json({
         message: 'Your organization already exists.',
         orgId: myOrganization.orgUid,
+        success: false,
       });
     } else {
       const { name, icon } = req.body;
       const dataModelVersion = getDataModelVersion();
 
       return res.json({
         message: 'New organization created successfully.',
+        success: true,
         orgId: await Organization.createHomeOrganization(
           name,
           icon,
@@ -135,13 +140,18 @@ export const resetHomeOrg = async (req, res) => {
     await Promise.all([
       Organization.destroy({ where: { isHome: true } }),
       Staging.destroy({
-        where: {},
+        where: {
+          id: {
+            [Sequelize.Op.ne]: null,
+          },
+        },
         truncate: true,
       }),
     ]);
 
     res.json({
       message: 'Your home organization was reset, please create a new one.',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -162,6 +172,7 @@ export const importOrg = async (req, res) => {
     res.json({
       message:
         'Importing and subscribing organization this can take a few mins.',
+      success: true,
     });
 
     return Organization.importOrganization(orgUid);
@@ -186,6 +197,7 @@ export const importHomeOrg = async (req, res) => {
 
     res.json({
       message: 'Importing home organization.',
+      success: true,
     });
   } catch (error) {
     console.trace(error);
@@ -207,6 +219,7 @@ export const subscribeToOrganization = async (req, res) => {
 
     return res.json({
       message: 'Subscribed to organization',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -242,6 +255,7 @@ export const deleteImportedOrg = async (req, res) => {
     return res.json({
       message:
         'UnSubscribed to organization, you will no longer receive updates.',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -282,6 +296,7 @@ export const unsubscribeToOrganization = async (req, res) => {
     return res.json({
       message:
         'UnSubscribed to organization, you will no longer receive updates.',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -322,6 +337,7 @@ export const resyncOrganization = async (req, res) => {
 
     return res.json({
       message: 'Resyncing organization completed',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -367,6 +383,7 @@ export const addMirror = async (req, res) => {
     await Organization.addMirror(req.body.storeId, req.body.url);
     return res.json({
       message: `Mirror added for ${req.body.storeId}.`,
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -404,6 +421,7 @@ export const removeMirror = async (req, res) => {
     await Organization.removeMirror(req.body.storeId, req.body.coinId);
     return res.json({
       message: `Mirror removed for ${req.body.storeId}.`,
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -418,6 +436,7 @@ export const sync = async (req, res) => {
     Organization.syncOrganizationMeta();
     return res.json({
       message: 'Syncing All Organizations Metadata',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({

src/controllers/project.controller.js

@@ -104,6 +104,7 @@ export const create = async (req, res) => {
     res.json({
       message: 'Project staged successfully',
       uuid,
+      success: true,
     });
   } catch (err) {
     res.status(400).json({
@@ -304,6 +305,7 @@ export const updateFromXLS = async (req, res) => {
 
     res.json({
       message: 'Updates from xlsx added to staging',
+      success: true,
     });
   } catch (error) {
     console.trace(error);
@@ -418,6 +420,7 @@ const update = async (req, res, isTransfer = false) => {
 
     res.json({
       message: 'Project update added to staging',
+      success: true,
     });
   } catch (err) {
     res.status(400).json({
@@ -452,6 +455,7 @@ export const destroy = async (req, res) => {
 
     res.json({
       message: 'Project deleted successfully',
+      success: true,
     });
   } catch (err) {
     res.status(400).json({
@@ -474,6 +478,7 @@ export const batchUpload = async (req, res) => {
     res.json({
       message:
         'CSV processing complete, your records have been added to the staging table.',
+      success: true,
     });
   } catch (error) {
     logger.error('Batch Upload Failed.', error);

src/controllers/staging.controller.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 
+import { Sequelize } from 'sequelize';
 import { Staging } from '../models';
 
 import {
@@ -22,11 +23,13 @@ export const hasPendingTransactions = async (req, res) => {
     res.json({
       confirmed: true,
       message: 'There are no pending transactions',
+      success: true,
     });
   } catch (error) {
     res.json({
       confirmed: false,
       message: 'There are currently pending transactions',
+      success: true,
     });
   }
 };
@@ -102,7 +105,10 @@ export const commit = async (req, res) => {
       _.get(req, 'body.ids', []),
     );
 
-    res.json({ message: 'Staging Table committed to full node' });
+    res.json({
+      message: 'Staging Table committed to full node',
+      success: true,
+    });
   } catch (error) {
     console.trace(error);
     res.status(400).json({
@@ -125,6 +131,7 @@ export const destroy = async (req, res) => {
     });
     res.json({
       message: 'Deleted from stage',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -140,11 +147,16 @@ export const clean = async (req, res) => {
     await assertIfReadOnlyMode();
     await assertHomeOrgExists();
     await Staging.destroy({
-      where: {},
+      where: {
+        id: {
+          [Sequelize.Op.ne]: null,
+        },
+      },
       truncate: true,
     });
     res.json({
       message: 'Staging Data Cleaned',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -193,6 +205,7 @@ export const retryRecrod = async (req, res) => {
     );
     res.json({
       message: 'Staging record re-staged.',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({

src/controllers/units.controller.js

@@ -108,6 +108,7 @@ export const create = async (req, res) => {
     res.json({
       message: 'Unit staged successfully',
       uuid,
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -318,6 +319,7 @@ export const updateFromXLS = async (req, res) => {
 
     res.json({
       message: 'Updates from xlsx added to staging',
+      success: true,
     });
   } catch (error) {
     logger.error('Batch Upload Failed.', error);
@@ -406,6 +408,7 @@ export const update = async (req, res) => {
 
     res.json({
       message: 'Unit update added to staging',
+      success: true,
     });
   } catch (err) {
     res.status(400).json({
@@ -437,6 +440,7 @@ export const destroy = async (req, res) => {
     await Staging.upsert(stagedData);
     res.json({
       message: 'Unit deleted successfully',
+      success: true,
     });
   } catch (err) {
     res.status(400).json({
@@ -524,6 +528,7 @@ export const split = async (req, res) => {
 
     res.json({
       message: 'Unit split successful',
+      success: true,
     });
   } catch (error) {
     res.status(400).json({
@@ -546,6 +551,7 @@ export const batchUpload = async (req, res) => {
     res.json({
       message:
         'CSV processing complete, your records have been added to the staging table.',
+      success: true,
     });
   } catch (error) {
     logger.error('Batch Upload Failed.', error);

src/database/index.js

@@ -18,8 +18,6 @@ const mirrorConfig =
   (process.env.NODE_ENV || 'local') === 'local' ? 'mirror' : 'mirrorTest';
 export const sequelizeMirror = new Sequelize(config[mirrorConfig]);
 
-logger.info('CADT:mirror-database');
-
 const logDebounce = _.debounce(() => {
   console.log('Mirror DB not connected');
   logger.info('Mirror DB not connected');

src/database/migrations/20231020201652-OrgSyncStatus.js

@@ -6,7 +6,7 @@ export default {
       ['organizations'].map((table) => {
         queryInterface.addColumn(table, 'synced', {
           type: Sequelize.BOOLEAN,
-          allowNull: true,
+          allowNull: false,
           defaultValue: false,
         });
       }),

src/database/migrations/20231020214357-OrgSyncRemainingCount.js

@@ -0,0 +1,23 @@
+'use strict';
+
+export default {
+  async up(queryInterface, Sequelize) {
+    await Promise.all(
+      ['organizations'].map((table) => {
+        queryInterface.addColumn(table, 'sync_remaining', {
+          type: Sequelize.INTEGER,
+          allowNull: true,
+          defaultValue: false,
+        });
+      }),
+    );
+  },
+
+  async down(queryInterface) {
+    await Promise.all(
+      ['organizations'].map((table) => {
+        queryInterface.removeColumn(table, 'sync_remaining');
+      }),
+    );
+  },
+};