feat: lbac 1738 exposition pass (#828)

* feat: mix job description according to avail. data * fix: employerDescription is only matcha * fix: yarnlock & prettier * fix: open api schema * feat: extract constant
mission-apprentissage · Nov 20, 2023 · 82d7105 · 82d7105
1 parent 526f220
commit 82d7105
Show file tree

Hide file tree

Showing 11 changed files with 2,309 additions and 1,866 deletions.
diff --git a/server/src/http/utils/validators.ts b/server/src/http/utils/validators.ts
@@ -30,8 +30,8 @@ export function siretSchema() {
         error.code === "string.base"
           ? `Error: schema not valid : ValidationError: ${error.key} must be a string`
           : error.value
-          ? `Error: schema not valid : ValidationError: ${error.key} must follow Luhn algorithm`
-          : `Error: schema not valid : ValidationError: empty ${error.key}`
+            ? `Error: schema not valid : ValidationError: ${error.key} must follow Luhn algorithm`
+            : `Error: schema not valid : ValidationError: empty ${error.key}`
       )
     })
 }

diff --git a/server/src/jobs/seed/referentielRome/referentielRome.seed.ts b/server/src/jobs/seed/referentielRome/referentielRome.seed.ts
@@ -17,33 +17,33 @@ const formatRawData = ({ appellations, competences, contextes_travail, mobilites
       savoir_faire: isNull(competences.savoir_faire.enjeux)
         ? null
         : isArray(competences.savoir_faire.enjeux.enjeu)
-        ? competences.savoir_faire.enjeux.enjeu.map((x) => x)
-        : competences.savoir_faire.enjeux.enjeu,
+          ? competences.savoir_faire.enjeux.enjeu.map((x) => x)
+          : competences.savoir_faire.enjeux.enjeu,
       savoir_etre_professionnel: isNull(competences.savoir_etre_professionnel.enjeux)
         ? null
         : isObject(competences.savoir_etre_professionnel.enjeux.enjeu)
-        ? isArray(competences.savoir_etre_professionnel.enjeux.enjeu.items.item)
-          ? competences.savoir_etre_professionnel?.enjeux?.enjeu?.items?.item?.map((x) => x)
-          : competences.savoir_etre_professionnel.enjeux.enjeu
-        : null,
+          ? isArray(competences.savoir_etre_professionnel.enjeux.enjeu.items.item)
+            ? competences.savoir_etre_professionnel?.enjeux?.enjeu?.items?.item?.map((x) => x)
+            : competences.savoir_etre_professionnel.enjeux.enjeu
+          : null,
       savoirs: isNull(competences.savoirs.categories)
         ? null
         : isArray(competences.savoirs.categories.categorie)
-        ? competences.savoirs.categories && competences.savoirs.categories.categorie.map((x) => x)
-        : competences.savoirs.categories.categorie,
+          ? competences.savoirs.categories && competences.savoirs.categories.categorie.map((x) => x)
+          : competences.savoirs.categories.categorie,
     },
     contextes_travail: isNull(contextes_travail)
       ? null
       : isArray(contextes_travail.type_contexte)
-      ? contextes_travail.type_contexte.map((x) => x)
-      : contextes_travail.type_contexte,
+        ? contextes_travail.type_contexte.map((x) => x)
+        : contextes_travail.type_contexte,
     mobilites: {
       proche: mobilites.proche && mobilites.proche.mobilite,
       si_evolution: isNull(mobilites.si_evolution)
         ? null
         : isArray(mobilites.si_evolution?.mobilite)
-        ? mobilites.si_evolution.mobilite.map((x) => x)
-        : mobilites.si_evolution.mobilite,
+          ? mobilites.si_evolution.mobilite.map((x) => x)
+          : mobilites.si_evolution.mobilite,
     },
   }
 }

diff --git a/server/src/security/authenticationService.ts b/server/src/security/authenticationService.ts
@@ -26,10 +26,10 @@ declare module "fastify" {
 type AuthenticatedUser<AuthScheme extends WithSecurityScheme["securityScheme"]["auth"]> = AuthScheme extends "cookie-session"
   ? UserWithType<"IUserRecruteur", IUserRecruteur>
   : AuthScheme extends "api-key"
-  ? UserWithType<"ICredential", ICredential>
-  : AuthScheme extends "access-token"
-  ? UserWithType<"IAccessToken", IAccessToken>
-  : never
+    ? UserWithType<"ICredential", ICredential>
+    : AuthScheme extends "access-token"
+      ? UserWithType<"IAccessToken", IAccessToken>
+      : never
 
 export const getUserFromRequest = <S extends WithSecurityScheme>(req: Pick<FastifyRequest, "user">, _schema: S): AuthenticatedUser<S["securityScheme"]["auth"]> => {
   if (!req.user) {

diff --git a/server/src/services/lbajob.service.ts b/server/src/services/lbajob.service.ts
@@ -357,7 +357,8 @@ function transformLbaJob({
       diplomaLevel: offre.job_level_label || null,
       job: {
         id: offre._id.toString(),
-        description: offre.job_description || "",
+        description: offre.job_description || null,
+        employeurDescription: offre.job_employer_description || null,
         creationDate: offre.job_creation_date ? new Date(offre.job_creation_date) : null,
         contractType: offre.job_type ? offre.job_type.join(", ") : null,
         jobStartDate: offre.job_start_date ? new Date(offre.job_start_date) : null,

diff --git a/shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap b/shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap
@@ -1403,6 +1403,12 @@ exports[`generateOpenApiSchema > should generate proper schema 1`] = `
               "null",
             ],
           },
+          "employeurDescription": {
+            "type": [
+              "string",
+              "null",
+            ],
+          },
           "id": {
             "type": [
               "string",

diff --git a/shared/models/lbaItem.model.ts b/shared/models/lbaItem.model.ts
@@ -225,6 +225,7 @@ export type ILbaItemCompany = z.output<typeof ZLbaItemCompany>
 const ZLbaItemJob = z
   .object({
     description: z.string().nullable(), // pe -> description | matcha -> description
+    employeurDescription: z.string().nullable().optional(), // matcha -> job.job_employer_description
     creationDate: z.date().nullable(), // pe -> dateCreation | matcha -> createdAt
     id: z.string().nullable(), // pe -> id | matcha -> id mongo offre
     contractType: z.string().nullable(), // pe -> typeContrat | matcha -> offres.type

diff --git a/shared/routes/index.ts b/shared/routes/index.ts
@@ -135,8 +135,8 @@ export const zRoutes: IRoutes = {
 export type IResponse<S extends IRouteSchema> = S["response"][`200`] extends ZodType
   ? Jsonify<z.output<S["response"][`200`]>>
   : S["response"][`2${string}`] extends ZodType
-  ? Jsonify<z.output<S["response"][`2${string}`]>>
-  : never
+    ? Jsonify<z.output<S["response"][`2${string}`]>>
+    : never
 
 export type IBody<S extends IRouteSchemaWrite> = S["body"] extends ZodType ? z.input<S["body"]> : never
 

diff --git a/ui/components/ItemDetail/MatchaComponents/MatchaCustomDescription.tsx b/ui/components/ItemDetail/MatchaComponents/MatchaCustomDescription.tsx
@@ -0,0 +1,33 @@
+import { AddIcon, MinusIcon } from "@chakra-ui/icons"
+import { Accordion, AccordionButton, AccordionItem, AccordionPanel, Box } from "@chakra-ui/react"
+import DOMPurify from "isomorphic-dompurify"
+
+const MatchaCustomDescription = ({ data, title }: { data: string; title: string }) => {
+  const sanitizedData = () => ({
+    __html: DOMPurify.sanitize(data),
+  })
+  return (
+    <Accordion allowToggle>
+      <AccordionItem>
+        {({ isExpanded }) => (
+          <>
+            <AccordionButton fontSize="1rem" fontWeight={700} color="#161616">
+              <Box as="span" flex="1" textAlign="left">
+                {title}
+              </Box>
+              {isExpanded ? <MinusIcon fontSize="10px" /> : <AddIcon fontSize="10px" />}
+            </AccordionButton>
+
+            <AccordionPanel pb={4}>
+              <Box pl="12px" mt={4}>
+                <div dangerouslySetInnerHTML={sanitizedData()} />
+              </Box>
+            </AccordionPanel>
+          </>
+        )}
+      </AccordionItem>
+    </Accordion>
+  )
+}
+
+export default MatchaCustomDescription
diff --git a/ui/components/ItemDetail/MatchaDetail.tsx b/ui/components/ItemDetail/MatchaDetail.tsx
@@ -1,6 +1,7 @@
 import { ExternalLinkIcon } from "@chakra-ui/icons"
 import { Box, Flex, Image, Link, Text } from "@chakra-ui/react"
 import React, { useEffect } from "react"
+import { ILbaItemLbaJob } from "shared"
 
 import { DisplayContext } from "../../context/DisplayContextProvider"
 import { notifyLbaJobDetailView } from "../../services/notifyLbaJobDetailView"
@@ -9,12 +10,53 @@ import { formatDate } from "../../utils/strutils"
 
 import MatchaAcces from "./MatchaComponents/MatchaAcces"
 import MatchaCompetences from "./MatchaComponents/MatchaCompetences"
+import MatchaCustomDescription from "./MatchaComponents/MatchaCustomDescription"
 import MatchaDescription from "./MatchaComponents/MatchaDescription"
 
+const BADDESCRIPTION = 30
+
 const getContractTypes = (contractTypes) => {
   return contractTypes instanceof Array ? contractTypes.join(", ") : contractTypes
 }
 
+const RomeDescriptions = (job) => (
+  <>
+    <MatchaDescription job={job} />
+    <MatchaCompetences job={job} />
+    <MatchaAcces job={job} />
+  </>
+)
+
+const getDescriptionContext = (job: ILbaItemLbaJob) => {
+  const { description, employeurDescription } = job.job
+
+  if ((!description && !employeurDescription) || description.length < BADDESCRIPTION) {
+    return RomeDescriptions(job)
+  }
+
+  if (description && employeurDescription) {
+    return (
+      <>
+        <MatchaCustomDescription data={description} title="Description du Métier" />
+        <MatchaCustomDescription data={employeurDescription} title="Description de l'employeur" />
+      </>
+    )
+  }
+
+  if (description && !employeurDescription) {
+    return <MatchaCustomDescription data={description} title="Description du Métier" />
+  }
+
+  if (!description && employeurDescription) {
+    return (
+      <>
+        {RomeDescriptions(job)}
+        <MatchaCustomDescription data={employeurDescription} title="Description de l'employeur" />
+      </>
+    )
+  }
+}
+
 const MatchaDetail = ({ job }) => {
   useEffect(() => {
     // S'assurer que l'utilisateur voit bien le haut de la fiche au départ
@@ -113,11 +155,7 @@ const MatchaDetail = ({ job }) => {
         <Box pb="0px" mt={6} position="relative" background="white" padding="16px 24px" mx={["0", "30px"]}>
           <Text as="h2" variant="itemDetailH2" mt={2}>{`En savoir plus sur ${job.title}`}</Text>
           <Box data-testid="lbb-component">
-            <Box mb={4}>
-              <MatchaDescription job={job} />
-              <MatchaCompetences job={job} />
-              <MatchaAcces job={job} />
-            </Box>
+            <Box mb={4}>{getDescriptionContext(job)}</Box>
           </Box>
         </Box>
       )}

diff --git a/ui/package.json b/ui/package.json
@@ -26,6 +26,7 @@
     "email-validator": "^2.0.4",
     "formik": "^2.4.5",
     "framer-motion": "^6.5.1",
+    "isomorphic-dompurify": "^1.9.0",
     "jose": "^4.14.6",
     "lodash": "^4.17.21",
     "mapbox-gl": "^2.15.0",