From 297e1bef75c82c8ed87624badb4668ec12e26322 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Wed, 1 Jul 2020 12:31:52 +0200
Subject: [PATCH] [bug] task env_to_db overrides the values set in the UI, even
 if the corresponding variable was not defined in the env file

---
 CHANGELOG.md                |  2 ++
 lib/tasks/fablab/setup.rake | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0874ae740..c1ec0e9f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Ability to run the upgrade without interactions
 - Fix a bug: Unable to access the invoices section if no stripe key was set or incorrect
+- Fix a bug: task env_to_db overrides the values set in the UI, even if the corresponding variable was not defined in the env file
 
 ## v4.5.0 2020 June 30
 
@@ -25,6 +26,7 @@
 - Fix a security issue: updated rack to 2.2.3 to fix [CVE-2020-8184](https://nvd.nist.gov/vuln/detail/CVE-2020-8184)
 - [TODO DEPLOY] add the `POSTGRESQL_LANGUAGE_ANALYZER` environment variable (see [doc/environment.md](doc/environment.md#POSTGRESQL_LANGUAGE_ANALYZER) for configuration details)
 - [TODO DEPLOY] `rails fablab:setup:env_to_db`
+- [TODO DEPLOY] `rails db:seed`
 - [TODO DEPLOY] `\curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/scripts/redis-upgrade.sh | bash`
 - [TODO DEPLOY] -> (only dev) upgrade redis to v6, you may be able to use the script above, depending on your installation
 
diff --git a/lib/tasks/fablab/setup.rake b/lib/tasks/fablab/setup.rake
index 1f2b8c8c6..f1ea0196b 100644
--- a/lib/tasks/fablab/setup.rake
+++ b/lib/tasks/fablab/setup.rake
@@ -106,19 +106,19 @@ namespace :fablab do
       include ApplicationHelper
 
       mapping = [
-        %w[_ PHONE_REQUIRED phone_required true],
+        %w[_ PHONE_REQUIRED phone_required],
         %w[_ GA_ID tracking_id],
-        %w[_ BOOK_SLOT_AT_SAME_TIME book_overlapping_slots true],
-        %w[_ SLOT_DURATION slot_duration 60],
-        %w[_ EVENTS_IN_CALENDAR events_in_calendar false],
-        %w[! FABLAB_WITHOUT_SPACES spaces_module true],
-        %w[! FABLAB_WITHOUT_PLANS plans_module false],
-        %w[! FABLAB_WITHOUT_INVOICES invoicing_module false],
+        %w[_ BOOK_SLOT_AT_SAME_TIME book_overlapping_slots],
+        %w[_ SLOT_DURATION slot_duration],
+        %w[_ EVENTS_IN_CALENDAR events_in_calendar],
+        %w[! FABLAB_WITHOUT_SPACES spaces_module],
+        %w[! FABLAB_WITHOUT_PLANS plans_module],
+        %w[! FABLAB_WITHOUT_INVOICES invoicing_module],
         %w[_ FACEBOOK_APP_ID facebook_app_id],
         %w[_ TWITTER_NAME twitter_analytics],
         %w[_ RECAPTCHA_SITE_KEY recaptcha_site_key],
         %w[_ RECAPTCHA_SECRET_KEY recaptcha_secret_key],
-        %w[_ FEATURE_TOUR_DISPLAY feature_tour_display once],
+        %w[_ FEATURE_TOUR_DISPLAY feature_tour_display],
         %w[_ DEFAULT_MAIL_FROM email_from],
         %w[_ DISQUS_SHORTNAME disqus_shortname],
         %w[_ ALLOWED_EXTENSIONS allowed_cad_extensions],
@@ -126,14 +126,14 @@ namespace :fablab do
         %w[_ OPENLAB_APP_ID openlab_app_id],
         %w[_ OPENLAB_APP_SECRET openlab_app_secret],
         %w[_ OPENLAB_DEFAULT openlab_default],
-        %w[! FABLAB_WITHOUT_ONLINE_PAYMENT online_payment_module false],
+        %w[! FABLAB_WITHOUT_ONLINE_PAYMENT online_payment_module],
         %w[_ STRIPE_PUBLISHABLE_KEY stripe_public_key],
         %w[_ STRIPE_API_KEY stripe_secret_key],
         %w[_ STRIPE_CURRENCY stripe_currency],
         %w[_ INVOICE_PREFIX invoice_prefix FabManager_invoice],
-        %w[_ USER_CONFIRMATION_NEEDED_TO_SIGN_IN confirmation_required false],
-        %w[! FABLAB_WITHOUT_WALLET wallet_module false],
-        %w[! FABLAB_WITHOUT_STATISTICS statistics_module false]
+        %w[_ USER_CONFIRMATION_NEEDED_TO_SIGN_IN confirmation_required],
+        %w[! FABLAB_WITHOUT_WALLET wallet_module],
+        %w[! FABLAB_WITHOUT_STATISTICS statistics_module]
       ]
 
       mapping.each do |m|