fix coverage

MTES-MCT · Sep 16, 2024 · 567e14b · 567e14b
1 parent 688d8fd
commit 567e14b
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 7 deletions.
diff --git a/packages/api/src/business/rules/titre-demarche-public-find.ts b/packages/api/src/business/rules/titre-demarche-public-find.ts
@@ -8,6 +8,7 @@ import { titreEtapeForMachineValidator, toMachineEtapes } from '../rules-demarch
 import { titreEtapesSortAscByOrdre } from '../utils/titre-etapes-sort'
 import { titreInModificationEnInstance } from './titre-statut-id-find'
 import { ETAPES_STATUTS, isEtapeStatusRejete } from 'camino-common/src/static/etapesStatuts'
+import { DOMAINES_IDS } from 'camino-common/src/static/domaines'
 const titreDemarchePublicLectureFind = (
   publicLecture: boolean,
   demarcheTypeId: DemarcheTypeId,
@@ -159,7 +160,7 @@ const titreDemarchePublicLectureFind = (
   const domaineId = titreTypeId ? getDomaineId(titreTypeId) : null
   if (
     domaineId &&
-    ['m', 'w', 'c'].includes(domaineId) &&
+    [DOMAINES_IDS.METAUX, DOMAINES_IDS.GRANULATS_MARINS, DOMAINES_IDS.CARRIERES].includes(domaineId) &&
     [
       ETAPES_TYPES.avisDeMiseEnConcurrenceAuJORF,
       ETAPES_TYPES.decisionDeLadministration,

diff --git a/packages/common/src/permissions/entreprises.ts b/packages/common/src/permissions/entreprises.ts
@@ -15,7 +15,7 @@ export const canEditEntreprise = (user: User, entrepriseId?: EntrepriseId): bool
   }
 
   if (isEntreprise(user) || isBureauDEtudes(user)) {
-    return user.entrepriseIds?.includes(entrepriseId) ?? false
+    return user.entrepriseIds.includes(entrepriseId)
   }
 
   return false
@@ -27,7 +27,7 @@ export const canSeeEntrepriseDocuments = (user: User, entrepriseId: EntrepriseId
   }
 
   if (isEntreprise(user) || isBureauDEtudes(user)) {
-    return user.entrepriseIds?.includes(entrepriseId) ?? false
+    return user.entrepriseIds.includes(entrepriseId)
   }
 
   return false

diff --git a/packages/common/src/permissions/etape-form.test.ts b/packages/common/src/permissions/etape-form.test.ts
@@ -1,5 +1,6 @@
-import { expect, test } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import {
+  dateTypeStepIsComplete,
   entrepriseDocumentsStepIsComplete,
   entrepriseDocumentsStepIsVisible,
   etapeAvisStepIsVisible,
@@ -19,6 +20,74 @@ import { toCaminoDate } from '../date'
 import { testBlankUser } from '../tests-utils'
 import { entrepriseIdValidator } from '../entreprise'
 import { communeIdValidator } from '../static/communes'
+import { User } from '../roles'
+import { ADMINISTRATION_IDS } from '../static/administrations'
+
+describe('dateTypeStepIsComplete', () => {
+  test.each<User>([
+    { ...testBlankUser, role: 'super' },
+    { ...testBlankUser, role: 'admin', administrationId: ADMINISTRATION_IDS.BRGM },
+    { ...testBlankUser, role: 'editeur', administrationId: ADMINISTRATION_IDS.BRGM },
+  ])('le date-type est toujours complet pour un %s', user => {
+    expect(
+      dateTypeStepIsComplete(
+        {
+          date: toCaminoDate('2024-01-01'),
+          typeId: 'mfr',
+          statutId: 'fai',
+        },
+        user
+      ).valid
+    ).toBe(true)
+  })
+
+  test('le date-type avec une date, un typeId, et un statutId est complet', () => {
+    const result = dateTypeStepIsComplete(
+      {
+        date: toCaminoDate('2024-01-01'),
+        typeId: 'mfr',
+        statutId: 'fai',
+      },
+      {
+        ...testBlankUser,
+        role: 'super',
+      }
+    )
+    expect(result.valid).toBe(true)
+  })
+
+  test('le date-type avec une date, un typeId, et un statutId est complet', () => {
+    const result = dateTypeStepIsComplete(
+      {
+        date: toCaminoDate('2024-01-01'),
+        typeId: 'mfr',
+        statutId: 'fai',
+      },
+      {
+        ...testBlankUser,
+        role: 'super',
+      }
+    )
+    expect(result.valid).toBe(true)
+  })
+
+  test('le date-type sans date, typeId, ou statutId est incomplet', () => {
+    const result = dateTypeStepIsComplete(
+      {
+        date: null,
+        typeId: null,
+        statutId: null,
+      },
+      {
+        ...testBlankUser,
+        role: 'super',
+      }
+    )
+    expect(result.valid).toBe(false)
+    // @ts-ignore
+    expect(result.errors).toStrictEqual(["La date de l'étape est obligatoire", "Le type de l'étape est obligatoire", "Le statut de l'étape est obligatoire"])
+  })
+})
 
 test('fondamentaleStepIsVisible', () => {
   expect(fondamentaleStepIsVisible('mfr')).toBe(true)

diff --git a/packages/common/vitest.config.ts b/packages/common/vitest.config.ts
@@ -10,10 +10,10 @@ export default defineConfig({
       thresholds: {
         // the endgame is to put thresholds at 100 and never touch it again :)
         autoUpdate: true,
-        branches: 91.01,
+        branches: 91.57,
         functions: 83.46,
-        lines: 96.68,
-        statements: 96.68,
+        lines: 96.73,
+        statements: 96.73,
         perFile: false,
       },
     },

diff --git a/...onents/demarche/demarche-etape.stories_snapshots_DemandeMultipleEntreprisesDocuments.html b/...onents/demarche/demarche-etape.stories_snapshots_DemandeMultipleEntreprisesDocuments.html
@@ -68,6 +68,14 @@
       <div class="fr-text--sm fr-mb-0">Lien public externe</div>
       <div class="fr-text--md fr-mb-0" style="font-weight: 500;"><a target="_blank" rel="noopener noreferrer" href="https://beta.gouv.fr" title="Lien public externe - Lien externe">https://beta.gouv.fr</a></div>
     </div>
+    <div>
+      <div class="fr-text--sm fr-mb-0">Durée en jours de l'enquête publique</div>
+      <div class="fr-text--md fr-mb-0" style="font-weight: 500;">
+        <p>7
+          <!----><span class="fr-info-text fr-mt-0">Du 24-10-2023 au 30-10-2023 (inclus)</span>
+        </p>
+      </div>
+    </div>
     <div style="grid-column: 1 / -1; white-space: pre-line;">
       <div class="fr-text--sm fr-mb-0">Notes</div>
       <div class="fr-text--md fr-mb-0" style="font-weight: 500;">Super note</div>

diff --git a/packages/ui/src/components/demarche/demarche-etape.stories_snapshots_DemandeNoMap.html b/packages/ui/src/components/demarche/demarche-etape.stories_snapshots_DemandeNoMap.html
@@ -68,6 +68,14 @@
       <div class="fr-text--sm fr-mb-0">Lien public externe</div>
       <div class="fr-text--md fr-mb-0" style="font-weight: 500;"><a target="_blank" rel="noopener noreferrer" href="https://beta.gouv.fr" title="Lien public externe - Lien externe">https://beta.gouv.fr</a></div>
     </div>
+    <div>
+      <div class="fr-text--sm fr-mb-0">Durée en jours de l'enquête publique</div>
+      <div class="fr-text--md fr-mb-0" style="font-weight: 500;">
+        <p>7
+          <!----><span class="fr-info-text fr-mt-0">Du 24-10-2023 au 30-10-2023 (inclus)</span>
+        </p>
+      </div>
+    </div>
     <!---->
   </div>
   <!---->