Merge pull request #1030 from ReliefApplications/next

Next

Author: AntoineRelief

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ on:
       - next-major
       - beta
       - alpha
-      - "[0-9]*.[0-9x]*.x"
+      - '[0-9]*.[0-9x]*.x'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -64,11 +64,11 @@ jobs:
       #     path: .env
       - name: Test
         #run: npm run test
-        run: docker-compose -f docker-compose.test.yml run test-server npm run test
+        run: docker-compose -f docker-compose.test.yml run test-server npm run test -- --runInBand --ci
 
       - name: Archive code coverage result
         if: success()
         uses: actions/upload-artifact@v3
         with:
           name: deploy_coverage
-          path: coverage
+          path: coverage

CHANGELOG.md

@@ -1,3 +1,33 @@
+# [2.8.0](https://github.com/ReliefApplications/ems-backend/compare/v2.7.2...v2.8.0) (2024-04-24)
+
+
+### Bug Fixes
+
+* csv export should now lookalike excel export ([#981](https://github.com/ReliefApplications/ems-backend/issues/981)) ([b13e55c](https://github.com/ReliefApplications/ems-backend/commit/b13e55c94c10bebae42e30ac29dc83b30c9a7a88))
+* some ref data aggregations would not send correct data. Now use field name instead of grahp ql field name ([#998](https://github.com/ReliefApplications/ems-backend/issues/998)) ([d2e7074](https://github.com/ReliefApplications/ems-backend/commit/d2e7074853ff10fd29ad7b7f4e3d41683846e5cf))
+* update user management and who configurations ([38798f2](https://github.com/ReliefApplications/ems-backend/commit/38798f252efa2a62bd5256fcf5e031d77cabfdfc))
+
+
+### Features
+
+* Add email + AAD user type to automation rules ([#2468](https://github.com/ReliefApplications/ems-backend/issues/2468)) ([2240e1e](https://github.com/ReliefApplications/ems-backend/commit/2240e1ecedb3626738273adecf92fc3ed80c3bad)), closes [#89936](https://github.com/ReliefApplications/ems-backend/issues/89936) [#89936](https://github.com/ReliefApplications/ems-backend/issues/89936) [#89936](https://github.com/ReliefApplications/ems-backend/issues/89936)
+* role based display for action buttons ([#1008](https://github.com/ReliefApplications/ems-backend/issues/1008)) ([1579d04](https://github.com/ReliefApplications/ems-backend/commit/1579d040f1828fd11acba366786fe188295014b6))
+
+
+### Reverts
+
+* Revert "AB#90725 - Transform gis/feature endpoint into POST" (#1019) ([62178d0](https://github.com/ReliefApplications/ems-backend/commit/62178d0bce90e270b673f87f939fff5de1ba2b1c)), closes [AB#90725](https://github.com/AB/issues/90725) [#1019](https://github.com/ReliefApplications/ems-backend/issues/1019)
+* Revert "change response type #90266 (#1011)" (#1016) ([35ff495](https://github.com/ReliefApplications/ems-backend/commit/35ff49551aaec6495b5928806d4af6452becfd0e)), closes [#90266](https://github.com/ReliefApplications/ems-backend/issues/90266) [#1011](https://github.com/ReliefApplications/ems-backend/issues/1011) [#1016](https://github.com/ReliefApplications/ems-backend/issues/1016)
+* use field name instead of graphql field name ([c6975da](https://github.com/ReliefApplications/ems-backend/commit/c6975da6cd10d071fb34ba64b4290fa585b976f0))
+
+## [2.7.2](https://github.com/ReliefApplications/ems-backend/compare/v2.7.1...v2.7.2) (2024-03-25)
+
+
+### Bug Fixes
+
+* add check for empty context filter ([#995](https://github.com/ReliefApplications/ems-backend/issues/995)) ([31a8544](https://github.com/ReliefApplications/ems-backend/commit/31a85447f4a418000d763049d1f0d38261d82f66))
+* now working nested fields in reference data aggregation ([ed564b3](https://github.com/ReliefApplications/ems-backend/commit/ed564b3f9eef48f06674144ac94d153c5e494d91))
+
 ## [2.7.1](https://github.com/ReliefApplications/ems-backend/compare/v2.7.0...v2.7.1) (2024-03-04)
 
 

README.md

@@ -29,11 +29,33 @@ In order to execute tests locally, you can execute the command:
 docker-compose -f docker-compose.test.yml run test-server npm run test
 ```
 
+Or this command:
+```
+npm run test
+```
+
 It is also possible to run tests on a single file, by passing it as a parameter:
 ```
 docker-compose -f docker-compose.test.yml run test-server npm run test -- <path_to_file>
 ```
 
+Or with this command:
+```
+npm run test -- <path_to_file>
+```
+
+You can also limit the tests to one specific folder. For example:
+```
+npm run test -- --testPathPattern=models
+```
+
+Note: If you're running the tests on Windows, make sure the test command in your `package.json` file is set up correctly. Here's the command that should be in the `scripts` section of your `package.json` file:
+
+```json
+"test": "node --max-old-space-size=8192 ./node_modules/jest/bin/jest.js --logHeapUsage --forceExit"
+```
+Will only run tests in the **models** folder.
+
 # RabbitMQ
 
 If management platform is not reachable at 15672, you can use this command ( while containers are running ):

__tests__/global.setup.ts

@@ -1,4 +1,6 @@
 import 'tsconfig-paths/register';
+import dotenv from 'dotenv';
+dotenv.config();
 import { startDatabase, initDatabase, stopDatabase } from '@server/database';
 import config from 'config';
 import { logger } from '@services/logger.service';

__tests__/jest.setup.ts

@@ -1,3 +1,8 @@
+// This line is important, as it will prevent the delete folder method to use actual logic
+// As we don't want to test if deletion of azure files work or not, we skip it
+// Mocking for this module must be done before any other imports
+jest.mock('@utils/files/deleteFolder');
+
 import { startDatabase } from '../src/server/database';
 
 // Execute before each file.
@@ -6,5 +11,7 @@ beforeAll(async () => {
 }, 20000);
 
 afterAll(async () => {
-  //await stopDatabase();
+  // await stopDatabase();
+  // Avoid memory issue
+  if (global.gc) global.gc();
 });

__tests__/models/aggregation.test.ts

@@ -95,9 +95,9 @@ describe('Aggregation models tests', () => {
     };
     expect(async () =>
       new Resource(duplicateResource).save()
-    ).rejects.toThrowError(
-      'E11000 duplicate key error collection: test.resources index: name_1 dup key'
-    );
+    ).rejects.toMatchObject({
+      code: 11000,
+    });
   });
 
   test('test with incorrect resource name field', async () => {

__tests__/models/apiConfiguration.test.ts

@@ -34,9 +34,9 @@ describe('ApiConfiguration models tests', () => {
     };
     expect(async () =>
       new ApiConfiguration(duplicateApiConfig).save()
-    ).rejects.toThrowError(
-      'E11000 duplicate key error collection: test.apiconfigurations index: name_1 dup key'
-    );
+    ).rejects.toMatchObject({
+      code: 11000,
+    });
   });
 
   test('test with incorrect api configuration status field', async () => {
@@ -60,4 +60,26 @@ describe('ApiConfiguration models tests', () => {
       ).rejects.toThrow(Error);
     }
   });
+
+  test('test with incorrect api configuration authType field', async () => {
+    for (let i = 0; i < 1; i++) {
+      const apiConfig = {
+        name: faker.random.word(),
+        status: status.pending,
+        authType: faker.random.word(), // Invalid value
+        endpoint: faker.internet.url(),
+        graphQLEndpoint: `${faker.internet.url()}/graphql`,
+        pingUrl: 'PR',
+        settings: {
+          authTargetUrl: faker.internet.url(),
+          apiClientID: faker.datatype.uuid(),
+          safeSecret: faker.datatype.uuid(),
+          scope: faker.random.word(),
+        },
+      };
+      await expect(
+        new ApiConfiguration(apiConfig).save()
+      ).rejects.toThrowError();
+    }
+  });
 });

__tests__/models/application.test.ts

@@ -38,9 +38,9 @@ describe('Application models tests', () => {
     };
     expect(async () =>
       new Application(duplicateApplication).save()
-    ).rejects.toThrowError(
-      'E11000 duplicate key error collection: test.applications index: name_1 dup key'
-    );
+    ).rejects.toMatchObject({
+      code: 11000,
+    });
   });
 
   test('test application delete', async () => {
@@ -71,7 +71,7 @@ describe('Application models tests', () => {
     }).save();
 
     const isDelete = await Application.deleteOne({ _id: applicationData._id });
-    expect(isDelete.ok).toEqual(1);
+    expect(isDelete.acknowledged).toEqual(true);
     expect(isDelete.deletedCount).toEqual(1);
   });
 });

__tests__/models/channel.test.ts

@@ -21,17 +21,17 @@ describe('Channel models tests', () => {
     };
     expect(async () =>
       new Channel(duplicateApiConfig).save()
-    ).rejects.toThrowError(
-      'E11000 duplicate key error collection: test.channels index: title_1_application_1_form_1 dup key'
-    );
+    ).rejects.toMatchObject({
+      code: 11000,
+    });
   });
 
   test('test with blank channel name field', async () => {
     for (let i = 0; i < 1; i++) {
       const channelData = {
         title: '',
       };
-      expect(async () => new Channel(channelData).save()).rejects.toThrow(
+      await expect(async () => new Channel(channelData).save()).rejects.toThrow(
         Error
       );
     }
@@ -50,7 +50,7 @@ describe('Channel models tests', () => {
     }
 
     const isDelete = await Channel.deleteOne({ _id: channelData._id });
-    expect(isDelete.ok).toEqual(1);
+    expect(isDelete.acknowledged).toEqual(true);
     expect(isDelete.deletedCount).toEqual(1);
   });
 });

__tests__/models/client.test.ts

@@ -26,9 +26,9 @@ describe('Client models tests', () => {
       name: faker.name.fullName(),
       clientId: client.clientId,
     };
-    expect(async () => new Client(inputData).save()).rejects.toThrowError(
-      'E11000 duplicate key error collection: test.clients index: clientId_1 dup key'
-    );
+    expect(async () => new Client(inputData).save()).rejects.toMatchObject({
+      code: 11000,
+    });
   });
 
   test('test client with duplicate oid field', async () => {