-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: rename infractionType to legalSanction and add administrative s…
…anction to infraction form
- Loading branch information
1 parent
f686009
commit 2899f4b
Showing
23 changed files
with
428 additions
and
137 deletions.
There are no files selected for viewing
8 changes: 4 additions & 4 deletions
8
...main/entities/mission/envAction/envActionControl/infraction/AdministrativeSanctionEnum.kt
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,7 +1,7 @@ | ||
package fr.gouv.cacem.monitorenv.domain.entities.mission.envAction.envActionControl.infraction | ||
|
||
enum class InfractionTypeEnum { | ||
WAITING, | ||
WITH_REPORT, | ||
WITHOUT_REPORT, | ||
enum class AdministrativeSanctionEnum { | ||
SANCTION, | ||
REGULARIZATION, | ||
PENDING, | ||
} |
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
2 changes: 1 addition & 1 deletion
2
...torenv/domain/entities/mission/envAction/envActionControl/infraction/LegalSanctionEnum.kt
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
48 changes: 44 additions & 4 deletions
48
...c/main/resources/db/migration/internal/V0.142__rename_infractionType_to_legalSanction.sql
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,4 +1,44 @@ | ||
CREATE TABLE user_authorizations ( | ||
hashed_email varchar(200) PRIMARY KEY, | ||
is_super_user boolean NOT NULL | ||
); | ||
BEGIN; | ||
|
||
-- Étape 1: Vérifier que "items" contient un tableau et extraire les objets du tableau | ||
WITH decomposed AS (SELECT id, | ||
jsonb_array_elements(value -> 'infractions') AS obj, | ||
value - 'infractions' AS data_without_items | ||
FROM env_actions | ||
WHERE jsonb_typeof(value -> 'infractions') = 'array'), | ||
|
||
-- Étape 2: Modifier chaque objet JSON en remplaçant la clé | ||
updated AS (SELECT id, | ||
obj || | ||
jsonb_build_object('legalSanction', obj -> 'infractionType') - 'infractionType' AS updated_obj, | ||
data_without_items | ||
FROM decomposed), | ||
|
||
-- Étape 3: Recomposer les objets modifiés en un nouveau tableau | ||
recomposed AS (SELECT id, | ||
jsonb_agg(updated_obj) AS new_items, | ||
data_without_items | ||
FROM updated | ||
GROUP BY id, data_without_items), | ||
|
||
-- Étape 4: Inclure les lignes avec des tableaux vides | ||
original_with_empty AS (SELECT id, | ||
value | ||
FROM env_actions | ||
WHERE jsonb_typeof(value -> 'infractions') = 'array' | ||
AND jsonb_array_length(value -> 'infractions') = 0), | ||
|
||
-- Étape 5: Mettre à jour la table avec les nouveaux objets | ||
final_update AS (SELECT recomposed.id, | ||
data_without_items || jsonb_build_object('infractions', new_items) AS new_data | ||
FROM recomposed | ||
UNION ALL | ||
SELECT original_with_empty.id, | ||
original_with_empty.value | ||
FROM original_with_empty) | ||
UPDATE env_actions | ||
SET value = final_update.new_data | ||
FROM final_update | ||
WHERE env_actions.id = final_update.id; | ||
|
||
COMMIT; |
Oops, something went wrong.