Skip to content

Commit

Permalink
TP2000-469 GA18 should use sid instead of PK (#649)
Browse files Browse the repository at this point in the history
* make GA18 filter on sid instead of pk

* use version_group instead of sid in GA18
  • Loading branch information
gabelton authored Aug 11, 2022
1 parent 5b392dc commit 4830d90
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
4 changes: 2 additions & 2 deletions geo_areas/business_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ def validate(self, membership):
if (
type(membership)
.objects.filter(
geo_group=membership.geo_group,
member=membership.member,
geo_group__version_group=membership.geo_group.version_group,
member__version_group=membership.member.version_group,
valid_between__overlap=membership.valid_between,
)
.approved_up_to_transaction(membership.transaction)
Expand Down
17 changes: 17 additions & 0 deletions geo_areas/tests/test_business_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,23 @@ def test_GA18(date_ranges):
business_rules.GA18(duplicate.transaction).validate(duplicate)


# https://uktrade.atlassian.net/browse/TP2000-469
def test_GA18_multiple_versions(date_ranges):
"""Test that GA18 fires for overlapping memberships when one membership is
created with a later version of the member area."""
existing = factories.GeographicalMembershipFactory.create(
valid_between=date_ranges.normal,
)
new_version_member = existing.member.new_version(existing.transaction.workbasket)
duplicate = factories.GeographicalMembershipFactory.create(
geo_group=existing.geo_group,
member=new_version_member,
valid_between=date_ranges.overlap_normal,
)
with pytest.raises(BusinessRuleViolation):
business_rules.GA18(duplicate.transaction).validate(duplicate)


def test_GA19():
"""If the group has a parent the members must also be members of the
parent."""
Expand Down

0 comments on commit 4830d90

Please sign in to comment.