From ed7e07b69a6055b3f603423f8f99a68f2166f874 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <thomashbernard@gmail.com>
Date: Wed, 5 Jun 2024 12:08:58 +0200
Subject: [PATCH] Refactor black powder revolver path

---
 .../e2e/typology-revolver-securing.cy.js       |  2 +-
 frontend/src/components/ResultPage.vue         | 18 +++++++-----------
 frontend/src/utils/firearms-utils/index.ts     | 13 ++++++++++---
 .../pistolet-semi-auto-moderne.ts              |  4 +++-
 frontend/src/utils/firearms-utils/revolver.ts  | 17 ++++++++---------
 .../GuideIdentificationFirearm.vue             | 11 ++++++-----
 .../SecuringAchievement.vue                    |  4 ++--
 .../SecuringSelectOptionContent.vue            | 17 +----------------
 .../SecuringTutorialContent.vue                |  2 +-
 9 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/frontend/cypress/e2e/typology-revolver-securing.cy.js b/frontend/cypress/e2e/typology-revolver-securing.cy.js
index 84528006..ec1ac189 100644
--- a/frontend/cypress/e2e/typology-revolver-securing.cy.js
+++ b/frontend/cypress/e2e/typology-revolver-securing.cy.js
@@ -16,7 +16,7 @@ describe('Typology Revolver Securing', () => {
     cy.contains('h1', 'mise en sécurité')
     cy.contains('p', 'les manipulations sont complexes')
     cy.getByDataTestid('go-to-identification').click()
-    cy.url().should('contain', '/guide-identification/resultat-typologie')
+    cy.url().should('contain', '/guide-identification/resultat-final')
     cy.getByDataTestid('arm-category').should('contain', 'Catégorie D')
   })
 
diff --git a/frontend/src/components/ResultPage.vue b/frontend/src/components/ResultPage.vue
index e3225248..bc55d44b 100644
--- a/frontend/src/components/ResultPage.vue
+++ b/frontend/src/components/ResultPage.vue
@@ -27,17 +27,7 @@ const isFeedbackDone = ref(false)
 
 const label = computed(() => typology?.displayLabel)
 
-const category = computed(() => {
-  if (store.selectedAlarmGun && store.selectedAlarmGun !== '') {
-    return 'D'
-  } else if (isDummy.value) {
-    return 'Non Classée'
-  } else if (typology.displayLabel === 'Revolver') {
-    return typology?.categoryWithoutSecuring
-  } else {
-    return typology?.getCategory(store.gunLength, store.gunBarrelLength)
-  }
-})
+const category = computed(() => isDummy.value ? 'Non Classée' : typology?.getCategory(store.gunLength, store.gunBarrelLength))
 
 const disclaimer = computed(() => typology && Object.hasOwn(typology, 'getDisclaimer') ? typology.getDisclaimer(category.value, isCardDetected.value) : null)
 
@@ -135,6 +125,12 @@ function sendFeedback (isCorrect: boolean) {
               >
                 Arme d'alarme de type {{ label }}
               </h2>
+              <h2
+                v-else-if="store.selectedOptions[0] === 'revolver_black_powder'"
+                class="fr-alert__title"
+              >
+                Revolver à poudre noire
+              </h2>
               <h2
                 v-else
                 class="fr-alert__title"
diff --git a/frontend/src/utils/firearms-utils/index.ts b/frontend/src/utils/firearms-utils/index.ts
index 0ed4d2d2..70581dcd 100644
--- a/frontend/src/utils/firearms-utils/index.ts
+++ b/frontend/src/utils/firearms-utils/index.ts
@@ -1,4 +1,4 @@
-import { revolver, revolver_black_powder } from './revolver'
+import { revolver } from './revolver'
 import { pistolet_semi_auto_moderne } from './pistolet-semi-auto-moderne'
 import { epaule_a_un_coup_par_canon } from './epaule-a-un-coup-par-canon'
 import { epaule_a_verrou } from './epaule-a-verrou'
@@ -11,6 +11,8 @@ import { epaule_mecanisme_ancien } from './epaule_mecanisme_ancien'
 import { pistolet_mecanisme_ancien } from './pistolet-mecanisme-ancien'
 import { autre_pistolet } from './autre-pistolet'
 import { arme_alarme } from './arme-alarme'
+import { useStore } from '@/stores/result'
+const store = useStore()
 
 export const TYPOLOGIES = {
   autre_pistolet,
@@ -24,7 +26,6 @@ export const TYPOLOGIES = {
   pistolet_mecanisme_ancien,
   pistolet_semi_auto_moderne,
   revolver,
-  revolver_black_powder,
   semi_auto_style_militaire_autre,
   arme_alarme,
 } as const
@@ -72,7 +73,13 @@ export const identificationRoutePathsWithArmeAlarme = [
   'resultat-final',
 ] as const
 
-export const ALARM_GUNS_TYPOLOGIES = ['pistolet_semi_auto_moderne', 'revolver']
+export function isAlarmGun () {
+  if (store.selectedOptions[0] === 'revolver_black_powder' || !['pistolet_semi_auto_moderne', 'revolver'].includes(store.typology) || store.selectedAmmo === 'billes') {
+    return false
+  }
+  return store.selectedAlarmGun ? true : undefined
+}
+
 export const MEASURED_GUNS_TYPOLOGIES = [
   'epaule_a_levier_sous_garde',
   'epaule_a_pompe',
diff --git a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
index eca7a3e5..637746d2 100644
--- a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
+++ b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts
@@ -4,6 +4,8 @@ import pistoletSemiAutoTalonImg from '@/assets/guide-mise-en-securite/photos/pis
 import pistoletSemiAutoTalonVideo from '@/assets/guide-mise-en-securite/videos/pistolet_semi_auto_moderne/pistolet_talon.mp4'
 import pistoletSemiAutoModerneCartridges from '@/assets/guide-identification/photos/pistolet_semi_auto_moderne/pistolet_sa_moderne_chargeur_cartouche.jpg'
 import pistoletSemiAutoModerneBalls from '@/assets/guide-identification/photos/pistolet_semi_auto_moderne/pistolet_sa_moderne_chargeur_bille.jpg'
+
+import { isAlarmGun } from '@/utils/firearms-utils/index'
 /*
 Pistolets semi-auto modernes
   Bouton pontet
@@ -11,7 +13,7 @@ Pistolets semi-auto modernes
 */
 export const pistolet_semi_auto_moderne = {
   displayLabel: 'Pistolet semi-automatique',
-  getCategory: () => 'B',
+  getCategory: () => isAlarmGun() ? 'D' : 'B',
   pistolet_semi_auto_moderne_text_option: 'Sélectionner ce que vous voyez sur votre arme : <span class="font-bold">bouton à proximité du pontet du côté gauche de la poignée</span>, OU <span class="font-bold">bouton sur le talon</span> de la crosse.',
   textOptions: '',
   securingSteps: [
diff --git a/frontend/src/utils/firearms-utils/revolver.ts b/frontend/src/utils/firearms-utils/revolver.ts
index b0da961e..b3bb5bfd 100644
--- a/frontend/src/utils/firearms-utils/revolver.ts
+++ b/frontend/src/utils/firearms-utils/revolver.ts
@@ -18,6 +18,11 @@ import revolver31892Img from '@/assets/guide-mise-en-securite/photos/revolver/re
 import revolver31892Video from '@/assets/guide-mise-en-securite/videos/revolver/revolver_1892.mp4'
 import revolverCartridges from '@/assets/guide-identification/photos/revolver/revolver_cartouche_pleine.jpg'
 import revolverBalls from '@/assets/guide-identification/photos/revolver/revolver_cartouche_bille.jpg'
+
+import { isAlarmGun } from '@/utils/firearms-utils/index'
+import { useStore } from '@/stores/result'
+const store = useStore()
+
 /*
 Revolvers
   Revolver Enfield - Webley - brisure
@@ -30,8 +35,7 @@ Revolvers
 */
 export const revolver = {
   displayLabel: 'Revolver',
-  getCategory: () => 'B',
-  categoryWithoutSecuring: 'B ou D',
+  getCategory: () => isAlarmGun() || store.selectedOptions[0] === 'revolver_black_powder' ? 'D' : 'B ou D',
   securingSteps: [
     {
       text: 'En maintenant l’arme dans une  <span class="font-bold">direction sécurisée</span> , sélectionnez ce que vous voyez.',
@@ -175,14 +179,9 @@ export const revolver = {
       img_ammo: revolverBalls,
     },
   ],
-  getDisclaimer: (category: string) => {
-    if (category === 'D') {
+  getDisclaimer: () => {
+    if (isAlarmGun()) {
       return 'Les <strong>armes d’alarmes</strong> sont susceptibles d’être <strong>modifiées pour tirer des munitions létales</strong>. Pour des raisons de sécurité, <strong>faites si possible expertiser l’arme.</strong>'
     }
   },
 } as const
-
-export const revolver_black_powder = {
-  displayLabel: 'Revolver à poudre noire',
-  getCategory: () => 'D',
-} as const
diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
index 0f1e9ec2..a3b18236 100644
--- a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
+++ b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
@@ -6,7 +6,7 @@ import {
   identificationGuideSteps,
   identificationGuideStepsWithArmeAlarme,
   TYPOLOGIES,
-  ALARM_GUNS_TYPOLOGIES,
+  isAlarmGun,
 } from '@/utils/firearms-utils/index'
 import { useStore } from '@/stores/result'
 
@@ -22,7 +22,7 @@ const isLowConfidence = confidenceLevel.value === 'low'
 
 const steps = computed(() => {
   if (TYPOLOGIES[typology]?.dummyOptions || !isLowConfidence) {
-    if (ALARM_GUNS_TYPOLOGIES.includes(store.typology) && store.selectedAmmo === 'cartouches') {
+    if (isAlarmGun() !== false) {
       return ['Typologie de l\'arme', 'Compléments', 'Typologie de munitions', 'Identification d\'une arme d\'alarme', 'Résultat final']
     } else {
       return ['Typologie de l\'arme', 'Compléments', 'Typologie de munitions', 'Résultat final']
@@ -80,7 +80,7 @@ const nextStepButtonAction = () => {
 
 function handlePreviousButtonClick () {
   currentStep.value--
-  if (ALARM_GUNS_TYPOLOGIES.includes(typology.value)) {
+  if (isAlarmGun() !== false) {
     goToNewRouteWithArmeAlarme()
   } else {
     goToNewRoute()
@@ -95,7 +95,7 @@ const showDiv = ref(false)
   <div class="mt-5 fr-container">
     <div class="result fr-col-11 fr-col-lg-6 mx-auto">
       <StepsGuide
-        v-if="TYPOLOGIES[typology]?.dummyOptions"
+        v-if="TYPOLOGIES[typology]?.dummyOptions && store.selectedOptions[0] !== 'revolver_black_powder'"
         class="!fr-container my-auto"
         :steps="steps"
         :current-step="currentStep"
@@ -117,6 +117,7 @@ const showDiv = ref(false)
         @click="$router.push({name: 'StartPage'})"
       />
       <DsfrButton
+        v-if="store.selectedOptions[0] !== 'revolver_black_powder'"
         class="mt-3 flex justify-center !w-full"
         label="Retourner à l'étape précédente"
         icon="ri-arrow-go-back-fill"
@@ -127,7 +128,7 @@ const showDiv = ref(false)
     </div>
   </div>
   <div
-    v-else-if="ALARM_GUNS_TYPOLOGIES.includes(typology) && route.path === '/guide-identification/munition-type'"
+    v-else-if="isAlarmGun() !== false && route.path === '/guide-identification/munition-type'"
     class="footer content z-1"
   >
     <div
diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
index b2a55a58..dbe822de 100644
--- a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
+++ b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
@@ -15,14 +15,14 @@ function goToMissingCardPageIfMissing () {
   if (isCardDetected.value === false && MEASURED_GUNS_TYPOLOGIES.includes(typology.value)) {
     return 'MissingCard'
   }
-  return 'IdentificationTypologyResult'
+  return store.selectedOptions[0] !== 'revolver_black_powder' ? 'IdentificationTypologyResult' : 'IdentificationFinalResult'
 }
 </script>
 
 <template>
   <div class="fr-container">
     <div class="result fr-col-11 fr-col-lg-6 m-auto">
-      <div v-if="TYPOLOGIES[typology]?.securingSteps">
+      <div v-if="TYPOLOGIES[typology]?.securingSteps && store.selectedOptions[0] !== 'revolver_black_powder'">
         <h1 class="mt-5 text-center">
           Fin de la mise en sécurité de l’arme
         </h1>
diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue b/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue
index e7a17954..026c3aa3 100644
--- a/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue
+++ b/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue
@@ -1,15 +1,12 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 
-import { useRouter } from 'vue-router'
-
 import { useStore } from '@/stores/result'
 import { TYPOLOGIES } from '@/utils/firearms-utils/index'
 
 import AskingExpert from '@/components/AskingExpert.vue'
 import SecuringFooter from './SecuringFooter.vue'
 
-const router = useRouter()
 const props = defineProps<{
   step: 1 | 2 | 3
 }>()
@@ -35,13 +32,6 @@ const zoomOn = (imgValue: string) => {
   zoom.value = imgValue
 }
 
-function updateTypology () {
-  if (props.step === 1 && selectedOptionValue.value === 'revolver_black_powder') {
-    // Remember if it is a revolver with black powder
-    store.typology = selectedOptionValue.value
-  }
-}
-
 const nextTo = computed(() => {
   if (typology.displayLabel === 'Revolver') {
     if (props.step === 1) {
@@ -72,11 +62,6 @@ const nextTo = computed(() => {
   }
 })
 
-function nextClick () {
-  updateTypology()
-  router.push(nextTo.value)
-}
-
 </script>
 
 <template>
@@ -162,7 +147,7 @@ function nextClick () {
     <SecuringFooter
       :next-disabled="disabledValidation"
       @back-click="$router.back()"
-      @next-click="nextClick"
+      @next-click="$router.push(nextTo)"
     />
   </div>
 </template>
diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue b/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue
index 5d09e686..8c2d54f7 100644
--- a/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue
+++ b/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue
@@ -15,7 +15,7 @@ const typology = TYPOLOGIES[store.typology]
 // Tutorial object from last selected option
 const selectedOption = computed(() => {
   if (typology.securingSteps[0].text) {
-    return typology.securingSteps.at(store.selectedOptions.length - 1).options.find((option) => option.value === store.selectedOptions.at(-1))
+    return typology.securingSteps[store.selectedOptions.length - 1].options.find((option) => option.value === store.selectedOptions.at(-1))
   }
   return typology.securingSteps[0].options[0]
 })