Merge pull request #5105 from broadinstitute/clear-parental-data-update

handle clearing parental data

Author: hanars

seqr/views/apis/individual_api_tests.py

@@ -245,6 +245,20 @@ def test_edit_individuals(self, mock_pm_group):
         self.assertEqual(response_json['individualsByGuid'][ID_UPDATE_GUID]['individualId'], UPDATED_ID)
         self.assertEqual(response_json['individualsByGuid'][ID_UPDATE_GUID]['maternalId'], 'NA19679')
 
+        response = self.client.post(edit_individuals_url, content_type='application/json', data=json.dumps({
+            'individuals': [{
+                'individualGuid': INDIVIDUAL_GUID,
+                'familyId': '1',
+                'individualId': 'NA19675_1',
+                'paternalId': '',
+            }]
+        }))
+        self.assertEqual(response.status_code, 200)
+        response_json = response.json()
+        self.assertSetEqual({INDIVIDUAL_GUID}, set(response_json['individualsByGuid']))
+        self.assertIsNone(response_json['individualsByGuid'][INDIVIDUAL_GUID]['paternalId'])
+        self.assertEqual(response_json['individualsByGuid'][INDIVIDUAL_GUID]['maternalId'], 'NA19679')
+
         # Test PM permission
         pm_required_edit_individuals_url = reverse(edit_individuals_handler, args=[PM_REQUIRED_PROJECT_GUID])
         response = self.client.post(pm_required_edit_individuals_url, content_type='application/json', data=json.dumps({

seqr/views/utils/individual_utils.py

@@ -143,7 +143,7 @@ def _update_from_record(record, user, families_by_id, individual_lookup, updated
             'mother': record.pop('mother', None),
             'father': record.pop('father', None),
         })
-    elif record.get('maternalId') or record.get('paternalId'):
+    elif record.get('maternalId') is not None or record.get('paternalId') is not None:
         parent_updates.append({
             'individual': individual,
             'maternalId': record.pop('maternalId', None),

seqr/views/utils/json_to_orm_utils.py

@@ -55,10 +55,14 @@ def update_individual_parents(individual, json, user):
 
 def _parse_parent_field(update_json, all_json, individual, parent_key, parent_id_key):
     updated_parent = all_json.get(parent_id_key) if parent_id_key else all_json.get(parent_key)
+    if updated_parent is None:
+        return
     parent = getattr(individual, parent_key, None)
     if parent_id_key:
         parent = parent.individual_id if parent else None
-    if updated_parent != parent:
+    if parent and not updated_parent:
+        update_json[parent_key] = None
+    elif updated_parent != parent:
         if parent_id_key:
             updated_parent = Individual.objects.get(individual_id=updated_parent, family=individual.family) if updated_parent else None
         update_json[parent_key] = updated_parent