abmp-npm 10.0.62 → 10.0.64

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,88 @@
+const { taskManager } = require('psdev-task-manager');
+const { COLLECTIONS } = require('psdev-task-manager/public/consts');
+
+const { MEMBER_ACTIONS } = require('../daily-pull/consts');
+const { wixData } = require('../elevated-modules');
+const { queryAllItems } = require('../utils');
+
+const { TASKS_NAMES } = require('./consts');
+
+const DEFAULT_HOURS_BACK = 4;
+
+const getActionsToCheck = includeNone =>
+  includeNone
+    ? Object.values(MEMBER_ACTIONS)
+    : Object.values(MEMBER_ACTIONS).filter(action => action !== MEMBER_ACTIONS.NONE);
+
+/**
+ * Verifies ScheduleMembersDataPerAction tasks exist and succeeded per action.
+ */
+async function dailyPullExecutionCheck(taskData) {
+  const hoursBack =
+    taskData?.hoursBack && Number.isFinite(taskData.hoursBack)
+      ? taskData.hoursBack
+      : DEFAULT_HOURS_BACK;
+  const includeNone = Boolean(taskData?.includeNone);
+  const sinceDate = new Date(Date.now() - hoursBack * 60 * 60 * 1000);
+
+  console.log('dailyPullExecutionCheck started', { hoursBack, sinceDate });
+
+  const tasksQuery = wixData
+    .query(COLLECTIONS.TASKS)
+    .eq('name', TASKS_NAMES.ScheduleMembersDataPerAction)
+    .ge('_createdDate', sinceDate)
+    .limit(1000);
+
+  const tasks = await queryAllItems(tasksQuery);
+  const actionsToCheck = getActionsToCheck(includeNone);
+
+  const statusByAction = actionsToCheck.reduce((acc, action) => {
+    acc[action] = { success: 0, failed: 0, pending: 0, in_progress: 0, skipped: 0 };
+    return acc;
+  }, {});
+
+  tasks.forEach(task => {
+    const action = task?.data?.action;
+    if (!action || !(action in statusByAction)) {
+      return;
+    }
+    const status = task?.status || 'unknown';
+    if (!statusByAction[action][status]) {
+      statusByAction[action][status] = 0;
+    }
+    statusByAction[action][status] += 1;
+  });
+
+  const missingActions = actionsToCheck.filter(
+    action => (statusByAction[action]?.success || 0) === 0
+  );
+
+  const result = {
+    success: missingActions.length === 0,
+    sinceDate: sinceDate.toISOString(),
+    actionsChecked: actionsToCheck,
+    missingActions,
+    statusByAction,
+    totalTasksFound: tasks.length,
+  };
+
+  if (missingActions.length > 0) {
+    console.log('Missing daily pull actions detected, scheduling fallback daily pull run', {
+      missingActions,
+    });
+    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": "10.0.62",
+  "version": "10.0.64",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/Home.js

@@ -10,6 +10,7 @@ const {
   formatPracticeAreasForDisplay,
   checkAddressIsVisible,
   isWixHostedImage,
+  normalizeExternalUrl,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -198,7 +199,7 @@ const homePageOnReady = async ({
         $item('#websiteContainer').collapse();
       } else {
         if (itemData.showWebsite) {
-          $item('#website').link = itemData.website;
+          $item('#website').link = normalizeExternalUrl(itemData.website);
         } else {
           $item('#website').link = `${baseUrl}/profile/${itemData.url}`;
         }
@@ -256,7 +257,7 @@ const homePageOnReady = async ({
       // 9) "Book now" button
       if (itemData.bookingUrl) {
         $item('#bookNowButton').show();
-        $item('#bookNowButton').link = itemData.bookingUrl;
+        $item('#bookNowButton').link = normalizeExternalUrl(itemData.bookingUrl);
         $item('#bookNowButton').target = '_blank';
       } else {
         $item('#bookNowButton').hide();

package/pages/personalDetails.js

@@ -9,7 +9,11 @@ const {
   LIGHTBOX_NAMES,
 } = require('../public/consts');
 const { handleOnCustomValidation, isNotValidUrl } = require('../public/Utils/personalDetailsUtils');
-const { generateId, isWixHostedImage } = require('../public/Utils/sharedUtils');
+const {
+  generateId,
+  isWixHostedImage,
+  normalizeExternalUrl,
+} = require('../public/Utils/sharedUtils');
 
 const MAX_PHONES_COUNT = 10;
 const MAX_ADDRESSES_COUNT = 10;
@@ -2280,12 +2284,15 @@ async function personalDetailsOnReady({
     const addresses = Array.isArray(itemMemberObj.addresses) ? itemMemberObj.addresses : [];
     const phones = Array.isArray(itemMemberObj.phones) ? itemMemberObj.phones : [];
 
+    const rawWebsite = (_$w('#UrlInput').value || '').trim();
+    const rawBooking = (_$w('#schedulingLinkInput').value || '').trim();
+
     return {
       showContactForm: _$w('#showCotactFormCheckbox').checked,
       contactFormEmail: _$w('#contactFormEmailInput').value,
       toShowPhone: getToShowPhone(),
-      bookingUrl: _$w('#schedulingLinkInput').value,
-      website: _$w('#UrlInput').value,
+      bookingUrl: rawBooking ? normalizeExternalUrl(rawBooking) : '',
+      website: rawWebsite ? normalizeExternalUrl(rawWebsite) : '',
       showWebsite: showExistingUrl,
       showWixUrl,
       addresses,

package/public/Utils/sharedUtils.js

@@ -186,6 +186,15 @@ function isWixHostedImage(imageUrl) {
   );
 }
 
+/** Web URLs only: bare hostnames get https:// so they are not treated as site-relative paths. */
+function normalizeExternalUrl(url) {
+  if (!url || typeof url !== 'string') return url;
+  const trimmed = url.trim();
+  if (!trimmed) return trimmed;
+  if (/^https?:\/\//i.test(trimmed)) return trimmed;
+  return `https://${trimmed}`;
+}
+
 module.exports = {
   checkAddressIsVisible,
   formatPracticeAreasForDisplay,
@@ -198,4 +207,5 @@ module.exports = {
   generateId,
   formatAddress,
   isWixHostedImage,
+  normalizeExternalUrl,
 };