2606/mecr (#1292)

* wip * Amend callable function interface * merge * fix-function * fix-function * fix-function * fix-function * fix-function * add test --------- Co-authored-by: warrensearle <warren@precise-minds.co.uk>
jac-uk · Dec 24, 2024 · 8f412af · 8f412af
1 parent cc8f3a9
commit 8f412af
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/functions/actions/exercises/getMultipleApplicationData.js b/functions/actions/exercises/getMultipleApplicationData.js
@@ -4,8 +4,7 @@ export default (config, firebase, db, auth) => {
 
   const getApplicationData = initGetApplicationData(config, firebase, db, auth);
 
-  return getMultipleApplicationData;
-
+  return getMultipleApplicationData;  
   async function getMultipleApplicationData(exerciseIds, columns) {
     const allData = [];
 
@@ -23,5 +22,4 @@ export default (config, firebase, db, auth) => {
 
     return allData;
   }
-
 };
diff --git a/functions/callableFunctions/getMultipleApplicationData.js b/functions/callableFunctions/getMultipleApplicationData.js
@@ -30,6 +30,7 @@ export default functions.runWith(runtimeOptions).region('europe-west2').https.on
   }, data)) {
     throw new functions.https.HttpsError('invalid-argument', 'Please provide valid arguments');
   }
+
   return getMultipleApplicationData(data.exerciseIds, data.columns);
 
 });

diff --git a/nodeScripts/getMultipleApplicationData.js b/nodeScripts/getMultipleApplicationData.js
@@ -11,13 +11,10 @@ const getMultipleApplicationData = initGetMultipleApplicationData(config, fireba
 const exerciseIds = ['XvzIg48K9XOhfeFr3w91', 'Biyjd07Xz2usL9yXjtjV', 'IKLcf2Y187f2WTjifsoj'];  
 
 // Params for each call to getApplicationData
-const params = {
-  columns: ['exerciseRef','referenceNumber','personalDetails.fullName','status'],
-  whereClauses: [],
-};
+const columns = ['exerciseRef','referenceNumber','personalDetails.fullName','status'];
 
 const main = async () => {
-  return getMultipleApplicationData(exerciseIds, params);
+  return getMultipleApplicationData(exerciseIds, columns);
 };
 
 main()

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/functions/getMultipleApplicationData.spec.js b/test/functions/getMultipleApplicationData.spec.js
@@ -34,14 +34,7 @@ describe('getMultipleApplicationData', () => {
   context('Functionality', () => {
     it('should return data for multiple exerciseIds', async () => {
       const exerciseIds = ['exerciseId1', 'exerciseId2', 'exerciseId3'];
-      const params = {
-        statuses: ['status1', 'status2'],
-        columns: ['column1', 'column2'],
-        whereClauses: [],
-        type: 'data',
-        stage: 'stage1',
-        stageStatus: 'status',
-      };
+      const columns = ['exerciseRef','referenceNumber'];
 
       const wrapped = wrap(getMultipleApplicationData);
       const context = generateMockContext({
@@ -50,7 +43,7 @@ describe('getMultipleApplicationData', () => {
         ],
       });
 
-      const result = await wrapped({ exerciseIds, params }, context);
+      const result = await wrapped({ exerciseIds, columns }, context);
       assert(Array.isArray(result), 'Result should be an array');
       assert(result.length > 0, 'Result should contain data');
     });
-Original file line number
+Diff line change
@@ Expand Up @@
       }, data)) {
         throw new functions.https.HttpsError('invalid-argument', 'Please provide valid arguments');
       }
       return getMultipleApplicationData(data.exerciseIds, data.columns);
     });
@@ Expand Down @@