Merged in r2-2649-case-appears-unavailable (pull request #6562)

R2-2649 - Case created from family details initially appears as unavailable
primeroIMS · Oct 26, 2023 · ec957e9 · ec957e9
2 parents ba646fb + c97d21f
commit ec957e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/app/views/api/v2/children/create_family.json.jbuilder b/app/views/api/v2/children/create_family.json.jbuilder
@@ -3,14 +3,9 @@
 # Copyright (c) 2014 - 2023 UNICEF. All rights reserved.
 
 json.data do
-  json.id @current_record.id
-  json.family_id @current_record.family_id if @selected_field_names.include?('family_id')
-  json.family_number @current_record.family_number if @selected_field_names.include?('family_number')
-  json.family_member_id @current_record.family_member_id if @selected_field_names.include?('family_member_id')
-
-  if @selected_field_names.include?('family_details_section')
-    json.family_details_section @current_record.family_members_details
-  end
+  json.merge! @record_data_service.embed_family_info(
+    { id: @current_record.id }, @current_record, @selected_field_names, current_user
+  )
 
   json.record do
     json.id @record.id

diff --git a/spec/requests/api/v2/children_controller_spec.rb b/spec/requests/api/v2/children_controller_spec.rb
@@ -1270,6 +1270,7 @@
       expect(json['data']['family_details_section'][0]['relation_age']).to eq(5)
       expect(json['data']['family_details_section'][0]['case_id']).not_to be_nil
       expect(json['data']['family_details_section'][0]['case_id_display']).not_to be_nil
+      expect(json['data']['family_details_section'][0]['can_read_record']).not_to be_truthy
       expect(json['data']['record']['id']).not_to be_nil
       expect(json['data']['record']['case_id_display']).not_to be_nil
       expect(json['data']['record']['family_member_id']).to eq(@member_unique_id3)