From 02303ace1b59778be0a96f8f3ad1615149385c39 Mon Sep 17 00:00:00 2001
From: Stephan Protsack <stephan@speedandfunction.com>
Date: Fri, 7 Nov 2025 13:23:30 +0100
Subject: [PATCH 1/3] Update the extended field logic

---
 src/django/api/extended_fields.py              | 16 +++++++++++++---
 .../api/views/facility/facilities_view_set.py  | 18 +-----------------
 src/react/src/util/util.js                     |  2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/django/api/extended_fields.py b/src/django/api/extended_fields.py
index 3fba9f285..d5feda2ca 100644
--- a/src/django/api/extended_fields.py
+++ b/src/django/api/extended_fields.py
@@ -32,9 +32,19 @@ def get_facility_and_processing_type_extendfield_value(
     is_claim_edit=False
 ):
     if is_claim_edit:
-        field_value_capitalized = (
-            [value.capitalize() for value in field_value]
-        )
+        field_value_capitalized = []
+
+        if isinstance(field_value, list):
+            field_value_capitalized = (
+                [value.capitalize() for value in field_value]
+            )
+
+        if isinstance(field_value, str):
+            field_values_separated = field_value.split("|")
+            field_value_capitalized = (
+                [value.strip().capitalize() for value in field_values_separated]
+            )
+
         raw_values = '|'.join(field_value_capitalized)
         results = get_matched_values(field_value_capitalized, sector)
     else:
diff --git a/src/django/api/views/facility/facilities_view_set.py b/src/django/api/views/facility/facilities_view_set.py
index 3ed9543b8..6431d80bc 100644
--- a/src/django/api/views/facility/facilities_view_set.py
+++ b/src/django/api/views/facility/facilities_view_set.py
@@ -966,6 +966,7 @@ def claim(self, request, pk=None):
                 facility_production_types=validated_data.get(
                     "facility_production_types", []
                 ),
+                facility_type=validated_data.get("facility_type"),
             )
 
             sectors = validated_data.get("sectors")
@@ -973,23 +974,6 @@ def claim(self, request, pk=None):
             if sectors and len(sectors) > 0:
                 facility_claim.sector = sectors
 
-            facility_type = validated_data.get("facility_type")
-
-            if facility_type:
-                (_, __, facility_type_value, processing_type_value) = (
-                    get_facility_and_processing_type(
-                        facility_type, sectors,
-                    )
-                )
-
-                if facility_type_value:
-                    facility_claim.facility_type = facility_type_value
-
-                if processing_type_value:
-                    facility_claim.facility_production_types.append(
-                        processing_type_value,
-                    )
-
             facility_claim.save()
 
             for file in files:
diff --git a/src/react/src/util/util.js b/src/react/src/util/util.js
index e21f68c34..410404194 100644
--- a/src/react/src/util/util.js
+++ b/src/react/src/util/util.js
@@ -1329,7 +1329,7 @@ export const appendFacilityType = (postData, formattedKey, value) => {
     }
 
     const extractedValues = value.map(extractSelectValue);
-    postData.append(formattedKey, extractedValues.join(', '));
+    postData.append(formattedKey, extractedValues.join('|'));
 };
 
 /**

From b937a00e75043bb17c8252bc731c15bece4675e5 Mon Sep 17 00:00:00 2001
From: Stephan Protsack <stephan@speedandfunction.com>
Date: Fri, 7 Nov 2025 13:46:03 +0100
Subject: [PATCH 2/3] Fix linting issues

---
 src/django/api/extended_fields.py                    | 4 ++--
 src/django/api/views/facility/facilities_view_set.py | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/django/api/extended_fields.py b/src/django/api/extended_fields.py
index d5feda2ca..59b3ae888 100644
--- a/src/django/api/extended_fields.py
+++ b/src/django/api/extended_fields.py
@@ -40,9 +40,9 @@ def get_facility_and_processing_type_extendfield_value(
             )
 
         if isinstance(field_value, str):
-            field_values_separated = field_value.split("|")
+            separated_vals = field_value.split("|")
             field_value_capitalized = (
-                [value.strip().capitalize() for value in field_values_separated]
+                [value.strip().capitalize() for value in separated_vals]
             )
 
         raw_values = '|'.join(field_value_capitalized)
diff --git a/src/django/api/views/facility/facilities_view_set.py b/src/django/api/views/facility/facilities_view_set.py
index 6431d80bc..986191944 100644
--- a/src/django/api/views/facility/facilities_view_set.py
+++ b/src/django/api/views/facility/facilities_view_set.py
@@ -101,9 +101,6 @@
     facilities_list_parameters,
     facilities_create_parameters,
 )
-from api.facility_type_processing_type import (
-    get_facility_and_processing_type,
-)
 
 log = logging.getLogger(__name__)
 

From 0460fa8b759834a0ca2293ed3d3b7023434d31e5 Mon Sep 17 00:00:00 2001
From: Stephan Protsack <stephan@speedandfunction.com>
Date: Fri, 7 Nov 2025 13:50:44 +0100
Subject: [PATCH 3/3] Fix unit tests

---
 src/django/api/tests/test_facility_claim.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/django/api/tests/test_facility_claim.py b/src/django/api/tests/test_facility_claim.py
index b3fd52900..7c23c9a43 100644
--- a/src/django/api/tests/test_facility_claim.py
+++ b/src/django/api/tests/test_facility_claim.py
@@ -391,7 +391,7 @@ def test_create_claim_with_additional_fields(self):
         )
         self.assertEqual(
             claim.facility_production_types,
-            ["Cutting", "Sewing", "Manufacturing"],
+            ["Cutting", "Sewing"],
         )
         self.assertEqual(
             claim.facility_type,