Correct Facility Parent Company link (#772)

Correct Facility Parent Company link

Connects #729

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix a bug which prevented the facility claims dashboard page header from loading [#778](https://github.com/open-apparel-registry/open-apparel-registry/pull/778)
 - Fix a bug which prevented the vector tile marker layer from rendering [#782](https://github.com/open-apparel-registry/open-apparel-registry/pull/782)
 - Capture infinite-scroll emitted bug in an ErrorBoundary in order not to crash the map component [#777](https://github.com/open-apparel-registry/open-apparel-registry/pull/777)
+- Correct Facility Parent Company link [#772](https://github.com/open-apparel-registry/open-apparel-registry/pull/772)
 
 ### Security
 - Fix several npm security vulnerabilities via GitHub dependabot [#792](https://github.com/open-apparel-registry/open-apparel-registry/pull/792)

src/django/api/serializers.py

@@ -34,6 +34,16 @@
 from waffle import switch_is_active
 
 
+def _get_parent_company(claim):
+    if not claim or not claim.parent_company:
+        return None
+
+    return {
+        'id': claim.parent_company.admin.id,
+        'name': claim.parent_company.name,
+    }
+
+
 class UserSerializer(ModelSerializer):
     password = CharField(write_only=True)
     name = SerializerMethodField()
@@ -432,14 +442,6 @@ def get_claim_info(self, facility):
                 .filter(status=FacilityClaim.APPROVED) \
                 .get(facility=facility)
 
-            if claim.parent_company:
-                parent_company = {
-                    'id': claim.parent_company.admin.id,
-                    'name': claim.parent_company.name,
-                }
-            else:
-                parent_company = None
-
             return {
                 'id': claim.id,
                 'facility': {
@@ -450,7 +452,7 @@ def get_claim_info(self, facility):
                     'address': claim.facility_address,
                     'website': claim.facility_website
                     if claim.facility_website_publicly_visible else None,
-                    'parent_company': parent_company,
+                    'parent_company': _get_parent_company(claim),
                     'phone_number': claim.facility_phone_number
                     if claim.facility_phone_number_publicly_visible else None,
                     'minimum_order': claim.facility_minimum_order_quantity,
@@ -558,13 +560,7 @@ def get_notes(self, claim):
         return data
 
     def get_facility_parent_company(self, claim):
-        if not claim.parent_company:
-            return None
-
-        return {
-            'id': claim.parent_company.id,
-            'name': claim.parent_company.name,
-        }
+        return _get_parent_company(claim)
 
 
 class FacilityClaimReviewNoteSerializer(ModelSerializer):
@@ -628,13 +624,7 @@ def get_facility_types(self, claim):
         return FacilityClaim.FACILITY_TYPE_CHOICES
 
     def get_facility_parent_company(self, claim):
-        if not claim.parent_company:
-            return None
-
-        return {
-            'id': claim.parent_company.id,
-            'name': claim.parent_company.name,
-        }
+        return _get_parent_company(claim)
 
     def get_affiliation_choices(self, claim):
         return FacilityClaim.AFFILIATION_CHOICES