Small improvements

.husky/commit-msg

@@ -1,4 +1,2 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
 npx --no-install commitlint --edit $1

.husky/pre-commit

@@ -1,4 +1,2 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
 node_modules/.bin/lint-staged

api/controllers/v1/document/delete.js

@@ -56,15 +56,20 @@ module.exports = async (req, res) => {
 
   if (deletePermanently) {
     await TDocument.update({ redirectTo: documentId }).set({
+      dateReviewed: new Date(), // Avoid a uniqueness error
       redirectTo: shouldMergeInto ? mergeIntoId : null,
     });
-    await TDocument.update({ parent: documentId }).set({
-      parent: shouldMergeInto ? mergeIntoId : null,
-    });
+    await TDocument.update({ parent: documentId })
+      .set({
+        dateReviewed: new Date(), // Avoid a uniqueness error
+        parent: shouldMergeInto ? mergeIntoId : null,
+      })
+      .meta({ fetch: false });
     await HDocument.update({ parent: documentId }).set({
       parent: shouldMergeInto ? mergeIntoId : null,
     });
-    await TDocument.update({ authorizationDocument: null }).set({
+    await TDocument.update({ authorizationDocument: documentId }).set({
+      dateReviewed: new Date(), // Avoid a uniqueness error
       authorizationDocument: null,
     });
 

api/controllers/v1/partner/find-for-carousel.js

@@ -2,42 +2,38 @@ const ControllerService = require('../../../services/ControllerService');
 const { toOrganization } = require('../../../services/mapping/converters');
 const { toListFromController } = require('../../../services/mapping/utils');
 
-module.exports = (req, res) => {
+module.exports = async (req, res) => {
   let skip = 0;
+  let limit = 50;
   if (req.param('skip')) {
     skip = req.param('skip');
   }
-  let limit = 30;
   if (req.param('limit')) {
     limit = req.param('limit');
   }
-  TGrotto.find({ select: ['id', 'pictureFileName', 'customMessage'] })
-    .skip(skip)
-    .limit(limit)
-    .sort('id ASC')
+  const found = await TGrotto.find({
+    select: ['id', 'pictureFileName', 'customMessage'],
+  })
     .where({
-      customMessage: {
-        '!=': null,
-      },
-      pictureFileName: {
-        '!=': '',
-      },
+      customMessage: { '!=': null },
+      pictureFileName: { '!=': '' },
       isOfficialPartner: '1',
     })
+    .skip(skip)
+    .limit(limit)
     .sort('id ASC')
-    .populate('names')
-    .exec((err, found) => {
-      const params = {};
-      params.controllerMethod = 'PartnerController.findForCarousel';
-      params.notFoundMessage = 'No partners found.';
-      return ControllerService.treatAndConvert(
-        req,
-        err,
-        found,
-        params,
-        res,
-        (data, meta) =>
-          toListFromController('organization', data, toOrganization, { meta })
-      );
-    });
+    .populate('names');
+
+  return ControllerService.treatAndConvert(
+    req,
+    null,
+    found,
+    {
+      controllerMethod: 'PartnerController.findForCarousel',
+      notFoundMessage: 'No partners found.',
+    },
+    res,
+    (data, meta) =>
+      toListFromController('organization', data, toOrganization, { meta })
+  );
 };

api/services/NotificationService.js

@@ -1,4 +1,5 @@
 const NameService = require('./NameService');
+const CommonService = require('./CommonService');
 
 const NOTIFICATION_ENTITIES = {
   CAVE: 'cave',
@@ -22,6 +23,11 @@ const NOTIFICATION_TYPES = {
   RESTORE: 'RESTORE',
 };
 
+async function removeOlderNotifications() {
+  const query = `DELETE FROM t_notification WHERE date_inscription < current_timestamp - interval '2 month';`;
+  await CommonService.query(query);
+}
+
 const safeGetPropId = (prop, data) => {
   if (data && data[prop]) {
     if (data[prop] instanceof Object) {
@@ -470,6 +476,11 @@ module.exports = {
           return true;
         })
       );
+
+      // 5% chance to also remove older notifications
+      if (process.env.NODE_ENV !== 'test' && Math.random() < 0.05)
+        removeOlderNotifications();
+
       return res;
     } catch (error) {
       // Fail silently to avoid sending an error to the user