From 9d53778409eb436ed4ea97a6893cd916f256c821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20PENHO=C3=8BT?= <fabrice@le-fab-lab.com>
Date: Tue, 22 Sep 2020 16:51:26 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20et=20prise=20en=20compte=20d'une=20vari?=
 =?UTF-8?q?able=20de=20configuration=20de=20l'instance,=20pour=20sp=C3=A9c?=
 =?UTF-8?q?ifier=20la=20valeur=20par=20d=C3=A9faut=20des=20jours=20de=20r?=
 =?UTF-8?q?=C3=A9ception=20des=20envois/mail=20lors=20de=20la=20cr=C3=A9at?=
 =?UTF-8?q?ion=20d'un=20compte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/instance-example.js | 1 +
 controllers/user.js        | 2 +-
 models/Subscription.js     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/instance-example.js b/config/instance-example.js
index bb98e0a..c03c5cf 100644
--- a/config/instance-example.js
+++ b/config/instance-example.js
@@ -16,6 +16,7 @@ module.exports =
     availableLangs: ["fr"],// Languages in which the site is available. The first one is the default one.
     siteName: "WikiLerni",
     beginCodeGodfather: "WL", // case-sensitive and can't contain "@" !
+    defaultReceiptDays: "1234567", // Par défaut, quel(s) jour(s) de la semaine, l'utilisateur reçoit-il quelque chose ? (1=dimanche, 2=lundi... 7=samedi)    
     cronTimingAlertInSeconde: 120, // for logs
     responseTimingAlertInSeconde: 3, // idem
     tokenSignupValidationTimeInHours: "48h", // see : https://github.com/zeit/ms
diff --git a/controllers/user.js b/controllers/user.js
index 6558688..fa7c1c4 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -246,7 +246,7 @@ exports.signupValidation = async (req, res, next) =>
             {
                 const now=new Date();
                 await Promise.all([
-                    db["Subscription"].create({ numberOfDays: config.freeAccountTimingInDays, noticeOk: datas.User.newsletterOk, UserId: datas.User.id }),
+                    db["Subscription"].create({ numberOfDays: config.freeAccountTimingInDays, numberOfDays: config.defaultReceiptDays, noticeOk: datas.User.newsletterOk, UserId: datas.User.id }),
                     db["User"].update({ connectedAt: now }, { where: { id : datas.User.id }, limit:1 })
                     ]);
                 creaUserJson(datas.User.id);
diff --git a/models/Subscription.js b/models/Subscription.js
index 7b7ff48..bac87f7 100644
--- a/models/Subscription.js
+++ b/models/Subscription.js
@@ -27,7 +27,7 @@ module.exports = (sequelize, DataTypes) =>
         },
         receiptDays:
         {
-            type: DataTypes.STRING(7), defaultValue: "23456", // revoir pour passer pour un paramètre de configuration ?
+            type: DataTypes.STRING(7), defaultValue: config.defaultReceiptDays,
             comment: "Days on which the user has chosen to receive new questionnaires. The same numbers as in Mysql's DAYOFWEEK function.",
             set(value) { this.setDataValue("receiptDays", tool.trimIfNotNull(value)); },
             validate: