Merge branch 'release/4.4.0'

ezpaarse-project · Aug 9, 2024 · d99681f · d99681f
2 parents 4fba3e2 + b71161a
commit d99681f
Show file tree

Hide file tree

Showing 46 changed files with 1,671 additions and 408 deletions.
diff --git a/api/config/custom-environment-variables.json b/api/config/custom-environment-variables.json
@@ -14,6 +14,7 @@
     "password": "KIBANA_PASSWORD",
     "port": "EZMESURE_KIBANA_PORT",
     "host": "EZMESURE_KIBANA_HOST",
+    "dateFormat": "EZMESURE_KIBANA_DATE_FORMAT",
     "syncSchedule": "EZMESURE_KIBANA_SYNC_SCHEDULE"
   },
   "redis": {
@@ -61,7 +62,8 @@
       "concurrency": "EZMESURE_HARVEST_CONCURRENCY",
       "maxDeferrals": "EZMESURE_MAX_DEFERRALS",
       "deferralBackoffDuration": "EZMESURE_DEFERRAL_BACKOFF_DURATION",
-      "busyBackoffDuration": "EZMESURE_BUSY_BACKOFF_DURATION"
+      "busyBackoffDuration": "EZMESURE_BUSY_BACKOFF_DURATION",
+      "cancelSchedule": "EZMESURE_HARVEST_CANCEL_SCHEDULE"
     }
   },
   "counter": {

diff --git a/api/config/default.js b/api/config/default.js
@@ -18,6 +18,7 @@ module.exports = {
     password: 'changeme',
     port: 5601,
     host: 'localhost',
+    dateFormat: 'DD MMM YYYY',
     syncSchedule: '0 0 0 * * *',
   },
   redis: {
@@ -77,6 +78,7 @@ module.exports = {
       maxDeferrals: 5,
       deferralBackoffDuration: 10 * oneMinute,
       busyBackoffDuration: 10 * oneMinute,
+      cancelSchedule: '0 0 0 * * *',
     },
   },
   counter: {

diff --git a/api/lib/controllers/files/actions.js b/api/lib/controllers/files/actions.js
@@ -84,6 +84,7 @@ function validateFile(filePath, $t) {
 
 exports.upload = async function upload(ctx) {
   let { fileName } = ctx.request.params;
+  const { user } = ctx.state;
 
   ctx.action = 'file/upload';
 
@@ -93,7 +94,6 @@ exports.upload = async function upload(ctx) {
 
   fileName = fileName.replace(/\s/g, '_');
 
-  const { user } = ctx.state;
   const domain = user.email.split('@')[1];
 
   const relativePath = path.join(domain, user.username, fileName);
@@ -117,9 +117,10 @@ exports.upload = async function upload(ctx) {
   if (result instanceof Error) {
     await fse.unlink(filePath);
     ctx.throw(400, result.message);
-  } else {
-    ctx.status = 204;
+    return;
   }
+
+  ctx.status = 204;
 };
 
 exports.list = async function list(ctx) {

diff --git a/api/lib/controllers/institutions/actions.js b/api/lib/controllers/institutions/actions.js
@@ -232,6 +232,49 @@ exports.updateInstitution = async (ctx) => {
   ctx.body = updatedInstitution;
 };
 
+exports.updateInstitutionSushiReady = async (ctx) => {
+  ctx.action = 'institutions/update';
+  const { institution } = ctx.state;
+  const { body } = ctx.request;
+
+  const origin = ctx.get('origin');
+
+  const wasSushiReady = institution.sushiReadySince;
+
+  ctx.metadata = {
+    institutionId: institution.id,
+    institutionName: institution.name,
+  };
+
+  const updatedInstitution = await (new InstitutionsService()).update({
+    where: { id: institution.id },
+    data: { sushiReadySince: body.value },
+  });
+  appLogger.verbose(`Institution [${institution.id}] is updated`);
+
+  const { sushiReadySince } = updatedInstitution;
+  const sushiReadyChanged = (wasSushiReady && sushiReadySince === null)
+                         || (!wasSushiReady && sushiReadySince);
+
+  if (sushiReadyChanged) {
+    sendMail({
+      from: sender,
+      to: supportRecipients,
+      subject: sushiReadySince ? 'Fin de saisie SUSHI' : 'Reprise de saisie SUSHI',
+      ...generateMail('sushi-ready-change', {
+        institutionName: institution.name,
+        institutionSushiLink: `${origin}/institutions/${institution.id}/sushi`,
+        sushiReadySince,
+      }),
+    }).catch((err) => {
+      appLogger.error(`Failed to send sushi-ready-change mail: ${err}`);
+    });
+  }
+
+  ctx.status = 200;
+  ctx.body = updatedInstitution;
+};
+
 exports.importInstitutions = async (ctx) => {
   ctx.action = 'institutions/import';
   const { body = [] } = ctx.request;

diff --git a/api/lib/controllers/institutions/admin.js b/api/lib/controllers/institutions/admin.js
@@ -1,5 +1,4 @@
 const config = require('config');
-const kibana = require('../../services/kibana');
 
 const { sendMail, generateMail } = require('../../services/mail');
 
@@ -22,27 +21,6 @@ function sendValidateInstitution(receivers) {
   });
 }
 
-exports.getInstitutionState = async (ctx) => {
-  const { institution } = ctx.state;
-
-  const spaces = await institution.getSpaces();
-
-  const patterns = await Promise.all(
-    spaces
-      .filter((space) => space && space.id)
-      .map((space) => kibana.getIndexPatterns({ spaceId: space.id, perPage: 1000 })),
-  );
-
-  ctx.type = 'json';
-  ctx.status = 200;
-  ctx.body = {
-    spaces,
-    indices: await institution.getIndices(),
-    indexPatterns: patterns.reduce((acc, current) => [...acc, ...current], []),
-    roles: await institution.checkRoles(),
-  };
-};
-
 exports.validateInstitution = async (ctx) => {
   const { body = {} } = ctx.request;
   const { value: validated } = body;

diff --git a/api/lib/controllers/institutions/index.js b/api/lib/controllers/institutions/index.js
@@ -20,6 +20,7 @@ const {
   importInstitutions,
   getInstitution,
   updateInstitution,
+  updateInstitutionSushiReady,
 } = require('./actions');
 
 const memberships = require('./memberships');
@@ -33,10 +34,7 @@ const {
   removeSubInstitution,
 } = require('./subinstitutions');
 
-const {
-  getInstitutionState,
-  validateInstitution,
-} = require('./admin');
+const { validateInstitution } = require('./admin');
 
 router.use(sushi.prefix('/:institutionId/sushi').middleware());
 router.use(repositories.prefix('/:institutionId/repositories').middleware());
@@ -111,28 +109,33 @@ router.route({
   },
 });
 
-router.use(requireAdmin);
-
 router.route({
-  method: 'DELETE',
-  path: '/:institutionId',
+  method: 'PUT',
+  path: '/:institutionId/sushiReadySince',
   handler: [
     fetchInstitution(),
-    deleteInstitution,
+    requireMemberPermissions(FEATURES.sushi.write),
+    updateInstitutionSushiReady,
   ],
   validate: {
+    type: 'json',
     params: {
       institutionId: Joi.string().trim().required(),
     },
+    body: {
+      value: Joi.date().allow(null),
+    },
   },
 });
 
+router.use(requireAdmin);
+
 router.route({
-  method: 'GET',
-  path: '/:institutionId/state',
+  method: 'DELETE',
+  path: '/:institutionId',
   handler: [
     fetchInstitution(),
-    getInstitutionState,
+    deleteInstitution,
   ],
   validate: {
     params: {

diff --git a/api/lib/controllers/institutions/sushi/index.js b/api/lib/controllers/institutions/sushi/index.js
@@ -33,4 +33,5 @@ router.route({
     query: standardQueryParams.manyValidation,
   },
 });
+
 module.exports = router;