fix: revert accidental importOrganization edit that referenced undefined helper

TheLastCicada · TheLastCicada · commit fe4e5912ea48 · 2026-04-23T15:02:35.000-07:00
Bugbot flagged a High Severity ReferenceError in my previous commit 9cf6cb7: stale refactor code sitting in my worktree from an earlier exploration of a `subscribeOrSkip` helper got swept into `git add -A` and landed in the Organization.importOrganization method. The helper was never defined, never imported, and never exported — so the commit compiled but would crash at runtime with `ReferenceError: subscribeOrSkip is not defined` on the first non-simulator-mode call to importOrganization. importOrganization is out of scope for this PR; its improvements live in #1603. Revert that function's "Subscribe to the org store first, then check sync status" block to match origin/v2-rc2 verbatim. All intentional #1600 changes (reconcileOrganization + skipOnUnsynced, governance sync, task intervals, tests) are untouched. Verified by `git diff origin/v2-rc2 -- src/models/organizations/organizations.model.js` now showing only reconcileOrganization changes.
diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -1024,20 +1024,16 @@ class Organization extends Model {
    * @returns {Promise<void>}
    */
   static async importOrganization(orgUid, isHome = false) {
-    // Subscribe-first, then check sync status. This ensures new org stores
-    // get subscribed on the first pass so they can begin syncing, and
-    // subsequent runs will find them synced and proceed.
+    // Subscribe to the org store first, then check sync status.
+    // This ensures new org stores get subscribed on the first pass so they can
+    // begin syncing, and subsequent runs will find them synced and proceed.
     if (!USE_SIMULATOR) {
-      if (
-        !(await subscribeOrSkip({
-          datalayer,
-          storeId: orgUid,
-          logger,
-          prefix: '[v1]: importOrganization',
-          label: 'org',
-          action: 'import',
-        }))
-      ) {
+      try {
+        await datalayer.subscribeToStoreOnDataLayer(orgUid);
+      } catch (error) {
+        logger.warn(
+          `[v1]: Could not subscribe to store for ${orgUid}, skipping import: ${error.message}`,
+        );
         return;
       }
 
