Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FA: statut “à venir” par défaut à la création d’une fiche action #3248

Merged
merged 2 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 3 additions & 67 deletions data_layer/sqitch/deploy/plan_action/fiches.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,74 +2,10 @@

BEGIN;

-- Ajoute les computed fields pour filtrer les fiche actions
-- 👇
-- Modifie la valeur par défaut du champ 'statut' de la table 'fiche_action'

CREATE OR REPLACE FUNCTION public.fiche_action_service_tag(public.fiches_action)
RETURNS SETOF public.fiche_action_service_tag
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_service_tag
WHERE fiche_id = $1.id
;
END;
ALTER TABLE public.fiche_action
ALTER COLUMN statut SET DEFAULT 'À venir'::public.fiche_action_statuts;

CREATE OR REPLACE FUNCTION public.fiche_action_structure_tag(public.fiches_action)
RETURNS SETOF public.fiche_action_structure_tag
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_structure_tag
WHERE fiche_id = $1.id
;
END;

CREATE OR REPLACE FUNCTION public.fiche_action_personne_tag(public.fiches_action)
RETURNS SETOF public.fiche_action_pilote
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_pilote
WHERE fiche_id = $1.id
;
END;


CREATE OR REPLACE FUNCTION public.fiche_action_pilote(public.fiches_action)
RETURNS SETOF public.fiche_action_pilote
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_pilote
WHERE fiche_id = $1.id
;
END;

CREATE OR REPLACE FUNCTION public.fiche_action_axe(public.fiches_action)
RETURNS SETOF public.axe
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT axe.*
FROM public.fiche_action_axe
JOIN public.axe ON fiche_action_axe.axe_id = axe.id
WHERE fiche_action_axe.fiche_id = $1.id
;
END;

COMMIT;
75 changes: 75 additions & 0 deletions data_layer/sqitch/deploy/plan_action/fiches@v3.6.0.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
-- Deploy tet:plan_action/fiches to pg

BEGIN;

-- Ajoute les computed fields pour filtrer les fiche actions
-- 👇

CREATE OR REPLACE FUNCTION public.fiche_action_service_tag(public.fiches_action)
RETURNS SETOF public.fiche_action_service_tag
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_service_tag
WHERE fiche_id = $1.id
;
END;

CREATE OR REPLACE FUNCTION public.fiche_action_structure_tag(public.fiches_action)
RETURNS SETOF public.fiche_action_structure_tag
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_structure_tag
WHERE fiche_id = $1.id
;
END;

CREATE OR REPLACE FUNCTION public.fiche_action_personne_tag(public.fiches_action)
RETURNS SETOF public.fiche_action_pilote
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_pilote
WHERE fiche_id = $1.id
;
END;


CREATE OR REPLACE FUNCTION public.fiche_action_pilote(public.fiches_action)
RETURNS SETOF public.fiche_action_pilote
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT *
FROM public.fiche_action_pilote
WHERE fiche_id = $1.id
;
END;

CREATE OR REPLACE FUNCTION public.fiche_action_axe(public.fiches_action)
RETURNS SETOF public.axe
LANGUAGE SQL
STABLE
SECURITY DEFINER
SET search_path TO ''
BEGIN ATOMIC
SELECT axe.*
FROM public.fiche_action_axe
JOIN public.axe ON fiche_action_axe.axe_id = axe.id
WHERE fiche_action_axe.fiche_id = $1.id
;
END;

COMMIT;
9 changes: 4 additions & 5 deletions data_layer/sqitch/revert/plan_action/fiches.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

BEGIN;

DROP FUNCTION public.fiche_action_service_tag(public.fiches_action);
DROP FUNCTION public.fiche_action_structure_tag(public.fiches_action);
DROP FUNCTION public.fiche_action_personne_tag(public.fiches_action);
DROP FUNCTION public.fiche_action_pilote(public.fiches_action);
DROP FUNCTION public.fiche_action_axe(public.fiches_action);
-- Enlève la valeur par défaut du champ 'statut' de la table 'fiche_action'

ALTER TABLE public.fiche_action
ALTER COLUMN statut DROP DEFAULT;

COMMIT;
11 changes: 11 additions & 0 deletions data_layer/sqitch/revert/plan_action/fiches@v3.6.0.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
-- Deploy tet:plan_action/fiches to pg

BEGIN;

DROP FUNCTION public.fiche_action_service_tag(public.fiches_action);
DROP FUNCTION public.fiche_action_structure_tag(public.fiches_action);
DROP FUNCTION public.fiche_action_personne_tag(public.fiches_action);
DROP FUNCTION public.fiche_action_pilote(public.fiches_action);
DROP FUNCTION public.fiche_action_axe(public.fiches_action);

COMMIT;
3 changes: 3 additions & 0 deletions data_layer/sqitch/sqitch.plan
Original file line number Diff line number Diff line change
Expand Up @@ -677,3 +677,6 @@ indicateur/filtre [indicateur/filtre@v3.5.0] 2024-06-25T09:00:01Z Frederic Arnou
@v3.6.0 2024-06-25T13:27:12Z Frederic Arnoux <frederic.arnoux@beta.gouv.fr> # Supprime la vérification de droits sur les axes liés aux indicateurs.\nCette vérification est par ailleurs déjà faite sur la vue indicateur_definitions qui l'utilise.\nCette suppression permet de corriger le filtre des indicateurs par plan action.

indicateur/filtre [indicateur/filtre@v3.6.0] 2024-06-25T15:16:51Z Frederic Arnoux <frederic.arnoux@beta.gouv.fr> # Ajoute des indexes pour améliorer la performance des requêtes de filtrage des indicateurs
plan_action/fiches [plan_action/fiches@v3.6.0] 2024-07-02T09:46:13Z Frederic Arnoux <frederic.arnoux@beta.gouv.fr> # Crée une Fiche Action avec le statut "à venir" par défaut
@v3.7.0 2024-07-02T13:19:49Z Frederic Arnoux <frederic.arnoux@beta.gouv.fr> # Crée une Fiche Action avec le statut "à venir" par défaut

5 changes: 5 additions & 0 deletions data_layer/sqitch/verify/plan_action/fiches@v3.6.0.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Verify tet:plan_action/fiches on pg

BEGIN;

ROLLBACK;
Loading