Mise à jour du paquet mesaidesvelo avec le nouveau paquet @betagouv/aides-velo

.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
     labels:
       - dependencies
     allow:
-      - dependency-name: "aides-velo"
+      - dependency-name: "@betagouv/aides-velo"
   - package-ecosystem: "pip"
     directory: "./openfisca"
     schedule:

data/benefits/aides-velo-generator.ts

@@ -1,69 +1,123 @@
-import aidesVelo from "aides-velo"
-import { VeloBenefit } from "../../data/types/benefits.d.js"
-import { Institution } from "../../data/types/institutions.d.js"
-const benefits = [...aidesVelo()]
+import { AidesVeloEngine } from "@betagouv/aides-velo"
+import { VeloBenefit, AidesVeloBenefit } from "../../data/types/benefits.d.js"
+import {
+  Institution,
+  InstitutionsByType,
+} from "../../data/types/institutions.d.js"
 
-function generate_benefit_list(institutions: Institution[]): VeloBenefit[] {
-  const potentialInstitutions = {
+const aidesVeloEngine = new AidesVeloEngine()
+const aidesVelo: AidesVeloBenefit[] = aidesVeloEngine.getAllAidesIn()
+
+const VELO_BENEFIT_DEFAULT_VALUES = {
+  prefix: "l'",
+  type: "float",
+  periodicite: "ponctuelle",
+  interestFlag: "_interetsAidesVelo",
+}
+
+function filterInstitutionsByType(
+  institutions: Institution[]
+): InstitutionsByType {
+  return {
     région: institutions.filter((i) => i.type === "region"),
     département: institutions.filter((i) => i.type === "departement"),
     epci: institutions.filter((i) => i.type === "epci"),
     "code insee": institutions.filter((i) => i.type === "commune"),
   }
+}
+
+function findAidesVeloBenefitMatchingInstitution(
+  benefit: AidesVeloBenefit,
+  institutionsByType: InstitutionsByType
+): string | undefined {
+  const { collectivity } = benefit
+  if (!collectivity) return undefined
+
+  if (collectivity.kind === "pays") return "etat"
+
+  const institutions = institutionsByType[collectivity.kind]
+  if (!institutions) return undefined
 
-  benefits.forEach((b: VeloBenefit) => {
-    if (b && b.collectivity) {
-      switch (b.collectivity.kind) {
-        case "pays": {
-          if (b.collectivity.value === "France") {
-            b.institution = "etat"
-          } else {
-            b.discard = true
-          }
-          break
-        }
-        case "région":
-        case "département":
-        case "code insee": {
-          const institutionList = potentialInstitutions[b.collectivity.kind]
-          b.institution = institutionList.find(
-            (i) => i.code_insee === b.collectivity.value
-          )?.slug
-          break
-        }
-        case "epci": {
-          const institutionList = potentialInstitutions[b.collectivity.kind]
-          b.institution = institutionList.find(
-            (i) => i.code_siren === b.collectivity.code
-          )?.slug
-          break
-        }
-      }
+  const matchingInstitution = institutions.find((institution) => {
+    if (collectivity.kind === "epci") {
+      return institution.code_siren === collectivity.code
     }
+    return institution.code_insee === collectivity.value
   })
 
-  return benefits
-    .filter((b: VeloBenefit) => !b.discard)
-    .map((b: VeloBenefit) => {
-      const description =
-        b.description && !b.description.match(/((\s\$)+|(^\$)+)\w+/)
-          ? b.description
-          : `Aide à l'achat d'un vélo : ${b.title}`
-      return {
-        label: `Aide à l'achat d'un vélo : ${b.title}`,
-        description,
-        id: `aidesvelo_${b.id}`.replace(/[ .']+/g, "_"),
-        external_id: b.id,
-        collectivity: b.collectivity,
-        title: b.title,
-        institution: b.institution,
-        prefix: "l'",
-        type: "float",
-        periodicite: "ponctuelle",
-        link: b.url,
-        interestFlag: "_interetsAidesVelo",
-      }
-    })
+  return matchingInstitution?.slug
 }
 
-export default generate_benefit_list
+function formatAidesVeloBenefitDescription(benefit: AidesVeloBenefit): string {
+  const hasValidDescription =
+    benefit.description && !benefit.description.match(/((\s\$)+|(^\$)+)\w+/)
+  return (
+    (hasValidDescription && benefit.description) ||
+    `Aide à l'achat d'un vélo : ${benefit.title}`
+  )
+}
+
+function buildVeloBenefitLabel(benefit: AidesVeloBenefit): string {
+  let title = "Aide à l'achat d'un vélo"
+
+  const veloTypes = [
+    "musculaire",
+    "mécanique",
+    "électrique",
+    "adapté",
+    "cargo",
+    "pliant",
+  ]
+  const trottinetteTypes = ["trottinette", "trottinette électrique"]
+
+  let types = veloTypes.filter((type) => benefit.description?.includes(type))
+
+  if (types.length > 1) {
+    title += ` (${types.join(", ")})`
+  } else if (types.length === 1) {
+    title += ` ${types[0]}`
+  }
+
+  types = trottinetteTypes.filter((type) => benefit.description?.includes(type))
+
+  if (types.length > 0) {
+    title = title.replace("vélo électrique", "vélo")
+    title += ` ou d'une trottinette électrique`
+  }
+
+  if (benefit.title.includes("Ville de")) {
+    return title
+  }
+
+  return `${title} : ${benefit.title}`
+}
+
+function formatAidesVeloToVeloBenefit(
+  benefit: AidesVeloBenefit,
+  institutionsByType: InstitutionsByType
+): VeloBenefit {
+  return {
+    ...benefit,
+    ...VELO_BENEFIT_DEFAULT_VALUES,
+    label: buildVeloBenefitLabel(benefit),
+    description: formatAidesVeloBenefitDescription(benefit),
+    id: `aidesvelo_${benefit.id}`.replace(/[ .']+/g, "_"),
+    external_id: benefit.id,
+    collectivity: benefit.collectivity,
+    title: benefit.title,
+    link: benefit.url,
+    institution: findAidesVeloBenefitMatchingInstitution(
+      benefit,
+      institutionsByType
+    ),
+  }
+}
+
+export default function generateVeloBenefitList(
+  institutions: Institution[]
+): VeloBenefit[] {
+  const institutionsByType = filterInstitutionsByType(institutions)
+  return aidesVelo.map((benefit: AidesVeloBenefit) =>
+    formatAidesVeloToVeloBenefit(benefit, institutionsByType)
+  )
+}

data/institutions/ca_du_centre_littoral.yml

@@ -0,0 +1,5 @@
+name: Communauté d'agglomération du Centre Littoral
+imgSrc: img/institutions/logo_ca_du_centre_littoral.png
+prefix: de la
+type: epci
+code_siren: "249730045"

data/institutions/cc_du_crestois_et_de_pays_de_saillans_coeur_de_drome.yml

@@ -0,0 +1,5 @@
+name: Communauté de communes du Crestois et de Pays de Saillans Coeur de Drôme
+imgSrc: img/institutions/logo_cc_du_crestois_et_de_pays_de_saillans_coeur_de_drome.png
+prefix: de la
+type: epci
+code_siren: "200040509"

data/institutions/cc_du_haut_vallespir.yml

@@ -0,0 +1,5 @@
+name: Communauté de communes du Haut Vallespir
+imgSrc: img/institutions/logo_cc_du_haut_vallespir.png
+prefix: de la
+type: epci
+code_siren: "246600548"

data/institutions/cc_portes_de_sologne.yml

@@ -0,0 +1,5 @@
+name: Communauté de communes des Portes de Sologne
+imgSrc: img/institutions/logo_cc_portes_de_sologne.png
+prefix: de la
+type: epci
+code_siren: "200005932"

data/institutions/cc_presquile_de_crozon_aulne_maritime.yml

@@ -0,0 +1,5 @@
+name: Communauté de communes Presqu'île de Crozon-Aulne maritime
+imgSrc: img/institutions/logo_cc_presquile_de_crozon_aulne_maritime.png
+prefix: de la
+type: epci
+code_siren: "200066868"

data/institutions/cc_selestat.yml

@@ -0,0 +1,5 @@
+name: Communauté de communes de Sélestat
+imgSrc: img/institutions/logo_cc_selestat.png
+prefix: de la
+type: epci
+code_siren: "246700967"

data/institutions/ville_avignon.yml

@@ -0,0 +1,6 @@
+name: Ville d'Avignon
+imgSrc: img/institutions/logo_ville_avignon.png
+type: commune
+prefix: de la
+code_insee: "84007"
+code_siren: "218400075"

data/institutions/ville_montmorillon.yml

@@ -0,0 +1,6 @@
+name: Ville de Montmorillon
+imgSrc: img/institutions/logo_ville_montmorillon.png
+type: commune
+prefix: de la
+code_insee: "86165"
+code_siren: "218601656"

data/institutions/ville_taillan_medoc.yml

@@ -0,0 +1,6 @@
+name: Ville du Taillan-Médoc
+imgSrc: img/institutions/logo_ville_taillan_medoc.png
+type: commune
+prefix: de la
+code_insee: "33519"
+code_siren: "213305196"

data/types/benefits.d.ts

@@ -1,12 +1,8 @@
 import { Institution } from "./institutions.d.js"
-
-// extends "Aide" type defined in "aides-velo" package
-type Aide = {
-  title: string
-  description: string
-  url: string
-  amount?: number
-}
+import {
+  Aide as AidesVelo,
+  AidesRulesNames as AidesVeloId,
+} from "@betagouv/aides-velo"
 
 export interface Benefit {
   id: string
@@ -16,24 +12,21 @@ export interface Benefit {
   mock?: boolean
 }
 
-export interface VeloBenefit extends Aide {
-  id: string
-  url?: string
-  collectivity: {
-    kind: string
-    value: string
-    code?: string
-  }
-  institution?: string
-
-  discard?: boolean
-
-  source?: string
+export interface AidesVeloBenefit extends AidesVelo {
+  amount?: number
+}
 
+export interface VeloBenefit extends AidesVeloBenefit {
+  id: string | AidesVeloId
+  label: string
+  institution?: string
+  external_id: string
+  type: string
+  periodicite: string
+  prefix: string
+  interestFlag: string
   link?: string
-  external_id?: string
-  type?: string
-  periodicite?: string
+  source?: string
 }
 
 export interface CovoiturageBenefit {

data/types/institutions.d.ts

@@ -23,3 +23,6 @@ export interface Institution extends InstitutionRaw {
 export interface InstitutionsMap {
   [key: string]: Institution
 }
+export interface InstitutionsByType {
+  [key: string]: Institution[]
+}