YJDH-788 | Backend: Add organization type, job type & make business ID unique (+frontend translations)

backend/kesaseteli/applications/enums.py

@@ -176,6 +176,30 @@ class AttachmentType(models.TextChoices):
     PAYSLIP = "payslip", _("payslip")
 
 
+class OrganizationType(models.TextChoices):
+    COMPANY = "company", _("Company")
+    ASSOCIATION = "association", _("Association")
+    PARISH = "parish", _("Parish")
+    OTHER = "other", _("Other")
+
+
+class JobType(models.TextChoices):
+    SPORTS_AND_LEISURE = "sports_and_leisure", _("Sports and leisure")
+    MAINTENANCE_AND_CONSTRUCTION = (
+        "maintenance_and_construction",
+        _("Maintenance and construction"),
+    )
+    RESTAURANT_AND_CAFE = "restaurant_and_cafe", _("Restaurant and cafe sector")
+    RETAIL = "retail", _("Retail sector")
+    OFFICE_AND_MEDIA = "office_and_media", _("Office and media")
+    GARDENING_AND_AGRICULTURE = (
+        "gardening_and_agriculture",
+        _("Gardening and agricultural work"),
+    )
+    SERVICE = "service", _("Service sector")
+    OTHER = "other", _("Other")
+
+
 class HiredWithoutVoucherAssessment(models.TextChoices):
     YES = "yes", _("yes")
     NO = "no", _("no")

backend/kesaseteli/applications/migrations/0045_employersummervoucher_job_type_and_more.py

@@ -0,0 +1,50 @@
+# Generated by Django 5.1.15 on 2026-02-03 12:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("applications", "0044_remove_employersummervoucher_target_group_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="employersummervoucher",
+            name="job_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("sports_and_leisure", "Sports and leisure"),
+                    ("maintenance_and_construction", "Maintenance and construction"),
+                    ("restaurant_and_cafe", "Restaurant and cafe sector"),
+                    ("retail", "Retail sector"),
+                    ("office_and_media", "Office and media"),
+                    ("gardening_and_agriculture", "Gardening and agricultural work"),
+                    ("service", "Service sector"),
+                    ("other", "Other"),
+                ],
+                max_length=64,
+                verbose_name="job type",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalemployersummervoucher",
+            name="job_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("sports_and_leisure", "Sports and leisure"),
+                    ("maintenance_and_construction", "Maintenance and construction"),
+                    ("restaurant_and_cafe", "Restaurant and cafe sector"),
+                    ("retail", "Retail sector"),
+                    ("office_and_media", "Office and media"),
+                    ("gardening_and_agriculture", "Gardening and agricultural work"),
+                    ("service", "Service sector"),
+                    ("other", "Other"),
+                ],
+                max_length=64,
+                verbose_name="job type",
+            ),
+        ),
+    ]

backend/kesaseteli/applications/models.py

@@ -31,6 +31,7 @@
     EmailTemplateType,
     EmployerApplicationStatus,
     HiredWithoutVoucherAssessment,
+    JobType,
     VtjTestCase,
     YouthApplicationStatus,
 )
@@ -1370,6 +1371,12 @@ def get_target_group_display(self):
     employment_description = models.TextField(
         verbose_name=_("employment description"), blank=True
     )
+    job_type = models.CharField(
+        max_length=64,
+        verbose_name=_("job type"),
+        blank=True,
+        choices=JobType.choices,
+    )
     hired_without_voucher_assessment = models.CharField(
         max_length=32,
         verbose_name=_("hired without voucher assessment"),

backend/kesaseteli/common/tests/factories.py

@@ -15,6 +15,8 @@
     EmployerApplicationStatus,
     get_supported_languages,
     HiredWithoutVoucherAssessment,
+    JobType,
+    OrganizationType,
     VtjTestCase,
     YouthApplicationStatus,
 )
@@ -49,6 +51,9 @@ class CompanyFactory(SaveAfterPostGenerationMixin, factory.django.DjangoModelFac
     street_address = factory.Faker("street_address")
     postcode = factory.Faker("postcode")
     city = factory.Faker("city")
+    organization_type = factory.Faker(
+        "random_element", elements=OrganizationType.values
+    )
     ytj_json = factory.Faker("json")
 
     class Meta:
@@ -101,6 +106,7 @@ class EmployerSummerVoucherFactory(
         "pydecimal", left_digits=4, right_digits=2, min_value=1
     )
     employment_description = factory.Faker("sentence")
+    job_type = factory.Faker("random_element", elements=JobType.values)
     hired_without_voucher_assessment = factory.Faker(
         "random_element", elements=HiredWithoutVoucherAssessment.values
     )

backend/kesaseteli/companies/migrations/0007_company_organization_type.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.15 on 2026-02-03 12:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("companies", "0006_alter_company_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="company",
+            name="organization_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("company", "Company"),
+                    ("association", "Association"),
+                    ("parish", "Parish"),
+                    ("other", "Other"),
+                ],
+                max_length=64,
+                verbose_name="organization type",
+            ),
+        ),
+    ]

backend/kesaseteli/companies/migrations/0008_make_company_business_id_unique.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.15 on 2026-02-03 12:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("companies", "0007_company_organization_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="company",
+            name="business_id",
+            field=models.CharField(
+                max_length=64, unique=True, verbose_name="business id"
+            ),
+        ),
+    ]

backend/kesaseteli/companies/models.py

@@ -1,12 +1,15 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from applications.enums import OrganizationType
 from shared.models.abstract_models import UUIDModel
 
 
 class Company(UUIDModel):
     name = models.CharField(max_length=256, verbose_name=_("name"))
-    business_id = models.CharField(max_length=64, verbose_name=_("business id"))
+    business_id = models.CharField(
+        max_length=64, unique=True, verbose_name=_("business id")
+    )
     company_form = models.CharField(
         max_length=64, blank=True, verbose_name=_("company form")
     )
@@ -17,7 +20,20 @@ class Company(UUIDModel):
     )
     postcode = models.CharField(max_length=256, blank=True, verbose_name=_("postcode"))
     city = models.CharField(max_length=256, blank=True, verbose_name=_("city"))
-
+    organization_type = models.CharField(
+        # Rationale for this field:
+        #
+        # Organization type is similar to company_form data which comes from VTJ,
+        # but has specific choices requested by product owner for reporting purposes.
+        #
+        # For example parish (i.e. seurakunta in Finnish) is a category which
+        # is at least not evidently mappable from company_form value, and thus
+        # needs to be asked from the user.
+        max_length=64,
+        verbose_name=_("organization type"),
+        blank=True,
+        choices=OrganizationType.choices,
+    )
     ytj_json = models.JSONField(blank=True, null=True, verbose_name=_("ytj json"))
 
     class Meta:

backend/kesaseteli/companies/tests/test_company_api.py

@@ -56,7 +56,7 @@ def test_get_mock_company_not_found_from_ytj(api_client):
     for field in [
         f
         for f in Company._meta.fields
-        if f.name not in ["id", "name", "business_id", "ytj_json"]
+        if f.name not in ["id", "name", "business_id", "organization_type", "ytj_json"]
     ]:
         assert response.data[field.name] == ""
 
@@ -154,7 +154,7 @@ def test_get_company_not_found_from_ytj(api_client, requests_mock, user):
     for field in [
         f
         for f in Company._meta.fields
-        if f.name not in ["id", "name", "business_id", "ytj_json"]
+        if f.name not in ["id", "name", "business_id", "organization_type", "ytj_json"]
     ]:
         assert response.data[field.name] == ""
 

frontend/kesaseteli/employer/public/locales/en/common.json

@@ -89,13 +89,31 @@
           "primary_target_group": "9th grader or TUVA grader",
           "secondary_target_group": "Other age group"
         },
+        "organization_type": {
+          "company": "Company",
+          "association": "Association",
+          "parish": "Parish",
+          "other": "Other"
+        },
+        "job_type": {
+          "sports_and_leisure": "Sports and leisure time",
+          "maintenance_and_construction": "Maintenance and construction",
+          "restaurant_and_cafe": "Restaurant and cafe sector",
+          "retail": "Retail sector",
+          "office_and_media": "Office and media work",
+          "gardening_and_agriculture": "Gardening and agricultural work",
+          "service": "Service sector",
+          "other": "Other"
+        },
         "hired_without_voucher_assessment": {
           "yes": "Yes",
           "no": "No",
           "maybe": "Maybe"
         }
       },
       "inputs": {
+        "organization_type": "Organization type",
+        "job_type": "Main category of work tasks",
         "contact_person_name": "Name of the contact person",
         "contact_person_email": "Email of the contact person",
         "street_address": "Company street address",

frontend/kesaseteli/employer/public/locales/fi/common.json

@@ -89,13 +89,31 @@
           "primary_target_group": "9. luokkalainen tai TUVA-luokkalainen",
           "secondary_target_group": "Jokin muu ikäryhmä"
         },
+        "organization_type": {
+          "company": "Yritys",
+          "association": "Yhdistys",
+          "parish": "Seurakunta",
+          "other": "Muu"
+        },
+        "job_type": {
+          "sports_and_leisure": "Liikunta- ja vapaa-aika",
+          "maintenance_and_construction": "Huolto- ja rakennustehtävät",
+          "restaurant_and_cafe": "Ravintola- ja kahvila-ala",
+          "retail": "Kaupan ala",
+          "office_and_media": "Toimisto- ja mediatyö",
+          "gardening_and_agriculture": "Puutarha- ja maataloustyö",
+          "service": "Palveluala",
+          "other": "Muu"
+        },
         "hired_without_voucher_assessment": {
           "yes": "Kyllä",
           "no": "En",
           "maybe": "Ehkä"
         }
       },
       "inputs": {
+        "organization_type": "Organisaatiotyyppi",
+        "job_type": "Työtehtävien pääluokka",
         "contact_person_name": "Yhteyshenkilön nimi",
         "contact_person_email": "Yhteyshenkilön sähköposti",
         "street_address": "Työpaikan lähiosoite",

frontend/kesaseteli/employer/public/locales/sv/common.json

@@ -89,13 +89,31 @@
           "primary_target_group": "Niondeklassist eller TUVAklassist",
           "secondary_target_group": "Annan åldersgrupp"
         },
+        "organization_type": {
+          "company": "Företag",
+          "association": "Förening",
+          "parish": "Församling",
+          "other": "Annat"
+        },
+        "job_type": {
+          "sports_and_leisure": "Sport och fritid",
+          "maintenance_and_construction": "Underhåll och byggande",
+          "restaurant_and_cafe": "Restaurang och café",
+          "retail": "Detaljhandel",
+          "office_and_media": "Kontor och media",
+          "gardening_and_agriculture": "Trädgårdsarbete och jordbruk",
+          "service": "Tjänster",
+          "other": "Annat"
+        },
         "hired_without_voucher_assessment": {
           "yes": "Jo",
           "no": "Nej",
           "maybe": "Kanske"
         }
       },
       "inputs": {
+        "organization_type": "Organisationstyp",
+        "job_type": "Huvudkategori av arbetsuppgifter",
         "contact_person_name": "Kontakt personens namn",
         "contact_person_email": "Kontakt personens epost",
         "street_address": "Arbetsplatsens gatuadress",