fix postitions can have gangs from seperate organizations

backend/root/management/commands/seed_scripts/recruitment_position.py

@@ -21,10 +21,10 @@ def seed():
     RecruitmentPosition.objects.all().delete()
     yield 0, 'Deleted old recruitmentpositions'
 
-    gangs = Gang.objects.all()
     recruitments = Recruitment.objects.all()
     created_count = 0
     for recruitment_index, recruitment in enumerate(recruitments):
+        gangs = Gang.objects.filter(organization=recruitment.organization)
         for gang_index, gang in enumerate(sample(list(gangs), 6)):
             for i in range(2):  # Create 2 instances for each gang and recruitment
                 position_data = POSITION_DATA.copy()

backend/samfundet/conftest.py

@@ -237,26 +237,38 @@ def fixture_organization2() -> Iterator[Organization]:
 
 @pytest.fixture
 def fixture_gang(fixture_organization: Organization) -> Iterator[Gang]:
-    organization = Gang.objects.create(
+    gang = Gang.objects.create(
         name_nb='Gang',
         name_en='Gang',
         abbreviation='G',
         organization=fixture_organization,
     )
-    yield organization
-    organization.delete()
+    yield gang
+    gang.delete()
 
 
 @pytest.fixture
-def fixture_gang2(fixture_organization2: Organization) -> Iterator[Gang]:
-    organization = Gang.objects.create(
+def fixture_gang2(fixture_organization: Organization) -> Iterator[Gang]:
+    gang = Gang.objects.create(
         name_nb='Gang 2',
         name_en='Gang 2',
         abbreviation='G2',
+        organization=fixture_organization,
+    )
+    yield gang
+    gang.delete()
+
+
+@pytest.fixture
+def fixture_gang_org2(fixture_organization2: Organization) -> Iterator[Gang]:
+    gang = Gang.objects.create(
+        name_nb='Gang 3',
+        name_en='Gang 3',
+        abbreviation='G3',
         organization=fixture_organization2,
     )
-    yield organization
-    organization.delete()
+    yield gang
+    gang.delete()
 
 
 @pytest.fixture

backend/samfundet/models/recruitment.py

@@ -185,11 +185,24 @@ def resolve_org(self, *, return_id: bool = False) -> Organization | int:
     def __str__(self) -> str:
         return f'Position: {self.name_en} in {self.recruitment}'
 
+    # Error messages
+    ONLY_ONE_OWNER_ERROR = 'Position must be owned by either gang or section, not both'
+    NO_OWNER_ERROR = 'Position must have an owner, either a gang or a gang section'
+    POSITION_NOT_IN_RECRUITMENTORGANIZATION_ERROR = 'Position must be of the organization which hosts the recruitment'
+
     def clean(self) -> None:
         super().clean()
+        errors: dict[str, list[ValidationError]] = defaultdict(list)
 
-        if (self.gang and self.section) or not (self.gang or self.section):
-            raise ValidationError('Position must be owned by either gang or section, not both')
+        if self.gang and self.gang.organization != self.recruitment.organization:
+            errors['gang'].append(self.POSITION_NOT_IN_RECRUITMENTORGANIZATION_ERROR)
+        if self.gang and self.section:
+            errors['gang'].append(self.ONLY_ONE_OWNER_ERROR)
+            errors['section'].append(self.ONLY_ONE_OWNER_ERROR)
+        elif not (self.gang or self.section):
+            errors['gang'].append(self.NO_OWNER_ERROR)
+            errors['section'].append(self.NO_OWNER_ERROR)
+        raise ValidationError(errors)
 
     def save(self, *args: tuple, **kwargs: dict) -> None:
         if self.norwegian_applicants_only:

backend/samfundet/models/tests/test_recruitment.py

@@ -95,6 +95,42 @@ def test_actual_deadline_before_shown_deadline(self, fixture_org):
         assert Recruitment.SHOWN_AFTER_ACTUAL_ERROR in e['shown_application_deadline']
 
 
+class TestRecruitmentPosition:
+    default_data = {
+        'name_en': 'Name_en',
+        'name_nb': 'Name_nb',
+        'short_description_nb': 'short_description_nb',
+        'short_description_en': 'short_description_en',
+        'long_description_nb': 'long_description_nb',
+        'long_description_en': 'long_description_en',
+        'is_funksjonaer_position': False,
+        'default_application_letter_nb': 'default_application_letter_nb',
+        'default_application_letter_en': 'default_application_letter_en',
+        'norwegian_applicants_only': False,
+        'tags': 'tag1, tag2, tag3',
+    }
+
+    def test_create_recruitmentposition_gang(self, fixture_recruitment: Recruitment, fixture_gang: Gang):
+        test_position = RecruitmentPosition.objects.create(**self.default_data, recruitment=fixture_recruitment, gang=fixture_gang)
+        assert test_position.id
+
+    def test_edit_recruitmentposition_gang_from_other_org(self, fixture_recruitment: Recruitment, fixture_gang: Gang, fixture_gang_org2: Gang):
+        test_position = RecruitmentPosition.objects.create(**self.default_data, recruitment=fixture_recruitment, gang=fixture_gang)
+        assert test_position.id
+
+        with pytest.raises(ValidationError) as error:
+            test_position.gang = fixture_gang_org2
+            test_position.save()
+        e = dict(error.value)
+        assert RecruitmentPosition.POSITION_NOT_IN_RECRUITMENTORGANIZATION_ERROR in e['gang']
+
+    def test_create_recruitmentposition_gang_from_other_org(self, fixture_recruitment: Recruitment, fixture_gang_org2: Gang):
+        with pytest.raises(ValidationError) as error:
+            RecruitmentPosition.objects.create(**self.default_data, recruitment=fixture_recruitment, gang=fixture_gang_org2)
+        e = dict(error.value)
+        assert RecruitmentPosition.POSITION_NOT_IN_RECRUITMENTORGANIZATION_ERROR in e['gang']
+
+
 class TestRecruitmentStats:
     def test_recruitment_has_stats(self, fixture_recruitment: Recruitment):
         """Check if fixture_recruitment has the related object"""

backend/samfundet/tests/test_roles.py

@@ -119,7 +119,7 @@ def test_has_perm_different_orgs(
 def test_has_perm_different_gangs(
     fixture_user: User,
     fixture_gang: Gang,
-    fixture_gang2: Gang,
+    fixture_gang_org2: Gang,
     fixture_gang_permission: Permission,
     fixture_role: Role,
 ):
@@ -132,7 +132,7 @@ def test_has_perm_different_gangs(
     UserGangRole.objects.create(user=fixture_user, role=fixture_role, obj=fixture_gang)
 
     assert backend.has_perm(fixture_user, fixture_gang_permission.codename, fixture_gang)
-    assert not backend.has_perm(fixture_user, fixture_gang_permission.codename, fixture_gang2)
+    assert not backend.has_perm(fixture_user, fixture_gang_permission.codename, fixture_gang_org2)
 
 
 def test_has_perm_different_gang_sections(
@@ -185,7 +185,7 @@ def test_has_perm_org_downward(
     fixture_organization: Organization,
     fixture_organization2: Organization,
     fixture_gang: Gang,
-    fixture_gang2: Gang,
+    fixture_gang_org2: Gang,
     fixture_gang_section: GangSection,
     fixture_role: Role,
     fixture_org_permission: Permission,
@@ -230,7 +230,7 @@ def test_has_perm_org_downward(
 
     assert backend.has_perm(fixture_user, fixture_gang_section_permission.codename, fixture_gang_section)
 
-    fixture_gang_section.gang = fixture_gang2
+    fixture_gang_section.gang = fixture_gang_org2
 
     assert not backend.has_perm(fixture_user, fixture_gang_section_permission.codename, fixture_gang_section)