Skip to content

Commit

Permalink
GH-161: Add wider schemes LUF3 funding programme
Browse files Browse the repository at this point in the history
  • Loading branch information
markhobson committed Sep 20, 2024
1 parent 3cd08a8 commit 57ed040
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions schemes/domain/schemes/overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,4 @@ class FundingProgrammes:
CRSTS = FundingProgramme("CRSTS", False, False)
LUF1 = FundingProgramme("LUF1", False, False)
LUF2 = FundingProgramme("LUF2", False, False)
LUF3 = FundingProgramme("LUF3", False, False)
1 change: 1 addition & 0 deletions schemes/infrastructure/database/schemes/overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class FundingProgrammeMapper:
FundingProgrammes.CRSTS: 5,
FundingProgrammes.LUF1: 6,
FundingProgrammes.LUF2: 7,
FundingProgrammes.LUF3: 8,
}

def to_id(self, funding_programme: FundingProgramme) -> int:
Expand Down
2 changes: 2 additions & 0 deletions schemes/views/schemes/overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class FundingProgrammeRepr(Enum):
CRSTS = "CRSTS"
LUF1 = "LUF1"
LUF2 = "LUF2"
LUF3 = "LUF3"

@classmethod
def from_domain(cls, funding_programme: FundingProgramme) -> FundingProgrammeRepr:
Expand All @@ -99,4 +100,5 @@ def _members() -> dict[FundingProgramme, FundingProgrammeRepr]:
FundingProgrammes.CRSTS: FundingProgrammeRepr.CRSTS,
FundingProgrammes.LUF1: FundingProgrammeRepr.LUF1,
FundingProgrammes.LUF2: FundingProgrammeRepr.LUF2,
FundingProgrammes.LUF3: FundingProgrammeRepr.LUF3,
}
1 change: 1 addition & 0 deletions schemes/views/schemes/schemes.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ class FundingProgrammeContext:
FundingProgrammes.CRSTS: "CRSTS",
FundingProgrammes.LUF1: "LUF1",
FundingProgrammes.LUF2: "LUF2",
FundingProgrammes.LUF3: "LUF3",
}

@classmethod
Expand Down
3 changes: 3 additions & 0 deletions tests/domain/schemes/test_schemes.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ class TestFundingProgrammes:
(FundingProgrammes.CRSTS, "CRSTS"),
(FundingProgrammes.LUF1, "LUF1"),
(FundingProgrammes.LUF2, "LUF2"),
(FundingProgrammes.LUF3, "LUF3"),
],
)
def test_code(self, funding_programme: FundingProgramme, expected_code: str) -> None:
Expand All @@ -272,6 +273,7 @@ def test_code(self, funding_programme: FundingProgramme, expected_code: str) ->
(FundingProgrammes.CRSTS, False),
(FundingProgrammes.LUF1, False),
(FundingProgrammes.LUF2, False),
(FundingProgrammes.LUF3, False),
],
)
def test_is_under_embargo(self, funding_programme: FundingProgramme, expected_is_under_embargo: bool) -> None:
Expand All @@ -287,6 +289,7 @@ def test_is_under_embargo(self, funding_programme: FundingProgramme, expected_is
(FundingProgrammes.CRSTS, False),
(FundingProgrammes.LUF1, False),
(FundingProgrammes.LUF2, False),
(FundingProgrammes.LUF3, False),
],
)
def test_is_eligible_for_authority_update(
Expand Down
1 change: 1 addition & 0 deletions tests/infrastructure/database/schemes/test_overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def test_to_domain(self, type_: SchemeType, id_: int) -> None:
(FundingProgrammes.CRSTS, 5),
(FundingProgrammes.LUF1, 6),
(FundingProgrammes.LUF2, 7),
(FundingProgrammes.LUF3, 8),
],
)
class TestFundingProgrammeMapper:
Expand Down
1 change: 1 addition & 0 deletions tests/views/schemes/test_overview.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ def test_to_domain(self, type_: SchemeType, type_repr: str) -> None:
(FundingProgrammes.CRSTS, "CRSTS"),
(FundingProgrammes.LUF1, "LUF1"),
(FundingProgrammes.LUF2, "LUF2"),
(FundingProgrammes.LUF3, "LUF3"),
],
)
class TestFundingProgrammeRepr:
Expand Down
1 change: 1 addition & 0 deletions tests/views/schemes/test_schemes.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ class TestFundingProgrammeContext:
(FundingProgrammes.CRSTS, "CRSTS"),
(FundingProgrammes.LUF1, "LUF1"),
(FundingProgrammes.LUF2, "LUF2"),
(FundingProgrammes.LUF3, "LUF3"),
],
)
def test_from_domain(self, funding_programme: FundingProgramme, expected_name: str) -> None:
Expand Down

0 comments on commit 57ed040

Please sign in to comment.