abmp-npm 1.1.107 → 1.1.109

package/backend/daily-pull/sync-to-cms-methods.js

@@ -9,9 +9,10 @@ const { bulkProcessAndSaveMemberData } = require('./bulk-process-methods');
 const { SITES_WITH_INTERESTS_TO_MIGRATE } = require('./consts');
 const { isUpdatedMember, isSiteAssociatedMember } = require('./utils');
 
-async function syncMembersDataPerAction(action) {
+async function syncMembersDataPerAction(taskData) {
+  const { action, backupDate } = taskData;
   try {
-    const firstPageResponse = await fetchPACMembers(1, action);
+    const firstPageResponse = await fetchPACMembers({ page: 1, action, backupDate });
 
     if (
       !firstPageResponse ||
@@ -48,6 +49,7 @@ async function syncMembersDataPerAction(action) {
       data: {
         pageNumber,
         action,
+        ...(backupDate ? { backupDate } : {}),
       },
       type: 'scheduled',
     }));
@@ -74,11 +76,11 @@ async function syncMembersDataPerAction(action) {
  * @returns {Promise<Object>} - Page synchronization result
  */
 async function synchronizeSinglePage(taskObject) {
-  const { pageNumber, action } = taskObject.data;
+  const { pageNumber, action, backupDate } = taskObject.data;
   try {
     const [siteAssociation, memberDataResponse] = await Promise.all([
       getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION),
-      fetchPACMembers(pageNumber, action),
+      fetchPACMembers({ page: pageNumber, action, backupDate }),
     ]);
     const addInterests = SITES_WITH_INTERESTS_TO_MIGRATE.includes(siteAssociation);
     if (

package/backend/jobs.js

@@ -13,12 +13,18 @@ async function runScheduledTasks() {
   }
 }
 
-async function scheduleDailyPullTask() {
+/**
+ * Schedule a daily pull task for the given backup date
+ * @param {string} backupDate - Optional. The date of the backup to pull in format YYYY-MM-DD
+ * @returns {Promise<void>}
+ */
+async function scheduleDailyPullTask(backupDate = null) {
   try {
     console.log('scheduleDailyPullTask started!');
+    console.log(`backupDate: ${backupDate}`);
     return await taskManager().schedule({
       name: TASKS_NAMES.ScheduleDailyMembersDataSync,
-      data: {},
+      data: backupDate ? { backupDate } : {}, // keeping it like this so it would be easier to understand which task was backed up which is not while looking into CMS.
       type: 'scheduled',
     });
   } catch (error) {

package/backend/members-data-methods.js

@@ -133,15 +133,12 @@ async function getMemberBySlug({
     }
     query = query.limit(1000);
     const searchResult = await searchAllItems(query);
-    console.log('searchResult v2', searchResult.length);
     const membersList = searchResult.filter(
       item => item.url && item.url.toLowerCase().includes(slug.toLowerCase())
     ); //replacement for contains - case insensitive
-    console.log('membersList v2', membersList.length);
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );
-    console.log('matchingMembers v2', matchingMembers.length);
     if (normalizeSlugForComparison) {
       matchingMembers = membersList
         .filter(
@@ -160,7 +157,6 @@ async function getMemberBySlug({
         console.log(queryResultMsg);
       }
     }
-    console.log('matchingMembers v2', matchingMembers[0]);
     return matchingMembers[0] || null;
   } catch (error) {
     console.error('Error getting member by slug:', error);

package/backend/pac-api-methods.js

@@ -1,4 +1,4 @@
-const { PAC_API_URL } = require('./consts');
+const { PAC_API_URL, BACKUP_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
 const getHeaders = async () => {
@@ -8,8 +8,22 @@ const getHeaders = async () => {
   };
   return headers;
 };
-const fetchPACMembers = async (pageNum, actionFilter) => {
-  const url = `${PAC_API_URL}/Members?page=${pageNum}&actionFilter=${actionFilter}`;
+/**
+ *
+ * @param {*} params
+ * @param {number} params.page - The page number to fetch
+ * @param {string} params.action - The action to fetch
+ * @param {string} [params.backupDate] - Optional. The backup date to fetch in format YYYY-MM-DD, use only to fetch from backup endpoint not from PAC endpoint.
+ * @returns {Promise<Object>} - The response from the API
+ */
+const fetchPACMembers = async ({ page, action, backupDate }) => {
+  const baseUrl = backupDate ? BACKUP_API_URL : PAC_API_URL;
+  const queryParams = { page, actionFilter: action };
+  if (backupDate) {
+    queryParams.date = backupDate;
+  }
+  const url = `${baseUrl}/Members?${new URLSearchParams(queryParams).toString()}`;
+  console.log(`Fetching PAC members from:  ${url}`);
   const headers = await getHeaders();
   const fetchOptions = {
     method: 'get',
@@ -18,14 +32,14 @@ const fetchPACMembers = async (pageNum, actionFilter) => {
   const response = await fetch(url, fetchOptions);
   const responseType = response.headers.get('content-type');
   if (!responseType.includes('application/json')) {
-    const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${pageNum} and actionFilter ${actionFilter}`;
+    const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${page} and actionFilter ${action}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }
   if (response.ok) {
     return response.json();
   } else {
-    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${pageNum} and actionFilter ${actionFilter}`;
+    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }

package/backend/tasks/tasks-configs.js

@@ -43,7 +43,7 @@ const TASKS = {
   },
   [TASKS_NAMES.ScheduleMembersDataPerAction]: {
     name: TASKS_NAMES.ScheduleMembersDataPerAction,
-    getIdentifier: task => task.data.action,
+    getIdentifier: task => task.data,
     process: syncMembersDataPerAction,
     shouldSkipCheck: () => false,
     estimatedDurationSec: 6,

package/backend/utils.js

@@ -110,17 +110,17 @@ function getMoreAddressesToDisplay(addresses = [], addressDisplayOption = []) {
 }
 const getAllItems = async querySearchResult => {
   let oldResults = querySearchResult;
-  console.log(`found items v2: ${oldResults.items.length}`);
+  console.log(`found items: ${oldResults.items.length}`);
   const allItems = oldResults.items;
   while (oldResults.hasNext()) {
     oldResults = await oldResults.next();
     allItems.push(...oldResults.items);
   }
-  console.log(`all items count v2 : ${allItems.length}`);
+  console.log(`all items count : ${allItems.length}`);
   return allItems;
 };
 const searchAllItems = async searchQuery => {
-  console.log('start search v2');
+  console.log('start search');
   const searchResults = await searchQuery.run();
   return getAllItems(searchResults);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.107",
+  "version": "1.1.109",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -50,7 +50,7 @@
     "csv-parser": "^3.0.0",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
-    "psdev-task-manager": "1.1.7",
+    "psdev-task-manager": "1.1.9",
     "psdev-utils": "1.1.1"
   }
 }