ReliefApplications · HasnatL-Adapptlimited · Feb 9, 2023 · Feb 9, 2023 · Mar 9, 2023 · Mar 9, 2023
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -31,18 +31,18 @@ Please include screenshots of this change. If this issue is only back-end relate
 
 # Checklist:
 
-( * == Mandatory ) 
-
-- [ ] * I have set myself as assignee of the pull request
-- [ ] * My code follows the style guidelines of this project
-- [ ] * Linting does not generate new warnings
-- [ ] * I have performed a self-review of my own code
-- [ ] * I have put the ticket for review, adding the oort-backend team to the list of reviewers
-- [ ] * I have commented my code, particularly in hard-to-understand areas
-- [ ] * I have put JSDoc comment in all required places
-- [ ] * My changes generate no new warnings
-- [ ] * I have included screenshots describing my changes if relevant
-- [ ] * I have selected labels in the Pull Request, according to the changes with code brings
+( \* == Mandatory )
+
+- [ ] - I have set myself as assignee of the pull request
+- [ ] - My code follows the style guidelines of this project
+- [ ] - Linting does not generate new warnings
+- [ ] - I have performed a self-review of my own code
+- [ ] - I have put the ticket for review, adding the oort-backend team to the list of reviewers
+- [ ] - I have commented my code, particularly in hard-to-understand areas
+- [ ] - I have put JSDoc comment in all required places
+- [ ] - My changes generate no new warnings
+- [ ] - I have included screenshots describing my changes if relevant
+- [ ] - I have selected labels in the Pull Request, according to the changes with code brings
 - [ ] I have made corresponding changes to the documentation ( if required )
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] New and existing unit tests pass locally with my changes

diff --git a/.github/workflows/ci.yml b/.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 }}
@@ -71,4 +71,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: deploy_coverage
-          path: coverage
+          path: coverage
diff --git a/.github/workflows/docker-package.yml b/.github/workflows/docker-package.yml
@@ -3,7 +3,7 @@ name: Deploy Docker Image
 on:
   repository_dispatch:
     types: [DOCKER]
-  
+
   workflow_dispatch:
   push:
     branches:
@@ -12,9 +12,9 @@ on:
       - next-major
       - beta
       - alpha
-      - "[0-9]*.[0-9x]*.x"
+      - '[0-9]*.[0-9x]*.x'
       - oort
-      - "[0-9]*.[0-9x]*.x-oort"
+      - '[0-9]*.[0-9x]*.x-oort'
 
   release:
     types: [published]

diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
-    "singleQuote": true,
-    "useTabs": false,
-    "tabWidth": 2
+  "singleQuote": true,
+  "useTabs": false,
+  "tabWidth": 2
 }
diff --git a/.scripts/check-i18n.js b/.scripts/check-i18n.js
@@ -72,7 +72,7 @@ const updateFile = (lang, json) => {
     JSON.stringify(json, null, '\t'),
     (err) => {
       if (err) {
-        throw(err);
+        throw err;
       }
       // else success
     }

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -9,4 +9,4 @@
     "esbenp.prettier-vscode",
     "ms-azuretools.vscode-docker"
   ]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,4 @@
 {
-  "i18n-ally.localesPaths": [
-    "src/i18n"
-  ],
+  "i18n-ally.localesPaths": ["src/i18n"],
   "i18n-ally.keystyle": "nested"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CHANGELOG/CHANGELOG_alpha.md b/CHANGELOG/CHANGELOG_alpha.md
@@ -0,0 +1,16 @@
+# [2.0.0-alpha.11](https://github.com/ReliefApplications/oort-backend/compare/v2.0.0-alpha.10...v2.0.0-alpha.11) (2023-05-16)
+
+### Bug Fixes
+
+- problems regarding calculated fields ([0c457eb](https://github.com/ReliefApplications/oort-backend/commit/0c457eb0b94ee3730e96602b0b09e4df2fbec78e))
+
+### Features
+
+- add manage distribution list permission migration ([03b14c0](https://github.com/ReliefApplications/oort-backend/commit/03b14c0f9309596fc7fec79ca14f3b789250250f))
+- use column width to generate email table ([a1f9c81](https://github.com/ReliefApplications/oort-backend/commit/a1f9c81c366da1d2586b13910b3015827884e63b))
+
+# [2.0.0-alpha.10](https://github.com/ReliefApplications/oort-backend/compare/v2.0.0-alpha.9...v2.0.0-alpha.10) (2023-05-11)
+
+### Bug Fixes
+
+- gis/feature route was broken due to incorrect layout / aggregation setup ([7a3cdd7](https://github.com/ReliefApplications/oort-backend/commit/7a3cdd70457f59ebca31d13ba36b3ea114c6f518))
diff --git a/CHANGELOG/CHANGELOG_beta.md b/CHANGELOG/CHANGELOG_beta.md
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-OORT Back-end
-=======
+# OORT Back-end
+
 [![GitHub version](https://img.shields.io/github/v/release/ReliefApplications/oort-backend)](https://img.shields.io/github/v/release/ReliefApplications/oort-backend)
 [![CodeQL](https://github.com/ReliefApplications/oort-backend/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/ReliefApplications/oort-backend/actions/workflows/codeql-analysis.yml)
 
@@ -11,25 +11,27 @@ It was made for a Proof of Concept of a UI Builder for WHO.
 
 To read more about the project, and how to setup the back-end, please refer to the [documentation of the project](https://gitlab.com/who-ems/ui-doc).
 
-*   [Setup](https://gitlab.com/who-ems/ui-doc#how-to-setup)
-*   [Deployment](https://gitlab.com/who-ems/ui-doc#how-to-deploy)
+- [Setup](https://gitlab.com/who-ems/ui-doc#how-to-setup)
+- [Deployment](https://gitlab.com/who-ems/ui-doc#how-to-deploy)
 
 # Utilities
 
 Docker-compose executes nodemon command, which provides an inspector tool.
 
 9229 port is allocated to back-end inspection. You can use inspector with browser tools.
 
-For Chrome, go to **chrome://inspect)** and click on *inspect* below the remote target.
+For Chrome, go to **chrome://inspect)** and click on _inspect_ below the remote target.
 
 ## Testing
 
 In order to execute tests locally, you can execute the command:
+
 ```
 docker-compose -f docker-compose.test.yml run test-server 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>
 ```
@@ -41,4 +43,3 @@ If management platform is not reachable at 15672, you can use this command ( whi
 ```
 docker-compose exec rabbitmq rabbitmq-plugins enable rabbitmq_management
 ```
-
diff --git a/TODO.md b/TODO.md
@@ -2,8 +2,7 @@
 
 List there all actions to do ( eg: update to perform on some environments when releasing them on different branch ).
 
-## Migration 2.0 -> 2.1
-
-### Routes
-[ ] - Try / catch 500
+## Done in 2.x.x
 
+[ ] - Update of Apollo
+[ ] - Update of CASL
diff --git a/__tests__/jest.setup.ts b/__tests__/jest.setup.ts
@@ -3,7 +3,7 @@ import { startDatabase } from '../src/server/database';
 // Execute before each file.
 beforeAll(async () => {
   await startDatabase({ poolSize: 10 });
-}, 15000);
+}, 20000);
 
 afterAll(async () => {
   //await stopDatabase();
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
         "esbenp.prettier-vscode",
         "ms-azuretools.vscode-docker"
       ]
-    }
+    }