From 483c2dac5a2aef549adb34cdf8a2623216cbb39d Mon Sep 17 00:00:00 2001
From: Perrine Letellier <perrine.letellier@pm.me>
Date: Tue, 4 Feb 2025 11:20:06 +0100
Subject: [PATCH 1/2] teleicareId might be null when siccrfId exists

---
 frontend/src/components/DeclarationSummary/index.vue |  4 ++--
 .../CompanyDeclarationsTable.vue                     |  4 ++--
 .../views/DeclarationsHomePage/DeclarationsTable.vue |  6 +++---
 .../InstructionDeclarationsTable.vue                 |  4 ++--
 frontend/src/views/InstructionPage/index.vue         | 12 ++++++------
 frontend/src/views/ProducerFormPage/index.vue        | 10 +++++-----
 frontend/src/views/VisaPage/index.vue                | 10 +++++-----
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/DeclarationSummary/index.vue b/frontend/src/components/DeclarationSummary/index.vue
index b32e9b4a..32249026 100644
--- a/frontend/src/components/DeclarationSummary/index.vue
+++ b/frontend/src/components/DeclarationSummary/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <HistoryBadge v-if="!!payload.teleicareId" class="mb-2" />
+    <HistoryBadge v-if="!!payload.siccrfId" class="mb-2" />
     <ArticleInfoRow
       v-model="payload"
       :hideArticle15Subtypes="!allowArticleChange"
@@ -28,7 +28,7 @@
       <SummaryInfoSegment label="Durabilité minimale / DLUO (en mois)" :value="payload.minimumDuration" />
       <SummaryInfoSegment label="Objectifs / effets" :value="effectsNames" />
     </div>
-    <div v-if="!payload.teleicareId">
+    <div v-if="!payload.siccrfId">
       <h3 class="fr-h6 !mt-8">
         Composition
         <SummaryModificationButton class="ml-4" v-if="!readonly" @click="router.push(editLink(1))" />
diff --git a/frontend/src/views/CompanyDeclarationsPage/CompanyDeclarationsTable.vue b/frontend/src/views/CompanyDeclarationsPage/CompanyDeclarationsTable.vue
index ca36e759..5d185246 100644
--- a/frontend/src/views/CompanyDeclarationsPage/CompanyDeclarationsTable.vue
+++ b/frontend/src/views/CompanyDeclarationsPage/CompanyDeclarationsTable.vue
@@ -23,10 +23,10 @@ const headers = ["ID", "Nom du produit", "Entreprise", "Auteur", "État", "Date
 const rows = computed(() =>
   props.data?.results?.map((x) => ({
     rowData: [
-      x.teleicareId ? x.teleicareId : x.id,
+      x.siccrfId ? (x.teleicareId ? x.teleicareId : "") : x.id,
       {
         component: DeclarationName,
-        withHistoryBadge: !!x.teleicareId,
+        withHistoryBadge: !!x.siccrfId,
         text: x.name,
         to: { name: "DeclarationPage", params: { id: x.id } }, // TODO Change to a more enteprisey view
       },
diff --git a/frontend/src/views/DeclarationsHomePage/DeclarationsTable.vue b/frontend/src/views/DeclarationsHomePage/DeclarationsTable.vue
index 70c281c1..a2b8dffe 100644
--- a/frontend/src/views/DeclarationsHomePage/DeclarationsTable.vue
+++ b/frontend/src/views/DeclarationsHomePage/DeclarationsTable.vue
@@ -39,10 +39,10 @@ const rows = computed(() => {
 
   return props.data.results.map((d) => ({
     rowData: [
-      d.teleicareId ? d.teleicareId : d.id,
+      d.siccrfId ? (d.teleicareId ? d.teleicareId : "") : d.id,
       {
         component: DeclarationName,
-        withHistoryBadge: !!d.teleicareId,
+        withHistoryBadge: !!d.siccrfId,
         text: d.name,
         class: "font-medium",
         to: { name: "DeclarationPage", params: { id: d.id } },
@@ -55,7 +55,7 @@ const rows = computed(() => {
       d.author ? `${d.author.firstName} ${d.author.lastName}` : "",
       getStatusTagForCell(d.status, true),
       timeAgo(d.creationDate),
-      d.teleicareId
+      d.siccrfId
         ? ""
         : {
             component: "router-link",
diff --git a/frontend/src/views/InstructionDeclarationsPage/InstructionDeclarationsTable.vue b/frontend/src/views/InstructionDeclarationsPage/InstructionDeclarationsTable.vue
index 45f4798b..9c2f7809 100644
--- a/frontend/src/views/InstructionDeclarationsPage/InstructionDeclarationsTable.vue
+++ b/frontend/src/views/InstructionDeclarationsPage/InstructionDeclarationsTable.vue
@@ -34,10 +34,10 @@ const rows = computed(() =>
         component: CircleIndicators,
         declaration: x,
       },
-      x.teleicareId ? x.teleicareId : x.id,
+      x.siccrfId ? (x.teleicareId ? x.teleicareId : "") : x.id,
       {
         component: DeclarationName,
-        withHistoryBadge: !!x.teleicareId,
+        withHistoryBadge: !!x.siccrfId,
         text: x.name,
         to: { name: "InstructionPage", params: { declarationId: x.id } },
       },
diff --git a/frontend/src/views/InstructionPage/index.vue b/frontend/src/views/InstructionPage/index.vue
index 8491bcbb..b070ebb5 100644
--- a/frontend/src/views/InstructionPage/index.vue
+++ b/frontend/src/views/InstructionPage/index.vue
@@ -27,15 +27,15 @@
       </DsfrAlert>
       <DeclarationAlert
         class="mb-6"
-        v-else-if="!canInstruct && !declaration.teleicareId"
+        v-else-if="!canInstruct && !declaration.siccrfId"
         role="instructor"
         :declaration="declaration"
         :snapshots="snapshots"
       />
-      <DeclarationFromTeleicareAlert v-else-if="declaration.teleicareId" />
+      <DeclarationFromTeleicareAlert v-else-if="declaration.siccrfId" />
       <div v-if="declaration">
         <DeclarationSummary
-          :allowArticleChange="!declaration.teleicareId"
+          :allowArticleChange="!declaration.siccrfId"
           :useAccordions="true"
           :showElementAuthorization="true"
           :readonly="true"
@@ -62,7 +62,7 @@
               :company="company"
               :snapshots="snapshots"
               @decision-done="onDecisionDone"
-              :allowArticleChange="!declaration.teleicareId"
+              :allowArticleChange="!declaration.siccrfId"
             ></component>
           </DsfrTabContent>
         </DsfrTabs>
@@ -74,7 +74,7 @@
           @forward="selectedTabIndex += 1"
           :removeSaveLabel="true"
         >
-          <template v-slot:content v-if="!declaration.teleicareId">
+          <template v-slot:content v-if="!declaration.siccrfId">
             <h6 class="text-left">
               <v-icon name="ri-pencil-fill"></v-icon>
               Notes à destination de l'administration
@@ -208,7 +208,7 @@ onMounted(async () => {
 // Tab management
 const components = computed(() => {
   const baseComponents = [IdentityTab, DeclarationSummary]
-  if (!declaration.value.teleicareId) baseComponents.push(HistoryTab)
+  if (!declaration.value.siccrfId) baseComponents.push(HistoryTab)
   if (canInstruct.value) baseComponents.push(DecisionTab)
   return baseComponents
 })
diff --git a/frontend/src/views/ProducerFormPage/index.vue b/frontend/src/views/ProducerFormPage/index.vue
index ed8d460b..97fbcb86 100644
--- a/frontend/src/views/ProducerFormPage/index.vue
+++ b/frontend/src/views/ProducerFormPage/index.vue
@@ -15,7 +15,7 @@
     </div>
 
     <div v-else class="mb-4">
-      <DeclarationFromTeleicareAlert v-if="payload.teleicareId" />
+      <DeclarationFromTeleicareAlert v-if="payload.siccrfId" />
       <DeclarationAlert
         v-else-if="payload"
         role="declarant"
@@ -26,7 +26,7 @@
 
       <DsfrAlert
         class="mb-4"
-        v-if="payload.id && !payload.author && !payload.teleicareId"
+        v-if="payload.id && !payload.author && !payload.siccrfId"
         type="info"
         title="Cette déclaration n'est gérée par personne"
       >
@@ -35,7 +35,7 @@
       </DsfrAlert>
       <DsfrAlert
         class="mb-4"
-        v-else-if="payload.author && payload.author !== loggedUser.id && !payload.teleicareId"
+        v-else-if="payload.author && payload.author !== loggedUser.id && !payload.siccrfId"
         type="info"
         title="Cette déclaration est gérée par une autre personne"
       >
@@ -209,9 +209,9 @@ const readonly = computed(
 )
 
 const showHistory = computed(
-  () => !payload.value.teleicareId && (readonly.value || (!isNewDeclaration.value && payload.value.status !== "DRAFT"))
+  () => !payload.value.siccrfId && (readonly.value || (!isNewDeclaration.value && payload.value.status !== "DRAFT"))
 )
-const showWithdrawal = computed(() => !payload.value.teleicareId && payload.value.status === "AUTHORIZED")
+const showWithdrawal = computed(() => !payload.value.siccrfId && payload.value.status === "AUTHORIZED")
 
 const components = computed(() => {
   const baseComponents = readonly.value ? [SummaryTab] : [ProductTab, CompositionTab, AttachmentTab, SummaryTab]
diff --git a/frontend/src/views/VisaPage/index.vue b/frontend/src/views/VisaPage/index.vue
index 715f6e90..25b622fe 100644
--- a/frontend/src/views/VisaPage/index.vue
+++ b/frontend/src/views/VisaPage/index.vue
@@ -24,13 +24,13 @@
       <DeclarationAlert
         role="visor"
         class="mb-4"
-        v-else-if="!declaration.teleicareId"
+        v-else-if="!declaration.siccrfId"
         :declaration="declaration"
         :snapshots="snapshots"
       />
       <div v-if="declaration">
         <DeclarationSummary
-          :allowArticleChange="!declaration.teleicareId"
+          :allowArticleChange="!declaration.siccrfId"
           :useAccordions="true"
           :showElementAuthorization="true"
           :readonly="true"
@@ -47,7 +47,7 @@
           >
             <component
               :is="component"
-              :allowArticleChange="!declaration.teleicareId"
+              :allowArticleChange="!declaration.siccrfId"
               v-model="declaration"
               :externalResults="$externalResults"
               :readonly="true"
@@ -69,7 +69,7 @@
           @forward="selectedTabIndex += 1"
           :removeSaveLabel="true"
         >
-          <template v-slot:content v-if="!declaration.teleicareId">
+          <template v-slot:content v-if="!declaration.siccrfId">
             <h6 class="text-left">
               <v-icon name="ri-pencil-fill"></v-icon>
               Notes à destination de l'administration
@@ -201,7 +201,7 @@ const saveComment = useDebounceFn(async () => {
 // Tab management
 const components = computed(() => {
   const baseComponents = [IdentityTab, DeclarationSummary]
-  if (!declaration.value.teleicareId) baseComponents.push(HistoryTab)
+  if (!declaration.value.siccrfId) baseComponents.push(HistoryTab)
   if (canInstruct.value) baseComponents.push(VisaValidationTab)
   return baseComponents
 })

From d5226a7393f03fbad9eea199a5cd6f16ee274cd5 Mon Sep 17 00:00:00 2001
From: Perrine Letellier <perrine.letellier@pm.me>
Date: Tue, 4 Feb 2025 11:32:46 +0100
Subject: [PATCH 2/2] add siccrf_id to DeclarationSerializer

---
 api/serializers/declaration.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/serializers/declaration.py b/api/serializers/declaration.py
index 42bfdc23..ab62e1eb 100644
--- a/api/serializers/declaration.py
+++ b/api/serializers/declaration.py
@@ -559,6 +559,7 @@ class Meta:
         fields = (
             "id",
             "teleicare_id",
+            "siccrf_id",
             "article",
             "status",
             "author",