Merge pull request #5849 from uktrade/feature/CLS2-1065-allow-any-string-for-eyb-hiring-choices

Feature/cls2 1065 allow any string for eyb hiring choices

Author: santoshdasa12345

datahub/investment_lead/migrations/0010_alter_eyblead_hiring.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.16 on 2024-12-09 12:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('investment_lead', '0009_alter_eyblead_marketing_hashed_uuid'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eyblead',
+            name='hiring',
+            field=models.CharField(blank=True, default='', max_length=256),
+        ),
+    ]

datahub/investment_lead/models.py

@@ -59,18 +59,6 @@ class IntentChoices(models.TextChoices):
         )
         OTHER = 'OTHER', 'Other'
 
-    class HiringChoices(models.TextChoices):
-        # Legacy choices
-        ONE_TO_TEN = '1-10', '1 to 10'
-        ELEVEN_TO_FIFTY = '11-50', '11 to 50'
-
-        # Current choices
-        ONE_TO_FIVE = '1-5', '1 to 5'
-        SIX_TO_FIFTY = '6-50', '6 to 50'
-        FIFTY_ONE_TO_ONE_HUNDRED = '51-100', '51 to 100'
-        ONE_HUNDRED_ONE_PLUS = '101+', 'More than 100'
-        NO_PLANS_TO_HIRE_YET = 'NO_PLANS_TO_HIRE_YET', 'No plans to hire'
-
     class SpendChoices(models.TextChoices):
         # Legacy choice
         FIVE_HUNDRED_THOUSAND_ONE_TO_ONE_MILLION = '500001-1000000', '£500,001 - £1,000,000'
@@ -133,7 +121,7 @@ class LandingTimeframeChoices(models.TextChoices):
     )
     proposed_investment_location_none = models.BooleanField(default=None, null=True, blank=True)
     hiring = models.CharField(
-        max_length=CHAR_FIELD_MAX_LENGTH, choices=HiringChoices.choices, default='', blank=True,
+        max_length=CHAR_FIELD_MAX_LENGTH, default='', blank=True,
     )
     spend = models.CharField(
         max_length=CHAR_FIELD_MAX_LENGTH, choices=SpendChoices.choices, default='', blank=True,

datahub/investment_lead/serializers.py

@@ -195,8 +195,7 @@ class Meta(BaseEYBLeadSerializer.Meta):
     locationNone = serializers.BooleanField(  # noqa: N815
         source='proposed_investment_location_none', required=False, allow_null=True,
     )
-    hiring = serializers.ChoiceField(
-        choices=EYBLead.HiringChoices.choices,
+    hiring = serializers.CharField(
         required=False, allow_null=True, allow_blank=True, default='',
     )
     spend = serializers.ChoiceField(
@@ -512,8 +511,6 @@ def get_related_fields_representation(self, instance):
                 EYBLead.IntentChoices(intent_choice).label
                 for intent_choice in instance.intent
             ],
-            'hiring': EYBLead.HiringChoices(instance.hiring).label
-            if instance.hiring else None,
             'spend': EYBLead.SpendChoices(instance.spend).label
             if instance.spend else None,
             'landing_timeframe': EYBLead.LandingTimeframeChoices(

datahub/investment_lead/test/factories.py

@@ -14,6 +14,9 @@
 from datahub.metadata.models import Sector
 
 
+HIRING_CHOICES = ['1-10', '11-50', '51-100', '101+', 'NO_PLANS_TO_HIRE_YET']
+
+
 fake = Faker(locale='en_GB')
 factory.Faker._DEFAULT_LOCALE = 'en_GB'
 
@@ -42,7 +45,7 @@ class Meta:
     proposed_investment_region_id = constants.UKRegion.wales.value.id
     proposed_investment_city = 'Cardiff'
     proposed_investment_location_none = False
-    hiring = factory.LazyAttribute(lambda o: random.choice(EYBLead.HiringChoices.values))
+    hiring = factory.LazyAttribute(lambda o: random.choice(HIRING_CHOICES))
     spend = factory.LazyAttribute(lambda o: random.choice(EYBLead.SpendChoices.values))
     spend_other = ''
     is_high_value = factory.Faker('pybool')
@@ -145,7 +148,7 @@ def eyb_lead_triage_record_faker(overrides: dict | None = None) -> dict:
         'location': constants.UKRegion.wales.value.name,
         'locationCity': 'Cardiff',
         'locationNone': False,
-        'hiring': random.choice(EYBLead.HiringChoices.values),
+        'hiring': random.choice(HIRING_CHOICES),
         'spend': random.choice(EYBLead.SpendChoices.values),
         'spendOther': '',
         'isHighValue': fake.pybool(),

datahub/investment_lead/test/test_serializers.py

@@ -95,13 +95,11 @@ def test_create_lead_from_invalid_choice_and_related_data(self, eyb_lead_triage_
         """Tests invalid choice-field and related-field data raises validation errors."""
         eyb_lead_triage_data.update({
             'location': 'Invalid location name',
-            'hiring': 'Invalid hiring choice',
             'spend': 'Invalid spend choice',
         })
         serializer = CreateEYBLeadTriageSerializer(data=eyb_lead_triage_data)
         assert not serializer.is_valid()
         assert 'location' in serializer.errors
-        assert 'hiring' in serializer.errors
         assert 'spend' in serializer.errors
 
     def test_create_lead_from_invalid_sector_data(self, eyb_lead_triage_data):

datahub/investment_lead/test/utils.py

@@ -127,7 +127,7 @@ def assert_retrieved_eyb_lead_data(instance: EYBLead, data: dict):
     assert str(instance.proposed_investment_region.id) == data['proposed_investment_region']['id']
     assert instance.proposed_investment_city == data['proposed_investment_city']
     assert instance.proposed_investment_location_none == data['proposed_investment_location_none']
-    assert EYBLead.HiringChoices(instance.hiring).label == data['hiring']
+    assert instance.hiring == data['hiring']
     assert EYBLead.SpendChoices(instance.spend).label == data['spend']
     assert instance.spend_other == data['spend_other']
     assert instance.is_high_value == data['is_high_value']