Update json fixtures and use full_name instead of interpolating it

puzzle · Feb 6, 2025 · 9c7eef9 · 9c7eef9
1 parent 95ce74d
commit 9c7eef9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 35 deletions.
diff --git a/app/domain/ptime/assign_employee_ids.rb b/app/domain/ptime/assign_employee_ids.rb
@@ -24,8 +24,7 @@ def map_employees(should_map)
       mapped_people_count = 0
 
       @ptime_employees.each do |ptime_employee|
-        ptime_employee_name =
-          "#{ptime_employee[:attributes][:firstname]} #{ptime_employee[:attributes][:lastname]}"
+        ptime_employee_name = ptime_employee[:attributes][:full_name]
         ptime_employee_email = ptime_employee[:attributes][:email]
         matched_person = Person.where(ptime_employee_id: nil).find_by(email: ptime_employee_email)
 

diff --git a/spec/fixtures/files/json/all_ptime_employees.json b/spec/fixtures/files/json/all_ptime_employees.json
@@ -4,49 +4,57 @@
             "id" : 33,
             "type" : "employee",
             "attributes" : {
-            "shortname" : "LSM",
-            "firstname" : "Longmax",
-            "lastname" : "Smith",
-            "email" : "longmax@example.com",
-            "marital_status" : "single",
-            "nationalities" : ["ZW"],
-            "graduation" : "BSc in Architecture",
-            "department_shortname" : "SYS",
-            "employment_roles" : []
+                "shortname" : "LSM",
+                "firstname" : "Longmax",
+                "lastname" : "Smith",
+                "full_name": "Longmax Smith",
+                "email" : "longmax@example.com",
+                "marital_status" : "single",
+                "nationalities" : ["ZW"],
+                "graduation" : "BSc in Architecture",
+                "department_shortname" : "SYS",
+                "employment_roles" : [],
+                "is_employed" : true,
+                "birthdate" : "05.05.1994",
+                "location" : "Bern"
             }
         },
         {
             "id" : 21,
             "type" : "employee",
             "attributes" : {
-            "shortname" : "AMA",
-            "firstname" : "Alice",
-            "lastname" : "Mante",
-            "full_name" : "Alice Mante",
-            "email" : "alice@example.com",
-            "marital_status" : "single",
-            "nationalities" : ["AU"],
-            "graduation" : "MSc in writing",
-            "department_shortname" : "SYS",
-            "employment_roles" : [],
-            "is_employed" : false,
-            "birthdate" : "01.04.2001",
-            "location" : "Bern"
+                "shortname" : "AMA",
+                "firstname" : "Alice",
+                "lastname" : "Mante",
+                "full_name" : "Alice Mante",
+                "email" : "alice@example.com",
+                "marital_status" : "single",
+                "nationalities" : ["AU"],
+                "graduation" : "MSc in writing",
+                "department_shortname" : "SYS",
+                "employment_roles" : [],
+                "is_employed" : false,
+                "birthdate" : "01.04.2001",
+                "location" : "Bern"
             }
         },
         {
             "id" : 45,
             "type" : "employee",
             "attributes" : {
-            "shortname" : "CFO",
-            "firstname" : "Charlie",
-            "lastname" : "Ford",
-            "email" : "charlie@example.com",
-            "marital_status" : "married",
-            "nationalities" : ["GB"],
-            "graduation" : "MSc in networking",
-            "department_shortname" : "SYS",
-            "employment_roles" : []
+                "shortname" : "CFO",
+                "firstname" : "Charlie",
+                "lastname" : "Ford",
+                "full_name": "Charlie Ford",
+                "email" : "charlie@example.com",
+                "marital_status" : "married",
+                "nationalities" : ["GB"],
+                "graduation" : "MSc in networking",
+                "department_shortname" : "SYS",
+                "employment_roles" : [],
+                "is_employed" : true,
+                "birthdate" : "01.10.1980",
+                "location" : "Thun"
             }
         }
     ]

diff --git a/spec/fixtures/files/json/new_ptime_employee.json b/spec/fixtures/files/json/new_ptime_employee.json
@@ -7,15 +7,19 @@
           "shortname": "PFI",
           "firstname": "Peterson",
           "lastname": "Findus",
+          "full_name": "Peterson Findus",
           "email": "peterson@example.com",
           "marital_status": "single",
           "nationalities": [
             "ZW"
           ],
           "graduation": "Cat caretaker",
           "department_shortname": "CAT",
-          "employment_roles": []
+          "employment_roles": [],
+          "is_employed" : true,
+          "birthdate" : "12.12.1958",
+          "location" : "Bern"
         }
       }
     ]
-  }
+}