-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
✨ [#4115] Add new source ID and secure GUID
Added to support having different IDs for when the form is finished or aborted
- Loading branch information
1 parent
80885fe
commit 4a39b16
Showing
8 changed files
with
313 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| [ | ||
| { | ||
| "name": "_pk_id.SOURCE_ID.DOMAIN_HASH", | ||
| "name": "_pk_id.SOURCE_ID_FORM_FINISHED.DOMAIN_HASH", | ||
| "path": "/" | ||
| }, | ||
| { | ||
| "name": "_pk_ses.SOURCE_ID.DOMAIN_HASH", | ||
| "name": "_pk_ses.SOURCE_ID_FORM_FINISHED.DOMAIN_HASH", | ||
| "path": "/" | ||
| } | ||
| ] |
141 changes: 141 additions & 0 deletions
141
.../migrations/0007_analyticstoolsconfiguration_govmetric_secure_guid_form_abort_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| # Generated by Django 4.2.11 on 2024-04-12 08:43 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ("analytics_tools", "0006_auto_20240112_1046"), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_form_aborted", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric secure GUID for when a form is aborted - This is an optional value. It is created by KLANTINFOCUS when a list of questions is created. It is a string that is unique per set of questions.", | ||
| max_length=50, | ||
| verbose_name="GovMetric secure GUID form aborted", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_form_finished", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric secure GUID for when a form is finished - This is an optional value. It is created by KLANTINFOCUS when a list of questions is created. It is a string that is unique per set of questions.", | ||
| max_length=50, | ||
| verbose_name="GovMetric secure GUID form finished", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_form_aborted", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric source ID for when a form is aborted - This is created by KLANTINFOCUS when a list of questions is created. It is a numerical value that is unique per set of questions.", | ||
| max_length=10, | ||
| verbose_name="GovMetric source ID form aborted", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_form_finished", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric source ID for when a form is finished - This is created by KLANTINFOCUS when a list of questions is created. It is a numerical value that is unique per set of questions.", | ||
| max_length=10, | ||
| verbose_name="GovMetric source ID form finished", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_form_aborted_en", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric secure GUID for when a form is aborted - This is an optional value. It is created by KLANTINFOCUS when a list of questions is created. It is a string that is unique per set of questions.", | ||
| max_length=50, | ||
| null=True, | ||
| verbose_name="GovMetric secure GUID form aborted", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_form_aborted_nl", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric secure GUID for when a form is aborted - This is an optional value. It is created by KLANTINFOCUS when a list of questions is created. It is a string that is unique per set of questions.", | ||
| max_length=50, | ||
| null=True, | ||
| verbose_name="GovMetric secure GUID form aborted", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_form_finished_en", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric secure GUID for when a form is finished - This is an optional value. It is created by KLANTINFOCUS when a list of questions is created. It is a string that is unique per set of questions.", | ||
| max_length=50, | ||
| null=True, | ||
| verbose_name="GovMetric secure GUID form finished", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_form_finished_nl", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric secure GUID for when a form is finished - This is an optional value. It is created by KLANTINFOCUS when a list of questions is created. It is a string that is unique per set of questions.", | ||
| max_length=50, | ||
| null=True, | ||
| verbose_name="GovMetric secure GUID form finished", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_form_aborted_en", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric source ID for when a form is aborted - This is created by KLANTINFOCUS when a list of questions is created. It is a numerical value that is unique per set of questions.", | ||
| max_length=10, | ||
| null=True, | ||
| verbose_name="GovMetric source ID form aborted", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_form_aborted_nl", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric source ID for when a form is aborted - This is created by KLANTINFOCUS when a list of questions is created. It is a numerical value that is unique per set of questions.", | ||
| max_length=10, | ||
| null=True, | ||
| verbose_name="GovMetric source ID form aborted", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_form_finished_en", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric source ID for when a form is finished - This is created by KLANTINFOCUS when a list of questions is created. It is a numerical value that is unique per set of questions.", | ||
| max_length=10, | ||
| null=True, | ||
| verbose_name="GovMetric source ID form finished", | ||
| ), | ||
| ), | ||
| migrations.AddField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_form_finished_nl", | ||
| field=models.CharField( | ||
| blank=True, | ||
| help_text="Your GovMetric source ID for when a form is finished - This is created by KLANTINFOCUS when a list of questions is created. It is a numerical value that is unique per set of questions.", | ||
| max_length=10, | ||
| null=True, | ||
| verbose_name="GovMetric source ID form finished", | ||
| ), | ||
| ), | ||
| ] |
76 changes: 76 additions & 0 deletions
76
src/openforms/analytics_tools/migrations/0008_convert_ids_govmetric.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # Generated by Django 4.2.11 on 2024-04-12 08:43 | ||
|
|
||
| from django.db import migrations | ||
|
|
||
| from openforms.translations.utils import get_language_codes | ||
|
|
||
|
|
||
| def add_extra_source_id_govmetric(apps, schema_editor): | ||
| AnalyticsToolsConfiguration = apps.get_model( | ||
| "analytics_tools", "AnalyticsToolsConfiguration" | ||
| ) | ||
|
|
||
| config = AnalyticsToolsConfiguration.objects.all().first() | ||
| if not config: | ||
| return | ||
|
|
||
| language_codes = get_language_codes() | ||
|
|
||
| for language_code in language_codes: | ||
| if old_id := getattr(config, f"govmetric_source_id_{language_code}"): | ||
| setattr(config, f"govmetric_source_id_form_aborted_{language_code}", old_id) | ||
| setattr( | ||
| config, f"govmetric_source_id_form_finished_{language_code}", old_id | ||
| ) | ||
|
|
||
| if old_guid := getattr(config, f"govmetric_secure_guid_{language_code}"): | ||
| setattr( | ||
| config, f"govmetric_secure_guid_form_aborted_{language_code}", old_guid | ||
| ) | ||
| setattr( | ||
| config, f"govmetric_secure_guid_form_finished_{language_code}", old_guid | ||
| ) | ||
|
|
||
| config.save() | ||
|
|
||
|
|
||
| def remove_extra_source_id_govmetric(apps, schema_editor): | ||
| AnalyticsToolsConfiguration = apps.get_model( | ||
| "analytics_tools", "AnalyticsToolsConfiguration" | ||
| ) | ||
|
|
||
| config = AnalyticsToolsConfiguration.objects.first() | ||
| if not config: | ||
| return | ||
|
|
||
| language_codes = get_language_codes() | ||
|
|
||
| for language_code in language_codes: | ||
| new_id = getattr( | ||
| config, f"govmetric_source_id_form_finished_{language_code}" | ||
| ) or getattr(config, f"govmetric_source_id_form_aborted_{language_code}") | ||
| if new_id: | ||
| setattr(config, f"govmetric_source_id_{language_code}", new_id) | ||
|
|
||
| new_guid = getattr( | ||
| config, f"govmetric_secure_guid_form_finished_{language_code}" | ||
| ) or getattr(config, f"govmetric_secure_guid_form_aborted_{language_code}") | ||
| if new_guid: | ||
| setattr(config, f"govmetric_secure_guid_{language_code}", new_guid) | ||
|
|
||
| config.save() | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
| dependencies = [ | ||
| ( | ||
| "analytics_tools", | ||
| "0007_analyticstoolsconfiguration_govmetric_secure_guid_form_abort_and_more", | ||
| ), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.RunPython( | ||
| add_extra_source_id_govmetric, remove_extra_source_id_govmetric | ||
| ), | ||
| ] |
37 changes: 37 additions & 0 deletions
37
...ools/migrations/0009_remove_analyticstoolsconfiguration_govmetric_secure_guid_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Generated by Django 4.2.11 on 2024-04-12 09:04 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ("analytics_tools", "0008_convert_ids_govmetric"), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.RemoveField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid", | ||
| ), | ||
| migrations.RemoveField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_en", | ||
| ), | ||
| migrations.RemoveField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_secure_guid_nl", | ||
| ), | ||
| migrations.RemoveField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id", | ||
| ), | ||
| migrations.RemoveField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_en", | ||
| ), | ||
| migrations.RemoveField( | ||
| model_name="analyticstoolsconfiguration", | ||
| name="govmetric_source_id_nl", | ||
| ), | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters