From 7798ca60fbb5bcae8efd46f8369a88b01cc4390f Mon Sep 17 00:00:00 2001 From: ssorin Date: Thu, 23 Jan 2025 14:55:49 +0100 Subject: [PATCH] =?UTF-8?q?fixup!=20=F0=9F=97=83=EF=B8=8F(dashboard)=20add?= =?UTF-8?q?=20administration=20and=20company=20fields=20to=20consent=20mod?= =?UTF-8?q?el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dashboard.yml | 7 ++++++- env.d/dashboard | 9 ++++++++- src/dashboard/dashboard/settings.py | 10 +++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml index e9aee101..24086c29 100644 --- a/.github/workflows/dashboard.yml +++ b/.github/workflows/dashboard.yml @@ -95,5 +95,10 @@ jobs: DASHBOARD_DB_NAME: test-qualicharge-dashboard DASHBOARD_DATABASE_URL: psql://qualicharge:pass@localhost:5432/test-qualicharge-dashboard DASHBOARD_SECRET_KEY: the_secret_key - DASHBOARD_CONTROL_AUTHORITY: "null" + DASHBOARD_CONTROL_AUTHORITY_NAME: QualiCharge + DASHBOARD_CONTROL_AUTHORITY_ADDRESS_1: 1 rue de test + DASHBOARD_CONTROL_AUTHORITY_ZIP_CODE: 75000 + DASHBOARD_CONTROL_AUTHORITY_CITY: Paris + DASHBOARD_CONTROL_AUTHORITY_REPRESENTED_BY: John Doe + DASHBOARD_CONTROL_AUTHORITY_EMAIL: jdoe@exemple.com DASHBOARD_CONSENT_DONE_AT: Paris diff --git a/env.d/dashboard b/env.d/dashboard index 6e7ab66d..bea190d9 100644 --- a/env.d/dashboard +++ b/env.d/dashboard @@ -20,5 +20,12 @@ DJANGO_SUPERUSER_USERNAME=admin DJANGO_SUPERUSER_EMAIL=admin@example.com # Control authority contact -DASHBOARD_CONTROL_AUTHORITY={"name": "QualiCharge", "address_1": "1 rue de test", "address_2": "", "zip_code": "75000", "city": "Paris", "represented_by": "John Doe", "email": "jdoe@exemple.com"} +DASHBOARD_CONTROL_AUTHORITY_NAME=QualiCharge +DASHBOARD_CONTROL_AUTHORITY_ADDRESS_1=1 rue de test +DASHBOARD_CONTROL_AUTHORITY_ADDRESS_2= +DASHBOARD_CONTROL_AUTHORITY_ZIP_CODE=75000 +DASHBOARD_CONTROL_AUTHORITY_CITY=Paris +DASHBOARD_CONTROL_AUTHORITY_REPRESENTED_BY=John Doe +DASHBOARD_CONTROL_AUTHORITY_EMAIL=jdoe@exemple.com + DASHBOARD_CONSENT_DONE_AT=Paris diff --git a/src/dashboard/dashboard/settings.py b/src/dashboard/dashboard/settings.py index 25bc738b..575f0a38 100644 --- a/src/dashboard/dashboard/settings.py +++ b/src/dashboard/dashboard/settings.py @@ -195,7 +195,15 @@ CONSENT_NUMBER_DAYS_END_DATE = None # `Control authority` contact for consent validation. -CONSENT_CONTROL_AUTHORITY = env.json("CONTROL_AUTHORITY") +CONSENT_CONTROL_AUTHORITY = { + "name": env.str("CONTROL_AUTHORITY_NAME"), + "address_1": env.str("CONTROL_AUTHORITY_ADDRESS_1"), + "address_2": env.str("CONTROL_AUTHORITY_ADDRESS_2", default=""), + "zip_code": env.str("CONTROL_AUTHORITY_ZIP_CODE"), + "city": env.str("CONTROL_AUTHORITY_CITY"), + "represented_by": env.str("CONTROL_AUTHORITY_REPRESENTED_BY"), + "email": env.str("CONTROL_AUTHORITY_EMAIL"), +} CONSENT_DONE_AT = env.str("CONSENT_DONE_AT")