Merge branch 'main' into 1304-remove-redis

Signed-off-by: Xavier Jp <xavier.jouppe@beta.gouv.fr>

.env.dev

@@ -15,7 +15,6 @@ MATOMO_SITE_ID=
 MATOMO_API_SITE_ID=
 ALTERNATIVE_SEARCH_ROUTE=
 PROXY_API_KEY=
-REDIS_ENABLED=false
 AGENTCONNECT_CLIENT_ID=
 AGENTCONNECT_CLIENT_SECRET=
 AGENTCONNECT_URL_DISCOVER=https://fca.integ01.dev-agentconnect.fr/api/v2/.well-known/openid-configuration

clients/rge/index.ts

@@ -4,6 +4,7 @@ import stubClientWithSnapshots from '#clients/stub-client-with-snaphots';
 import { INomCertificat, IRGECertification } from '#models/certifications/rge';
 import { Siren } from '#utils/helpers';
 import { httpGet } from '#utils/network';
+import { getCertificatLogoPath } from '../../utils/helpers/certifications/certificats-logo';
 
 type IRGEResponse = {
   results: {
@@ -90,6 +91,7 @@ const mapToDomainObject = (rge: IRGEResponse) => {
         url_qualification = '',
       } = result;
       certifications.push({
+        logoPath: getCertificatLogoPath(nom_certificat),
         codeQualification: code_qualification,
         domaines: [domaine],
         nomCertificat: nom_certificat,

components/labels-and-certificates/rge/index.tsx

@@ -11,7 +11,6 @@ import { IRGECertification } from '#models/certifications/rge';
 import { IUniteLegale } from '#models/core/types';
 import { ISession } from '#models/user/session';
 import React from 'react';
-import { certificatLogo } from './map-certicat-to-logo';
 
 const renovLink = (slug: string) => {
   try {
@@ -115,13 +114,10 @@ export const CertificationsRGESection: React.FC<{
               head={['Certificat', 'Domaine(s) certifié(s)', 'Lien']}
               body={certificationsRGE.certifications.map((certification) => [
                 <div className="font-small layout-left">
-                  {certification.nomCertificat in certificatLogo && (
+                  {certification.logoPath && (
                     <div style={{ width: 72 }}>
                       <img
-                        src={`/images/rge/logo-rge-${
-                          //@ts-ignore
-                          certificatLogo[certification.nomCertificat]
-                        }`}
+                        src={certification.logoPath}
                         alt={`Logo ${certification.nomCertificat}`}
                         title={`Logo ${certification.nomCertificat}`}
                         width="100%"

data/administrations/qualifelec.yml

@@ -4,6 +4,7 @@ long: Qualifelec
 site: https://www.qualifelec.fr/
 contact: https://www.qualifelec.fr/contact/
 estServicePublic: false
+logoType: portrait
 dataSources:
   - label: Liste des entreprises Qualifelec
     apiSlug: api-entreprise

models/certifications/rge.ts

@@ -40,6 +40,7 @@ export interface IRGECertification {
     workingWithIndividual: boolean;
   };
   certifications: {
+    logoPath: string;
     codeQualification: string;
     nomCertificat: INomCertificat;
     domaines: string[];

models/espace-agent/association-protected/index.ts

@@ -56,12 +56,10 @@ export const getAssociationProtected = async (
   maybeSiren: string
 ): Promise<IAssociationProtected | IAPINotRespondingError> => {
   const siren = verifySiren(maybeSiren);
-  const response = clientApiEntrepriseAssociation(siren).catch((error) =>
+  return clientApiEntrepriseAssociation(siren).catch((error) =>
     handleApiEntrepriseError(error, {
       siren,
       apiResource: 'AssociationProtected',
     })
   );
-
-  return response;
 };

models/espace-agent/certificats/qualifelec.ts

@@ -1,7 +1,12 @@
 import { clientApiEntrepriseQualifelec } from '#clients/api-entreprise/qualifelec';
-import { IAPINotRespondingError } from '#models/api-not-responding';
+import { EAdministration } from '#models/administrations/EAdministration';
+import {
+  APINotRespondingFactory,
+  IAPINotRespondingError,
+} from '#models/api-not-responding';
 import { verifySiret } from '#utils/helpers';
 import { handleApiEntrepriseError } from '../utils';
+
 export type IQualifelec = Array<{
   documentUrl: string;
   numero: number;
@@ -44,7 +49,13 @@ export const getQualifelec = async (
   maybeSiret: string
 ): Promise<IQualifelec | IAPINotRespondingError> => {
   const siret = verifySiret(maybeSiret);
-  return clientApiEntrepriseQualifelec(siret).catch((error) =>
-    handleApiEntrepriseError(error, { siret, apiResource: 'Qualifelec' })
-  );
+  return clientApiEntrepriseQualifelec(siret)
+    .then((response) =>
+      response.length === 0
+        ? APINotRespondingFactory(EAdministration.QUALIFELEC, 404)
+        : response
+    )
+    .catch((error) =>
+      handleApiEntrepriseError(error, { siret, apiResource: 'Qualifelec' })
+    );
 };

utils/helpers/certifications/certificats-logo.test.ts

@@ -0,0 +1,26 @@
+import { getCertificatLogoPath } from './certificats-logo';
+
+describe('CertificatLogo works', () => {
+  test('valid certificatss names', () => {
+    expect(getCertificatLogoPath('qualifelec +')).toBe(
+      '/images/rge/logo-rge-qualifelec.jpg'
+    );
+    expect(getCertificatLogoPath('qualipv')).toBe(
+      '/images/rge/logo-rge-qualiPV.jpg'
+    );
+    expect(getCertificatLogoPath('chauffage +')).toBe(
+      '/images/rge/logo-rge-chauffage.jpg'
+    );
+    expect(getCertificatLogoPath('habitat')).toBe(
+      '/images/rge/logo-rge-NF.jpg'
+    );
+  });
+
+  test('Invalids certificates names', () => {
+    expect(getCertificatLogoPath('quali')).toBe('');
+    expect(getCertificatLogoPath('3456')).toBe('');
+    expect(getCertificatLogoPath('chauffage+')).toBe('');
+  });
+});
+
+export {};

utils/helpers/certifications/certificats-logo.ts

@@ -0,0 +1,29 @@
+const certificatsLogo = {
+  qualibat: 'qualibat.jpg',
+  qualifelec: 'qualifelec.jpg',
+  qualipac: 'qualiPAC.jpg',
+  qualibois: 'qualiBois.jpg',
+  opqibi: 'opqibi.jpg',
+  'chauffage +': 'chauffage.jpg',
+  qualipv: 'qualiPV.jpg',
+  ventilation: 'ventillation.jpg',
+  qualisol: 'qualisol.jpg',
+  certibat: 'certibat.jpg',
+  habitat: 'NF.jpg',
+  qualiforage: 'aualiForage.jpg',
+};
+
+/**
+ * match logo path on partial certificats names as several certificates share the same logo
+ *
+ * eg : "Qualibois module Air" and "Qualibois module Eau" => QualiBois.jpg
+ *  */
+
+export const getCertificatLogoPath = (nomCertificat: string) => {
+  for (let [certificateSub, path] of Object.entries(certificatsLogo)) {
+    if ((nomCertificat || '').toLowerCase().indexOf(certificateSub) !== -1) {
+      return `/images/rge/logo-rge-${path}` || '';
+    }
+  }
+  return '';
+};