abmp-npm 2.0.64 → 2.0.66

package/backend/consts.js

@@ -1,5 +1,5 @@
 const PAC_API_URL = 'https://members.abmp.com/eweb/api/Wix';
-const TEST_PAC_API_URL = 'https://members.abmp.com/nfpactest/eweb/api/Wix';
+const TEST_PAC_API_URL = 'https://members-test.abmp.com/eweb/api/Wix';
 const BACKUP_API_URL = 'https://psdevteamenterpris.wixstudio.com/abmp-backup/_functions';
 const SSO_TOKEN_AUTH_API_URL = 'https://members.professionalassistcorp.com/';
 

package/backend/jobs.js

@@ -2,6 +2,7 @@ const { taskManager } = require('psdev-task-manager');
 
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { TASKS_NAMES } = require('./tasks/consts');
+const { dailyPullExecutionCheck } = require('./tasks/daily-pull-check-methods');
 const { TASKS } = require('./tasks/tasks-configs');
 
 async function runScheduledTasks() {
@@ -96,6 +97,16 @@ async function scheduleFixUrlsWithSpacesTask() {
   }
 }
 
+async function runDailyPullExecutionCheck() {
+  try {
+    console.log('runDailyPullExecutionCheck started!');
+    return await dailyPullExecutionCheck({});
+  } catch (error) {
+    console.error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
+    throw new Error(`Failed to runDailyPullExecutionCheck: ${error.message}`);
+  }
+}
+
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -115,4 +126,5 @@ module.exports = {
   scheduleCreateContactsFromMembersTask,
   scheduleFixPrimaryAddressForMembersTask,
   scheduleFixUrlsWithSpacesTask,
+  runDailyPullExecutionCheck,
 };

package/backend/tasks/consts.js

@@ -22,6 +22,7 @@ const TASKS_NAMES = {
   fixPrimaryAddressChunk: 'fixPrimaryAddressChunk',
   scheduleFixUrlsWithSpaces: 'scheduleFixUrlsWithSpaces',
   fixUrlsWithSpacesChunk: 'fixUrlsWithSpacesChunk',
+  dailyPullExecutionCheck: 'dailyPullExecutionCheck',
 };
 
 module.exports = {

package/backend/tasks/daily-pull-check-methods.js

@@ -0,0 +1,58 @@
+const { taskManager } = require('psdev-task-manager');
+const { COLLECTIONS } = require('psdev-task-manager/public/consts');
+
+const { wixData } = require('../elevated-modules');
+const { queryAllItems } = require('../utils');
+
+const { TASKS_NAMES } = require('./consts');
+
+const DEFAULT_HOURS_BACK = 4;
+
+/**
+ * Detects whether the daily pull was scheduled (cron / root task).
+ * If no `ScheduleDailyMembersDataSync` task exists in the lookback window, schedules it.
+ */
+async function dailyPullExecutionCheck(taskData) {
+  const hoursBack =
+    taskData?.hoursBack && Number.isFinite(taskData.hoursBack)
+      ? taskData.hoursBack
+      : DEFAULT_HOURS_BACK;
+  const sinceDate = new Date(Date.now() - hoursBack * 60 * 60 * 1000);
+
+  console.log('dailyPullExecutionCheck started', { hoursBack, sinceDate });
+
+  const rootTasksQuery = wixData
+    .query(COLLECTIONS.TASKS)
+    .eq('name', TASKS_NAMES.ScheduleDailyMembersDataSync)
+    .ge('_createdDate', sinceDate);
+
+  const rootTasks = await queryAllItems(rootTasksQuery);
+  const rootTaskScheduled = rootTasks.length > 0;
+
+  const result = {
+    success: rootTaskScheduled,
+    sinceDate: sinceDate.toISOString(),
+    rootTaskName: TASKS_NAMES.ScheduleDailyMembersDataSync,
+    rootTasksFound: rootTasks.length,
+  };
+
+  if (!rootTaskScheduled) {
+    console.log('ScheduleDailyMembersDataSync missing in window; scheduling root daily pull', {
+      hoursBack,
+    });
+    await taskManager().schedule({
+      name: TASKS_NAMES.ScheduleDailyMembersDataSync,
+      data: {},
+      type: 'scheduled',
+    });
+    result.fallbackScheduled = true;
+  }
+
+  console.log('dailyPullExecutionCheck result', JSON.stringify(result, null, 2));
+
+  return result;
+}
+
+module.exports = {
+  dailyPullExecutionCheck,
+};

package/backend/tasks/index.js

@@ -6,4 +6,5 @@ module.exports = {
   ...require('./url-migration-methods'),
   ...require('./address-primary-methods'),
   ...require('./url-space-fix-methods'),
+  ...require('./daily-pull-check-methods'),
 };

package/backend/tasks/tasks-configs.js

@@ -9,6 +9,7 @@ const {
   fixPrimaryAddressChunk,
 } = require('./address-primary-methods');
 const { TASKS_NAMES } = require('./consts');
+const { dailyPullExecutionCheck } = require('./daily-pull-check-methods');
 const {
   scheduleTaskForEmptyAboutYouMembers,
   convertAboutYouHtmlToRichContent,
@@ -202,6 +203,13 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.dailyPullExecutionCheck]: {
+    name: TASKS_NAMES.dailyPullExecutionCheck,
+    getIdentifier: task => task.data,
+    process: dailyPullExecutionCheck,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 30,
+  },
 };
 
 module.exports = { TASKS };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.64",
+  "version": "2.0.66",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",