fix: partenaire multi client api-depot

BaseAdresseNationale · May 6, 2024 · f07aecd · f07aecd
1 parent 1a3112c
commit f07aecd
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 51 deletions.
diff --git a/components/api-depot/client-item.tsx b/components/api-depot/client-item.tsx
@@ -12,15 +12,15 @@ interface ClientItemProps {
   client: ClientApiDepotType;
   mandataire: MandataireApiDepotType;
   chefDeFile: ChefDeFileApiDepotType;
-  partenaire: PartenaireDeLaChartType;
+  partenaires: PartenaireDeLaChartType[];
   isDemo: boolean;
 }
 
 const ClientItem = ({
   client,
   mandataire,
   chefDeFile,
-  partenaire,
+  partenaires,
   isDemo,
 }: ClientItemProps) => (
   <tr>
@@ -47,16 +47,20 @@ const ClientItem = ({
       />
     </td>
     <td className="fr-col fr-my-1v">
-      {partenaire ? (
-        <Link
-          legacyBehavior
-          passHref
-          href={{
-            pathname: `/partenaires-de-la-charte/${partenaire._id}`,
-          }}
-        >
-          {partenaire.name}
-        </Link>
+      {partenaires && partenaires.length > 0 ? (
+        partenaires.map((partenaire) => (
+          <div key={partenaire._id}>
+            <Link
+              legacyBehavior
+              passHref
+              href={{
+                pathname: `/partenaires-de-la-charte/${partenaire._id}`,
+              }}
+            >
+              {partenaire.name}
+            </Link>
+          </div>
+        ))
       ) : (
         <Badge severity="warning">Non partenaire</Badge>
       )}

diff --git a/components/api-depot/clients-list.tsx b/components/api-depot/clients-list.tsx
@@ -92,8 +92,9 @@ const ClientsList = ({ isDemo = false }: ClientsListProps) => {
                 chefDeFile={data.chefsDeFile.find(
                   ({ _id }) => _id === client.chefDeFile
                 )}
-                partenaire={data.partenaires.find(
-                  ({ apiDepotClientId }) => apiDepotClientId === client._id
+                partenaires={data.partenaires.filter(
+                  ({ apiDepotClientId }) =>
+                    apiDepotClientId?.includes(client._id)
                 )}
                 isDemo={isDemo}
               />

diff --git a/components/partenaires-de-la-charte/partenaire-form.tsx b/components/partenaires-de-la-charte/partenaire-form.tsx
@@ -21,7 +21,6 @@ import { MultiSelectInput } from "../multi-select-input";
 import type { CommuneType } from "../commune-input";
 import { CommuneInput } from "../commune-input";
 import SelectInput from "@/components/select-input";
-import Tooltip from "@/components/tooltip";
 import { capitalize } from "@/lib/util/string";
 import AutocompleteInput from "../autocomplete-input";
 import { getClients } from "@/lib/api-depot";
@@ -102,7 +101,7 @@ const newPartenaireForm = {
   infos: "",
   perimeter: "",
   dataGouvOrganizationId: "",
-  apiDepotClientId: "",
+  apiDepotClientId: [],
 };
 
 export const PartenaireForm = ({
@@ -128,16 +127,6 @@ export const PartenaireForm = ({
   >([]);
   const isCandidate = data && !data.signatureDate;
 
-  const clientApiDepotLabel = useMemo(() => {
-    if (optionClients.length > 0 && formData.apiDepotClientId) {
-      return (
-        optionClients.find(({ value }) => value === formData.apiDepotClientId)
-          ?.label || formData.apiDepotClientId
-      );
-    }
-    return formData.apiDepotClientId;
-  }, [optionClients, formData.apiDepotClientId]);
-
   const dataGouvOrganizationLabel = useMemo(() => {
     if (optionOrganizations.length > 0 && formData.dataGouvOrganizationId) {
       return (
@@ -483,12 +472,18 @@ export const PartenaireForm = ({
             />
           </div>
           <div className="fr-col-6">
-            <AutocompleteInput
-              id={uniqueId()}
+
+            <MultiSelectInput
               label="Client api depot ID"
+              value={formData.apiDepotClientId}
               options={optionClients}
-              value={clientApiDepotLabel}
-              onChange={handleEdit("apiDepotClientId")}
+              placeholder="Sélectionnez un ou plusieurs client de l'api-depot"
+              onChange={(apiDepotClientId) => {
+                setFormData((state) => ({
+                  ...state,
+                  apiDepotClientId,
+                }));
+              }}
             />
           </div>
         </div>

diff --git a/components/partenaires-de-la-charte/partenaire-item.tsx b/components/partenaires-de-la-charte/partenaire-item.tsx
@@ -55,27 +55,14 @@ export const PartenaireItem = ({
     </td>
     <td className="fr-col fr-my-1v">
       {dataGouvOrganizationId && (
-        <Link
-          legacyBehavior
-          passHref
-          href={{
-            pathname: `/moissonneur-bal/organizations/${dataGouvOrganizationId}`,
-          }}
-        >
-          <Button priority="secondary">Moissonneur</Button>
-        </Link>
+        <Badge severity="info" noIcon>
+          Organisation Moissonnée
+        </Badge>
       )}
       {apiDepotClientId && (
-        <Link
-          legacyBehavior
-          passHref
-          href={{
-            pathname: `/api-depot/client`,
-            query: { clientId: apiDepotClientId },
-          }}
-        >
-          <Button priority="secondary">Api depot</Button>
-        </Link>
+        <Badge severity="new" noIcon>
+          {apiDepotClientId.length} Client(s) api-depot
+        </Badge>
       )}
     </td>
     <td className="fr-col fr-my-1v">

diff --git a/server/lib/partenaire-de-la-charte/schemas.js b/server/lib/partenaire-de-la-charte/schemas.js
@@ -12,7 +12,7 @@ const createBaseSchema = {
   codeDepartement: { isRequired: false, type: "array" },
   services: { isRequired: false, type: "array" },
   dataGouvOrganizationId: { isRequired: false, type: "string" },
-  apiDepotClientId: { isRequired: false, type: "string" },
+  apiDepotClientId: { isRequired: false, type: "array" },
 };
 
 const createCommuneSchema = {

diff --git a/server/migrations/multi-apiDepotClientId.js b/server/migrations/multi-apiDepotClientId.js
@@ -0,0 +1,27 @@
+const mongoClient = require('../utils/mongo-client')
+
+const collectionName = "partenaires-de-la-charte";
+
+async function main() {
+  await mongoClient.connect()
+
+  const pdlcs = await mongoClient.db.collection(collectionName).find(
+    {apiDepotClientId: {$ne: null}},
+  ).toArray()
+
+  for (const pdlc of pdlcs) {
+    await mongoClient.db.collection(collectionName).updateOne(
+      {_id: pdlc._id},
+      {$set: {apiDepotClientId: [pdlc.apiDepotClientId]}},
+    )
+  }
+
+  await mongoClient.disconnect()
+}
+
+main().catch(error => {
+  console.error(error)
+  process.exit(1)
+}).then(() => {
+  process.exit(0)
+})
diff --git a/types/partenaire-de-la-charte.ts b/types/partenaire-de-la-charte.ts
@@ -35,7 +35,7 @@ export type PartenaireDeLaChartType = {
   charteURL?: string;
   signatureDate?: string;
   dataGouvOrganizationId?: string;
-  apiDepotClientId: string;
+  apiDepotClientId: string[];
 };
 
 export type PartenaireDeLaCharteCommuneType = PartenaireDeLaChartType & {