ofsc-utility 1.0.55 → 1.0.56

package/CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+### Changed
+- Refactor logging to use colored output and update version
+
 ### Maintenance
 - Bump version to 1.0.54 and update API calls to use fetchPostWithRetry
 - version 1.0.46

package/dist/activities/index.d.ts

@@ -19,3 +19,4 @@ export declare function getActivitybyId(clientId: string, clientSecret: string,
     data: any;
 }>;
 export declare function getAllNonScheduledActivities(clientId: string, clientSecret: string, instanceUrl: string, rootBucket: string, fields?: string): Promise<any[]>;
+export declare function getAllScheduledActivities(clientId: string, clientSecret: string, instanceUrl: string, rootBucket: string): Promise<any[]>;

package/dist/activities/index.js

@@ -4,6 +4,7 @@ exports.deleteActivity = exports.completeActivity = exports.cancelActivity = exp
 exports.getAllActivities = getAllActivities;
 exports.getActivitybyId = getActivitybyId;
 exports.getAllNonScheduledActivities = getAllNonScheduledActivities;
+exports.getAllScheduledActivities = getAllScheduledActivities;
 const oauthTokenService_1 = require("../oauthTokenService");
 const utilities_1 = require("../utilities");
 var activityActions_1 = require("./activityActions");
@@ -56,16 +57,16 @@ async function getAllActivities(clientId, clientSecret, instanceUrl, resources,
         if (includeNonScheduled)
             params.append("includeNonScheduled", "true");
         const url = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscCore/v1/activities/?${params.toString()}`;
-        console.error(url);
-        console.log(`➡️ Fetching offset=${offset}, limit=${limit}`);
+        utilities_1.log.red(url);
+        utilities_1.log.brightBlue(`➡️ Fetching offset=${offset}, limit=${limit}`);
         const response = await (0, utilities_1.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token);
         const data = response.data;
         if (!data.items || data.items.length === 0) {
-            console.log("✔ No more items found. Stopping pagination.");
+            utilities_1.log.yellow("✔ No more items found. Stopping pagination.");
             break;
         }
         allItems.push(...data.items);
-        console.log(`   ✔ Received ${data.items.length} items (Total: ${allItems.length})`);
+        utilities_1.log.yellow(`   ✔ Received ${data.items.length} items (Total: ${allItems.length})`);
         limit = data.limit;
         offset += limit;
     }
@@ -73,7 +74,7 @@ async function getAllActivities(clientId, clientSecret, instanceUrl, resources,
 }
 async function getActivitybyId(clientId, clientSecret, instanceUrl, activityId, token = "") {
     const url = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscCore/v1/activities/${Number(activityId)}/`;
-    console.log(`➡️ Fetching activity by ID: ${url}`);
+    utilities_1.log.brightBlue(`➡️ Fetching activity by ID: ${url}`);
     const response = await (0, utilities_1.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token);
     return response;
 }
@@ -98,18 +99,76 @@ async function getAllNonScheduledActivities(clientId, clientSecret, instanceUrl,
             params.append("fields", fields);
         params.append("includeNonScheduled", "true");
         const url = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscCore/v1/activities/?${params.toString()}`;
-        console.error(url);
-        console.log(` Fetching Non Scheduled Activities: offset=${offset}, limit=${limit}`);
+        utilities_1.log.red(url);
+        utilities_1.log.yellow(` Fetching Non Scheduled Activities: offset=${offset}, limit=${limit}`);
         const response = await (0, utilities_1.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token);
         const data = response.data;
         if (!data.items || data.items.length === 0 || data.hasMore === false) {
-            console.log("No more items found. Stopping pagination.");
+            utilities_1.log.yellow("No more items found. Stopping pagination.");
             break;
         }
         allItems.push(...data.items);
-        console.log(`Received ${data.items.length} items (Total: ${allItems.length})`);
+        utilities_1.log.yellow(`Received ${data.items.length} items (Total: ${allItems.length})`);
         limit = data.limit;
         offset += limit;
     }
     return allItems;
 }
+async function getAllScheduledActivities(clientId, clientSecret, instanceUrl, rootBucket) {
+    const limit = 1000;
+    const allItems = [];
+    const token = await (0, oauthTokenService_1.getOAuthToken)(clientId, clientSecret, instanceUrl);
+    // Start from today
+    let dateTo = new Date();
+    // Date range loop
+    dateRangeLoop: while (true) {
+        const dateFrom = new Date(dateTo);
+        dateFrom.setDate(dateFrom.getDate() - 31);
+        const dateFromStr = formatDate(dateFrom);
+        const dateToStr = formatDate(dateTo);
+        utilities_1.log.brightBlue(`\nDate Range: ${dateFromStr} → ${dateToStr}`);
+        let offset = 0;
+        while (true) {
+            const params = new URLSearchParams({
+                offset: offset.toString(),
+                limit: limit.toString(),
+                dateFrom: dateFromStr,
+                dateTo: dateToStr,
+                includeNonScheduled: "false",
+            });
+            if (rootBucket) {
+                params.append("resources", rootBucket);
+            }
+            const url = `https://${instanceUrl}.fs.ocs.oraclecloud.com/rest/ofscCore/v1/activities/?${params.toString()}`;
+            utilities_1.log.yellow(`API: dateFrom=${dateFromStr}, dateTo=${dateToStr}, offset=${offset}`);
+            const response = await (0, utilities_1.fetchWithRetry)(url, clientId, clientSecret, instanceUrl, token);
+            const data = response.data;
+            if (!data.items || data.items.length === 0) {
+                utilities_1.log.green("✔ No items found. Stopping all processing.");
+                break dateRangeLoop;
+            }
+            // Add items
+            allItems.push(...data.items);
+            utilities_1.log.yellow(`✔ Received ${data.items.length} items`);
+            utilities_1.log.yellow(`✔ Total items: ${allItems.length}`);
+            utilities_1.log.yellow(`✔ hasMore: ${data.hasMore}`);
+            if (data.hasMore === true) {
+                // More pages available for SAME date range
+                offset += data.items.length;
+                utilities_1.log.yellow(`➡️ More data available. Next offset=${offset}`);
+                continue;
+            }
+            utilities_1.log.yellow(`✔ Date range completed: ${dateFromStr} → ${dateToStr}`);
+            break;
+        }
+        dateTo = new Date(dateFrom);
+        utilities_1.log.yellow(`⬅️ Moving to previous date range. New dateTo=${formatDate(dateTo)}`);
+    }
+    return allItems;
+}
+/**
+ * Format Date as YYYY-MM-DD
+ */
+function formatDate(date) {
+    return date.toISOString().split("T")[0];
+}

package/dist/index.d.ts

@@ -16,7 +16,7 @@ export { downloadWorkZoneCSV } from './workZones';
 export { AllResources, downloadAllResourcesCSV, getResourcebyId, getworkSkillsOfResource, updateResourcebyId } from './resources';
 export { downloadAllInactiveUsers, downloadAllInactiveUsersCSV, downloadAllUsersCSV, generateUsersCollaborationCSV, getUserByLogin, updateUserbyLogin } from './users';
 export { downloadAllInventoryTypesCSV, getInventoryTypesDetail, updateCreateInventoryType } from './inventoryTypes';
-export { getActivitybyId, getAllActivities, startActivity, cancelActivity, completeActivity, deleteActivity, getAllNonScheduledActivities } from './activities';
+export { getActivitybyId, getAllActivities, getAllScheduledActivities, startActivity, cancelActivity, completeActivity, deleteActivity, getAllNonScheduledActivities } from './activities';
 export { createActivityCustomerInventories, getActivityCustomerInventories } from './activityInventories';
 export { downloadAllEventsOfDay, downloadAllEventsOfDayCSV, downloadAllEventsOfDLastTwoMinutes, downloadAllEventsOfLastOneHour } from './events';
 export { createExcelFile } from './utilities';
@@ -31,6 +31,7 @@ declare const OfscUtility: {
     updateInventoryType: any;
     Activity: {
         getAllActivities: any;
+        getAllScheduledActivities: any;
         getAllNonScheduledActivities: any;
         getActivitybyId: any;
         startActivity: any;

package/dist/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfigurationFile = exports.createExcelFile = exports.downloadAllEventsOfLastOneHour = exports.downloadAllEventsOfDLastTwoMinutes = exports.downloadAllEventsOfDayCSV = exports.downloadAllEventsOfDay = exports.getActivityCustomerInventories = exports.createActivityCustomerInventories = exports.getAllNonScheduledActivities = exports.deleteActivity = exports.completeActivity = exports.cancelActivity = exports.startActivity = exports.getAllActivities = exports.getActivitybyId = exports.updateCreateInventoryType = exports.getInventoryTypesDetail = exports.downloadAllInventoryTypesCSV = exports.updateUserbyLogin = exports.getUserByLogin = exports.generateUsersCollaborationCSV = exports.downloadAllUsersCSV = exports.downloadAllInactiveUsersCSV = exports.downloadAllInactiveUsers = exports.updateResourcebyId = exports.getworkSkillsOfResource = exports.getResourcebyId = exports.downloadAllResourcesCSV = exports.AllResources = exports.downloadWorkZoneCSV = exports.getOAuthToken = exports.generateAllOnHandInventoryOfAllResourcesCSV = exports.generateAllOnHandInventoryOfAllResources = exports.WorkZone = exports.Utilities = exports.User = exports.Resource = exports.OauthTokenService = exports.CreateConfigurationFile = exports.InventoryType = exports.Inventory = exports.Events = exports.ActivityInventories = exports.Activity = void 0;
+exports.createConfigurationFile = exports.createExcelFile = exports.downloadAllEventsOfLastOneHour = exports.downloadAllEventsOfDLastTwoMinutes = exports.downloadAllEventsOfDayCSV = exports.downloadAllEventsOfDay = exports.getActivityCustomerInventories = exports.createActivityCustomerInventories = exports.getAllNonScheduledActivities = exports.deleteActivity = exports.completeActivity = exports.cancelActivity = exports.startActivity = exports.getAllScheduledActivities = exports.getAllActivities = exports.getActivitybyId = exports.updateCreateInventoryType = exports.getInventoryTypesDetail = exports.downloadAllInventoryTypesCSV = exports.updateUserbyLogin = exports.getUserByLogin = exports.generateUsersCollaborationCSV = exports.downloadAllUsersCSV = exports.downloadAllInactiveUsersCSV = exports.downloadAllInactiveUsers = exports.updateResourcebyId = exports.getworkSkillsOfResource = exports.getResourcebyId = exports.downloadAllResourcesCSV = exports.AllResources = exports.downloadWorkZoneCSV = exports.getOAuthToken = exports.generateAllOnHandInventoryOfAllResourcesCSV = exports.generateAllOnHandInventoryOfAllResources = exports.WorkZone = exports.Utilities = exports.User = exports.Resource = exports.OauthTokenService = exports.CreateConfigurationFile = exports.InventoryType = exports.Inventory = exports.Events = exports.ActivityInventories = exports.Activity = void 0;
 // Export all methods grouped by category
 exports.Activity = __importStar(require("./activities"));
 exports.ActivityInventories = __importStar(require("./activityInventories"));
@@ -78,6 +78,7 @@ Object.defineProperty(exports, "updateCreateInventoryType", { enumerable: true,
 var activities_1 = require("./activities");
 Object.defineProperty(exports, "getActivitybyId", { enumerable: true, get: function () { return activities_1.getActivitybyId; } });
 Object.defineProperty(exports, "getAllActivities", { enumerable: true, get: function () { return activities_1.getAllActivities; } });
+Object.defineProperty(exports, "getAllScheduledActivities", { enumerable: true, get: function () { return activities_1.getAllScheduledActivities; } });
 Object.defineProperty(exports, "startActivity", { enumerable: true, get: function () { return activities_1.startActivity; } });
 Object.defineProperty(exports, "cancelActivity", { enumerable: true, get: function () { return activities_1.cancelActivity; } });
 Object.defineProperty(exports, "completeActivity", { enumerable: true, get: function () { return activities_1.completeActivity; } });
@@ -106,6 +107,7 @@ const OfscUtility = {
     updateInventoryType: require('./inventoryTypes').updateInventoryType,
     Activity: {
         getAllActivities: require('./activities').getAllActivities,
+        getAllScheduledActivities: require('./activities').getAllScheduledActivities,
         getAllNonScheduledActivities: require('./activities').getAllNonScheduledActivities,
         getActivitybyId: require('./activities').getActivitybyId,
         startActivity: require('./activities').startActivity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ofsc-utility",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "TypeScript helpers for Oracle Field Service Cloud (OFSC): events, resources, inventories, metadata and CSV/Excel utilities.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/readme.md

@@ -127,6 +127,7 @@ The package exposes both top-level helpers and grouped namespaces. This list is
 - `getInventoryTypesDetail`
 - `updateCreateInventoryType`
 - `getAllActivities`
+- `getAllScheduledActivities`
 - `getAllNonScheduledActivities`
 - `getActivitybyId`
 - `startActivity`
@@ -148,6 +149,7 @@ The module-level namespace exports are:
 
 - `ofs.Activity`
   - `getAllActivities`
+  - `getAllScheduledActivities`
   - `getAllNonScheduledActivities`
   - `getActivitybyId`
   - `startActivity`
@@ -871,6 +873,13 @@ const activityData = await ofs.Activity.getActivitybyId(
   123456,
 );
 
+const scheduledActivities = await ofs.Activity.getAllScheduledActivities(
+  process.env.CLIENT_ID,
+  process.env.CLIENT_SECRET,
+  process.env.INSTANCE_NAME,
+  "US",
+);
+
 const nonScheduledActivities = await ofs.Activity.getAllNonScheduledActivities(
   process.env.CLIENT_ID,
   process.env.CLIENT_SECRET,
@@ -879,6 +888,7 @@ const nonScheduledActivities = await ofs.Activity.getAllNonScheduledActivities(
   "activityId,activityType,status",
 );
 
+console.log("Scheduled activities:", scheduledActivities.length);
 console.log("Non-scheduled activities:", nonScheduledActivities.length);
 
 await ofs.Activity.startActivity(
@@ -938,8 +948,9 @@ const inventoryDetail = await ofs.InventoryType.getInventoryTypesDetail(
 
 ### Activity lifecycle actions
 
-The activity action helpers let you transition an OFSC activity through its standard custom actions and list non-scheduled activity work:
+The activity helper set lets you query scheduled and non-scheduled activity work, then transition an OFSC activity through its standard lifecycle actions:
 
+- `getAllScheduledActivities(clientId, clientSecret, instanceUrl, rootBucket)`
 - `getAllNonScheduledActivities(clientId, clientSecret, instanceUrl, resources, fields?)`
 - `startActivity(clientId, clientSecret, instanceUrl, activityId)`
 - `completeActivity(clientId, clientSecret, instanceUrl, activityId)`
@@ -949,7 +960,21 @@ The activity action helpers let you transition an OFSC activity through its stan
 Example:
 
 ```js
-let rootBucket="US";
+let rootBucket = "US";
+const scheduled = await ofs.Activity.getAllScheduledActivities(
+  process.env.CLIENT_ID,
+  process.env.CLIENT_SECRET,
+  process.env.INSTANCE_NAME,
+  rootBucket,
+);
+
+console.log("Scheduled activities:", scheduled.length);
+```
+
+Example:
+
+```js
+let rootBucket = "US";
 const nonScheduled = await ofs.Activity.getAllNonScheduledActivities(
   process.env.CLIENT_ID,
   process.env.CLIENT_SECRET,