From 0eb79906b08ecf01696a579ab9dc36e927d6643a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Bitard?= <bitard.michael@gmail.com>
Date: Mon, 24 Apr 2023 11:05:58 +0200
Subject: [PATCH] =?UTF-8?q?fix(AEX):=20autorise=20la=20d=C3=A9cision=20imp?=
=?UTF-8?q?licite=20de=20rejet=20tant=20que=20la=20d=C3=A9marche=20de=20pr?=
=?UTF-8?q?olongation=20est=20'd=C3=A9pos=C3=A9e'=20ou=20'en=20instruction?=
=?UTF-8?q?'=20(#527)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.prettierignore | 2 +-
packages/api/.prettierignore | 3 +-
.../business/rules-demarches/axm/pro.cas.json | 137 +-----------------
.../rules-demarches/axm/pro.machine.test.ts | 1 +
.../rules-demarches/axm/pro.machine.ts | 15 +-
.../business/rules-demarches/definitions.ts | 10 --
6 files changed, 12 insertions(+), 156 deletions(-)
diff --git a/.prettierignore b/.prettierignore
index d7731c7df..ebbe6c349 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -11,4 +11,4 @@ packages/api/docs
packages/api/files
packages/api/sources
packages/api/CHANGELOG.md
-
+packages/api/**/*.json
diff --git a/packages/api/.prettierignore b/packages/api/.prettierignore
index ec601c276..43abff40a 100644
--- a/packages/api/.prettierignore
+++ b/packages/api/.prettierignore
@@ -7,6 +7,5 @@ files
node_modules
sources
CHANGELOG.md
-oct.cas.json
-titre-phases-find.cas.json
+**/*.json
**/*.queries.types.ts
\ No newline at end of file
diff --git a/packages/api/src/business/rules-demarches/axm/pro.cas.json b/packages/api/src/business/rules-demarches/axm/pro.cas.json
index e7fbcfd17..9097ae289 100644
--- a/packages/api/src/business/rules-demarches/axm/pro.cas.json
+++ b/packages/api/src/business/rules-demarches/axm/pro.cas.json
@@ -1,136 +1 @@
-[
- {
- "id": 0,
- "demarcheStatutId": "des",
- "demarchePublique": true,
- "etapes": [
- { "date": "2019-01-26", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2019-01-26", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2021-01-31", "etapeTypeId": "des", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 1,
- "demarcheStatutId": "dep",
- "demarchePublique": false,
- "etapes": [
- { "date": "2011-09-25", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2011-09-25", "etapeTypeId": "mdp", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 2,
- "demarcheStatutId": "ins",
- "demarchePublique": true,
- "etapes": [
- { "date": "2021-11-07", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2021-11-08", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2022-04-17", "etapeTypeId": "mcr", "etapeStatutId": "fav" }
- ]
- },
- {
- "id": 3,
- "demarcheStatutId": "dep",
- "demarchePublique": false,
- "etapes": [
- { "date": "2019-10-24", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2019-11-13", "etapeTypeId": "mdp", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 4,
- "demarcheStatutId": "dep",
- "demarchePublique": false,
- "etapes": [
- { "date": "2020-02-06", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2020-02-25", "etapeTypeId": "mdp", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 5,
- "demarcheStatutId": "dep",
- "demarchePublique": false,
- "etapes": [
- { "date": "2022-11-04", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2022-11-07", "etapeTypeId": "mdp", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 6,
- "demarcheStatutId": "cls",
- "demarchePublique": true,
- "etapes": [
- { "date": "2012-06-27", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2012-06-27", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2014-05-20", "etapeTypeId": "css", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 7,
- "demarcheStatutId": "cls",
- "demarchePublique": true,
- "etapes": [
- { "date": "2019-12-10", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2019-12-10", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2022-01-29", "etapeTypeId": "css", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 8,
- "demarcheStatutId": "dep",
- "demarchePublique": false,
- "etapes": [
- { "date": "2023-02-10", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2023-02-10", "etapeTypeId": "mdp", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 9,
- "demarcheStatutId": "dep",
- "demarchePublique": false,
- "etapes": [
- { "date": "2016-10-23", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2016-10-23", "etapeTypeId": "mdp", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 10,
- "demarcheStatutId": "cls",
- "demarchePublique": true,
- "etapes": [
- { "date": "2013-11-09", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2013-11-09", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2015-08-01", "etapeTypeId": "css", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 11,
- "demarcheStatutId": "cls",
- "demarchePublique": true,
- "etapes": [
- { "date": "2020-05-13", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2020-05-14", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2021-11-10", "etapeTypeId": "css", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 12,
- "demarcheStatutId": "des",
- "demarchePublique": true,
- "etapes": [
- { "date": "2017-05-05", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2017-05-05", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2021-05-22", "etapeTypeId": "des", "etapeStatutId": "fai" }
- ]
- },
- {
- "id": 13,
- "demarcheStatutId": "cls",
- "demarchePublique": true,
- "etapes": [
- { "date": "2020-07-16", "etapeTypeId": "mfr", "etapeStatutId": "fai" },
- { "date": "2020-07-16", "etapeTypeId": "mdp", "etapeStatutId": "fai" },
- { "date": "2021-08-30", "etapeTypeId": "css", "etapeStatutId": "fai" }
- ]
- }
-]
+[{"id":0,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2022-11-11","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2022-11-14","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":1,"demarcheStatutId":"des","demarchePublique":true,"etapes":[{"date":"2019-01-17","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2019-01-17","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2021-01-22","etapeTypeId":"des","etapeStatutId":"fai"}]},{"id":2,"demarcheStatutId":"ins","demarchePublique":true,"etapes":[{"date":"2021-11-16","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2021-11-17","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2022-04-26","etapeTypeId":"mcr","etapeStatutId":"fav"}]},{"id":3,"demarcheStatutId":"cls","demarchePublique":true,"etapes":[{"date":"2019-12-21","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2019-12-21","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2022-02-09","etapeTypeId":"css","etapeStatutId":"fai"}]},{"id":4,"demarcheStatutId":"acc","demarchePublique":true,"etapes":[{"date":"2022-02-21","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2022-02-25","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2022-10-25","etapeTypeId":"mcr","etapeStatutId":"fav"},{"date":"2022-10-25","etapeTypeId":"scl","etapeStatutId":"fai"},{"date":"2022-10-25","etapeTypeId":"ssr","etapeStatutId":"fai"},{"date":"2023-02-16","etapeTypeId":"apd","etapeStatutId":"fav"},{"date":"2023-03-16","etapeTypeId":"apo","etapeStatutId":"fav"},{"date":"2023-03-29","etapeTypeId":"dex","etapeStatutId":"acc"}]},{"id":5,"demarcheStatutId":"acc","demarchePublique":true,"etapes":[{"date":"2022-03-23","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2022-03-23","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2022-10-20","etapeTypeId":"mcr","etapeStatutId":"fav"},{"date":"2022-10-20","etapeTypeId":"ssr","etapeStatutId":"fai"},{"date":"2022-10-20","etapeTypeId":"scl","etapeStatutId":"fai"},{"date":"2022-12-04","etapeTypeId":"apd","etapeStatutId":"fav"},{"date":"2023-01-13","etapeTypeId":"apo","etapeStatutId":"fav"},{"date":"2023-01-27","etapeTypeId":"dex","etapeStatutId":"acc"}]},{"id":6,"demarcheStatutId":"cls","demarchePublique":true,"etapes":[{"date":"2012-06-13","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2012-06-13","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2014-05-06","etapeTypeId":"css","etapeStatutId":"fai"}]},{"id":7,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2023-02-15","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2023-02-15","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":8,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2011-09-16","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2011-09-16","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":9,"demarcheStatutId":"rej","demarchePublique":true,"etapes":[{"date":"2019-12-12","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2019-12-12","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2019-12-15","etapeTypeId":"mcr","etapeStatutId":"fav"},{"date":"2022-01-22","etapeTypeId":"dim","etapeStatutId":"rej"}]},{"id":10,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2019-10-06","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2019-10-26","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":11,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2020-02-05","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2020-02-24","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":12,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2022-06-04","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2022-06-04","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":13,"demarcheStatutId":"des","demarchePublique":true,"etapes":[{"date":"2022-03-08","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2022-03-08","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2022-11-05","etapeTypeId":"des","etapeStatutId":"fai"}]},{"id":14,"demarcheStatutId":"dep","demarchePublique":false,"etapes":[{"date":"2016-10-11","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2016-10-11","etapeTypeId":"mdp","etapeStatutId":"fai"}]},{"id":15,"demarcheStatutId":"cls","demarchePublique":true,"etapes":[{"date":"2013-11-18","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2013-11-18","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2015-08-10","etapeTypeId":"css","etapeStatutId":"fai"}]},{"id":16,"demarcheStatutId":"cls","demarchePublique":true,"etapes":[{"date":"2020-05-18","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2020-05-19","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2021-11-15","etapeTypeId":"css","etapeStatutId":"fai"}]},{"id":17,"demarcheStatutId":"des","demarchePublique":true,"etapes":[{"date":"2017-05-01","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2017-05-01","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2021-05-18","etapeTypeId":"des","etapeStatutId":"fai"}]},{"id":18,"demarcheStatutId":"cls","demarchePublique":true,"etapes":[{"date":"2020-06-30","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2020-06-30","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2021-08-14","etapeTypeId":"css","etapeStatutId":"fai"}]},{"id":19,"demarcheStatutId":"acc","demarchePublique":true,"etapes":[{"date":"2022-04-22","etapeTypeId":"mfr","etapeStatutId":"fai"},{"date":"2022-04-28","etapeTypeId":"mdp","etapeStatutId":"fai"},{"date":"2022-12-01","etapeTypeId":"mcr","etapeStatutId":"fav"},{"date":"2022-12-01","etapeTypeId":"scl","etapeStatutId":"fai"},{"date":"2022-12-01","etapeTypeId":"ssr","etapeStatutId":"fai"},{"date":"2023-01-06","etapeTypeId":"apd","etapeStatutId":"fav"},{"date":"2023-01-20","etapeTypeId":"apo","etapeStatutId":"fav"},{"date":"2023-01-29","etapeTypeId":"dex","etapeStatutId":"acc"}]}]
\ No newline at end of file
diff --git a/packages/api/src/business/rules-demarches/axm/pro.machine.test.ts b/packages/api/src/business/rules-demarches/axm/pro.machine.test.ts
index c259d1f2a..5533d41c6 100644
--- a/packages/api/src/business/rules-demarches/axm/pro.machine.test.ts
+++ b/packages/api/src/business/rules-demarches/axm/pro.machine.test.ts
@@ -22,6 +22,7 @@ describe('vérifie l’arbre de prolongation d’AXM', () => {
'FAIRE_DESISTEMENT_DEMANDEUR',
'FAIRE_SAISINE_COLLECTIVITES_LOCALES',
'FAIRE_SAISINE_DES_SERVICES',
+ 'RENDRE_DECISION_IMPLICITE_REJET',
])
})
diff --git a/packages/api/src/business/rules-demarches/axm/pro.machine.ts b/packages/api/src/business/rules-demarches/axm/pro.machine.ts
index 7583da401..937afb60a 100644
--- a/packages/api/src/business/rules-demarches/axm/pro.machine.ts
+++ b/packages/api/src/business/rules-demarches/axm/pro.machine.ts
@@ -223,6 +223,14 @@ const axmProMachine = createMachine<AxmProContext, AXMProXStateEvent>({
cond: context => [DemarchesStatutsIds.Depose, DemarchesStatutsIds.EnInstruction].includes(context.demarcheStatut),
target: 'classementSansSuiteRendu',
},
+ RENDRE_DECISION_IMPLICITE_REJET: {
+ cond: context => [DemarchesStatutsIds.Depose, DemarchesStatutsIds.EnInstruction].includes(context.demarcheStatut),
+ target: 'decisionAnnulationParJugeAdministratifAFaire',
+ actions: assign<AxmProContext, { type: 'RENDRE_DECISION_IMPLICITE_REJET' }>({
+ demarcheStatut: DemarchesStatutsIds.Rejete,
+ visibilite: 'publique',
+ }),
+ },
},
states: {
demandeAFaire: {
@@ -253,13 +261,6 @@ const axmProMachine = createMachine<AxmProContext, AXMProXStateEvent>({
}),
},
FAIRE_RECEVABILITE_DEMANDE_DEFAVORABLE: 'modificationDeLaDemandeAFaire',
- RENDRE_DECISION_IMPLICITE_REJET: {
- target: 'decisionAnnulationParJugeAdministratifAFaire',
- actions: assign<AxmProContext, { type: 'RENDRE_DECISION_IMPLICITE_REJET' }>({
- demarcheStatut: DemarchesStatutsIds.Rejete,
- visibilite: 'publique',
- }),
- },
},
},
complementsPourRecevabiliteAFaire: {
diff --git a/packages/api/src/business/rules-demarches/definitions.ts b/packages/api/src/business/rules-demarches/definitions.ts
index 5759c0152..37b091be9 100644
--- a/packages/api/src/business/rules-demarches/definitions.ts
+++ b/packages/api/src/business/rules-demarches/definitions.ts
@@ -120,16 +120,6 @@ export const demarchesDefinitions: IDemarcheDefinition[] = [
machine: new AxmProMachine(),
dateDebut: toCaminoDate('2000-01-01'),
demarcheIdExceptions: [
- // décision implicite de rejet après recevabilité
- newDemarcheId('nDtwD4ErghwdlL96y6EvpyRF'),
- // manque la demande...
- newDemarcheId('9GenHiIAtrCBUkUZfFP2FBj3'),
- newDemarcheId('yR7n8yXArtiWC6D8V3ipYy9Q'),
- // plein d'étapes à rajouter une fois la machine en place pour qu'elle soit correcte
- newDemarcheId('FxwaBX78A5kJbdTX5ESHKmCg'),
- newDemarcheId('LZHRQZKepqfxBGdc7S4PiZd9'),
- newDemarcheId('XIY81Z57nhPmurZ8E5mVgpux'),
-
// Complète mais ne respectant pas le cacoo
newDemarcheId('Fq6lCWTS6h8k5dAsG6LLm3Gw'),
newDemarcheId('TlqKNgdYzYVrUXieMJAqWYBD'),
--
GitLab