Merge pull request #137 from etalab/remove_deprecated_pivot_identity_…

…fields Remove deprecated pivot identity fields
etalab · Oct 14, 2024 · 8603209 · 8603209
2 parents 49cc173 + 1a8d5ed
commit 8603209
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/app/jobs/populate_hubee_sandbox_job.rb b/app/jobs/populate_hubee_sandbox_job.rb
@@ -30,7 +30,7 @@ def perform(*args)
   private
 
   def pivot_identity
-    PivotIdentity.new(first_names: ["David"], last_name: "Heinemeier Hansson", birth_country: "99135", birthplace: nil, birthdate: Date.new(1979, 10, 15), gender: :male)
+    PivotIdentity.new(**FranceConnect::IdentityMapper.normalize(original_pivot_identity))
   end
 
   def original_pivot_identity

diff --git a/app/models/shipment_data.rb b/app/models/shipment_data.rb
@@ -11,18 +11,8 @@ def initialize(pivot_identity:, original_pivot_identity:, quotient_familial:, ex
   def to_h
     {
       external_id: external_id,
-      pivot_identity: {
-        codePaysLieuDeNaissance: pivot_identity.birth_country,
-        anneeDateDeNaissance: pivot_identity.birthdate.year,
-        moisDateDeNaissance: pivot_identity.birthdate.month,
-        jourDateDeNaissance: pivot_identity.birthdate.day,
-        codeInseeLieuDeNaissance: pivot_identity.birthplace,
-        prenoms: pivot_identity.first_names,
-        sexe: (pivot_identity.gender == :female) ? "F" : "M",
-        nomUsuel: pivot_identity.last_name,
-        **original_pivot_identity,
-      },
-      quotient_familial:,
+      pivot_identity: original_pivot_identity,
+      quotient_familial: quotient_familial,
     }
   end
 

diff --git a/spec/models/shipment_data_spec.rb b/spec/models/shipment_data_spec.rb
@@ -9,14 +9,6 @@
     {
       external_id: "external_id",
       pivot_identity: {
-        codePaysLieuDeNaissance: "99135",
-        anneeDateDeNaissance: 1979,
-        moisDateDeNaissance: 10,
-        jourDateDeNaissance: 15,
-        codeInseeLieuDeNaissance: nil,
-        prenoms: ["David"],
-        sexe: "M",
-        nomUsuel: "Heinemeier Hansson",
         family_name: "TESTMAN",
         given_name: "Johnny Paul René",
         gender: "male",