Merge pull request #664 from Gary-Community-Ventures/bug/bulk_import_…

…navigator

Fix bulk import navigator

programs/models.py

@@ -153,7 +153,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["ProgramCategory"]) -> "ProgramCategory":
-        return Model.objects.new_program_category(external_name, "housing")
+        return Model.objects.new_program_category("_default", external_name, "housing")
 
 
 class ProgramCategory(models.Model):
@@ -229,7 +229,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["Document"]) -> "Document":
-        return Model.objects.new_document(external_name)
+        return Model.objects.new_document("_default", external_name)
 
 
 class Document(models.Model):
@@ -397,7 +397,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["Program"]) -> "Program":
-        return Model.objects.new_program(external_name)
+        return Model.objects.new_program("_default", external_name)
 
 
 # This model describes all of the benefit programs available in the screener
@@ -615,11 +615,11 @@ def from_model_data(self, data: DataType):
         for category in data["categories"]:
             try:
                 cat_instance = UrgentNeedCategory.objects.get(name=category["name"])
+                cat_instance.white_label = white_label
+                cat_instance.save()
             except UrgentNeedCategory.DoesNotExist:
-                cat_instance = UrgentNeedFunction.objects.create(name=category["name"])
+                cat_instance = UrgentNeedCategory.objects.create(name=category["name"], white_label=white_label)
 
-            cat_instance.white_label = white_label
-            cat_instance.save()
             categories.append(cat_instance)
         need.type_short.set(categories)
 
@@ -637,7 +637,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["UrgentNeed"]) -> "UrgentNeed":
-        return Model.objects.new_urgent_need(external_name, None)
+        return Model.objects.new_urgent_need("_default", external_name, None)
 
 
 class UrgentNeed(models.Model):
@@ -704,7 +704,7 @@ class NavigatorManager(models.Manager):
     )
     no_auto_fields = ("assistance_link",)
 
-    def new_navigator(self, white_label: str, name: str, phone_number: str):
+    def new_navigator(self, white_label: str, name: str, phone_number: Optional[str] = None):
         translations = {}
         for field in self.translated_fields:
             translations[field] = Translation.objects.add_translation(
@@ -779,11 +779,11 @@ def from_model_data(self, data: DataType):
         for county in data["counties"]:
             try:
                 county_instance = County.objects.get(name=county["name"])
+                county_instance.white_label = white_label
+                county_instance.save()
             except County.DoesNotExist:
-                county_instance = County.objects.create(name=county["name"])
+                county_instance = County.objects.create(name=county["name"], white_label=white_label)
 
-            county_instance.white_label = white_label
-            county_instance.save()
             counties.append(county_instance)
         navigator.counties.set(counties)
 
@@ -808,7 +808,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["Navigator"]) -> "Navigator":
-        return Model.objects.new_navigator(external_name, None)
+        return Model.objects.new_navigator("_default", external_name, None)
 
 
 class Navigator(models.Model):
@@ -909,8 +909,10 @@ def from_model_data(self, data: DataType):
         for county in data["counties"]:
             try:
                 county_instance = County.objects.get(name=county["name"])
+                county_instance.white_label = white_label
+                county_instance.save()
             except County.DoesNotExist:
-                county_instance = County.objects.create(name=county["name"])
+                county_instance = County.objects.create(name=county["name"], white_label=white_label)
             counties.append(county_instance)
         warning.counties.set(counties)
 
@@ -925,7 +927,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["WarningMessage"]) -> "WarningMessage":
-        return Model.objects.new_warning("_show", external_name)
+        return Model.objects.new_warning("_default", "_show", external_name)
 
 
 class WarningMessage(models.Model):
@@ -1055,8 +1057,10 @@ def from_model_data(self, data: DataType):
         for county in data["counties"]:
             try:
                 county_instance = County.objects.get(name=county["name"])
+                county_instance.white_label = white_label
+                county_instance.save()
             except County.DoesNotExist:
-                county_instance = County.objects.create(name=county["name"])
+                county_instance = County.objects.create(name=county["name"], white_label=white_label)
             counties.append(county_instance)
         translation_override.counties.set(counties)
 
@@ -1067,7 +1071,7 @@ def from_model_data(self, data: DataType):
 
     @classmethod
     def create_instance(cls, external_name: str, Model: type["TranslationOverride"]) -> "TranslationOverride":
-        return Model.objects.new_translation_override("_show", "", external_name)
+        return Model.objects.new_translation_override("_default", "_show", "", external_name)
 
 
 class TranslationOverride(models.Model):