fix: circular imports

Chia-Network · Dec 18, 2024 · 8497173 · 8497173
1 parent 3df82e2
commit 8497173
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 43 deletions.
diff --git a/src/controllers/organization.controller.js b/src/controllers/organization.controller.js
@@ -13,7 +13,6 @@ import { getDataModelVersion } from '../utils/helpers';
 
 import { ModelKeys, Audit, Organization, Staging } from '../models';
 import { getOwnedStores, getSubscriptions } from '../datalayer/persistance.js';
-import { scrubOrganizationData } from '../utils/model-utils.js';
 
 export const findAll = async (req, res) => {
   return res.json(await Organization.getOrgsMap());
@@ -222,7 +221,7 @@ export const deleteOrganization = async (req, res) => {
       );
     }
 
-    await scrubOrganizationData(orgUid);
+    await Organization.scrubOrganizationData(orgUid);
 
     if (organization.isHome) {
       return res.json({

diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -9,7 +9,7 @@ import { sequelize } from '../../database';
 
 import datalayer from '../../datalayer';
 import { logger } from '../../config/logger.js';
-import { FileStore, Staging } from '../';
+import { Audit, FileStore, ModelKeys, Staging } from '../';
 import { getDataModelVersion } from '../../utils/helpers';
 import { getConfig } from '../../utils/config-loader';
 const { USE_SIMULATOR, AUTO_SUBSCRIBE_FILESTORE } = getConfig().APP;
@@ -698,6 +698,34 @@ class Organization extends Model {
     }
   }
 
+  /**
+   * removes all records of an organization from all models with an `orgUid` column
+   * @param orgUid
+   */
+  static async scrubOrganizationData(orgUid) {
+    const transaction = await sequelize.transaction();
+    try {
+      for (const model of ModelKeys) {
+        await model.destroy({ where: { orgUid }, transaction });
+      }
+
+      await Staging.truncate();
+      await Organization.destroy({ where: { orgUid }, transaction });
+      await FileStore.destroy({ where: { orgUid }, transaction });
+      await Audit.destroy({ where: { orgUid }, transaction });
+
+      await transaction.commit();
+    } catch (error) {
+      logger.error(
+        `failed to delete all db records for organization ${orgUid}, rolling back changes. Error: ${error.message}`,
+      );
+      await transaction.rollback();
+      throw new Error(
+        `an error occurred while deleting records corresponding to organization ${orgUid}. no changes have been made`,
+      );
+    }
+  }
+
   /**
    * Synchronizes metadata for all subscribed organizations.
    */

diff --git a/src/utils/model-utils.js b/src/utils/model-utils.js
@@ -2,15 +2,6 @@ import { columnsToInclude } from './helpers.js';
 import Sequelize from 'sequelize';
 
 import { Mutex } from 'async-mutex';
-import {
-  Audit,
-  FileStore,
-  ModelKeys,
-  Organization,
-  Staging,
-} from '../models/index.js';
-import { sequelize } from '../database/index.js';
-import { logger } from '../config/logger.js';
 
 export async function waitForSyncRegistriesTransaction() {
   if (processingSyncRegistriesTransactionMutex.isLocked()) {
@@ -42,37 +33,6 @@ export function formatModelAssociationName(model) {
   return `${model.model.name}${model.pluralize ? 's' : ''}`;
 }
 
-/**
- * removes all records of an organization from all models with an `orgUid` column
- * @param orgUid
- */
-export async function scrubOrganizationData(orgUid) {
-  logger.info(
-    `deleting all database entries corresponding to organization ${orgUid}`,
-  );
-  const transaction = await sequelize.transaction();
-  try {
-    for (const model of ModelKeys) {
-      await model.destroy({ where: { orgUid }, transaction });
-    }
-
-    await Staging.truncate();
-    await Organization.destroy({ where: { orgUid }, transaction });
-    await FileStore.destroy({ where: { orgUid }, transaction });
-    await Audit.destroy({ where: { orgUid }, transaction });
-
-    await transaction.commit();
-  } catch (error) {
-    logger.error(
-      `failed to delete all db records for organization ${orgUid}, rolling back changes. Error: ${error.message}`,
-    );
-    await transaction.rollback();
-    throw new Error(
-      `an error occurred while deleting records corresponding to organization ${orgUid}. no changes have been made`,
-    );
-  }
-}
-
 /**
  * Finds the deleted sub-items (e.g. labels)
  * @param updatedItems {Array<Object>} - The projects updated by the user