GH-259: Remove under embargo from funding programme

Author: markhobson

schemes/domain/schemes/overview.py

@@ -13,25 +13,24 @@ class SchemeType(Enum):
 @dataclass(frozen=True)
 class FundingProgramme:
     code: str
-    is_under_embargo: bool
     is_eligible_for_authority_update: bool
 
 
 class FundingProgrammes:
-    ATF2 = FundingProgramme("ATF2", False, True)
-    ATF3 = FundingProgramme("ATF3", False, True)
-    ATF4 = FundingProgramme("ATF4", False, True)
-    ATF4E = FundingProgramme("ATF4e", False, True)
-    ATF5 = FundingProgramme("ATF5", False, True)
-    CATF = FundingProgramme("CATF", False, True)
-    CRSTS = FundingProgramme("CRSTS", False, False)
-    IST = FundingProgramme("IST", False, True)
-    LUF1 = FundingProgramme("LUF1", False, False)
-    LUF2 = FundingProgramme("LUF2", False, False)
-    LUF3 = FundingProgramme("LUF3", False, False)
-    MRN = FundingProgramme("MRN", False, False)
-    OTH = FundingProgramme("OTH", False, False)
-    CON = FundingProgramme("CON", False, True)
+    ATF2 = FundingProgramme("ATF2", True)
+    ATF3 = FundingProgramme("ATF3", True)
+    ATF4 = FundingProgramme("ATF4", True)
+    ATF4E = FundingProgramme("ATF4e", True)
+    ATF5 = FundingProgramme("ATF5", True)
+    CATF = FundingProgramme("CATF", True)
+    CRSTS = FundingProgramme("CRSTS", False)
+    IST = FundingProgramme("IST", True)
+    LUF1 = FundingProgramme("LUF1", False)
+    LUF2 = FundingProgramme("LUF2", False)
+    LUF3 = FundingProgramme("LUF3", False)
+    MRN = FundingProgramme("MRN", False)
+    OTH = FundingProgramme("OTH", False)
+    CON = FundingProgramme("CON", True)
 
 
 class OverviewRevision:

schemes/domain/schemes/schemes.py

@@ -56,13 +56,8 @@ def reviews(self) -> SchemeReviews:
     @property
     def is_updateable(self) -> bool:
         is_active = self.status == Status.ACTIVE
-        is_under_embargo = self._is_under_embargo(self.overview.funding_programme)
         is_eligible_for_authority_update = self._is_eligible_for_authority_update(self.overview.funding_programme)
-        return is_active and not is_under_embargo and is_eligible_for_authority_update
-
-    @staticmethod
-    def _is_under_embargo(funding_programme: FundingProgramme | None) -> bool:
-        return funding_programme.is_under_embargo if funding_programme else False
+        return is_active and is_eligible_for_authority_update
 
     @staticmethod
     def _is_eligible_for_authority_update(funding_programme: FundingProgramme | None) -> bool:

schemes/infrastructure/api/funding_programmes.py

@@ -11,14 +11,14 @@ class FundingProgrammeModel(BaseModel):
     code: str
 
     def to_domain(self) -> FundingProgramme:
-        # TODO: is_under_embargo, is_eligible_for_authority_update
-        return FundingProgramme(code=self.code, is_under_embargo=False, is_eligible_for_authority_update=True)
+        # TODO: is_eligible_for_authority_update
+        return FundingProgramme(code=self.code, is_eligible_for_authority_update=True)
 
 
 class FundingProgrammeItemModel(BaseModel):
     id: Annotated[AnyUrl, Field(alias="@id")]
     code: str
 
     def to_domain(self) -> FundingProgramme:
-        # TODO: is_under_embargo, is_eligible_for_authority_update
-        return FundingProgramme(code=self.code, is_under_embargo=False, is_eligible_for_authority_update=True)
+        # TODO: is_eligible_for_authority_update
+        return FundingProgramme(code=self.code, is_eligible_for_authority_update=True)

tests/unit/domain/schemes/test_schemes.py

@@ -64,26 +64,7 @@ def test_is_updateable_when_active(self, status: Status, expected_updateable: bo
         "funding_programme, expected_updateable",
         [
             (FundingProgrammes.ATF4, True),
-            (FundingProgramme("ATF100", True, False), False),
-        ],
-    )
-    def test_is_updateable_when_not_under_embargo(
-        self, funding_programme: FundingProgramme, expected_updateable: bool
-    ) -> None:
-        scheme = build_scheme(
-            reference="ATE00001",
-            name="Wirral Package",
-            funding_programme=funding_programme,
-            status=Status.ACTIVE,
-        )
-
-        assert scheme.is_updateable == expected_updateable
-
-    @pytest.mark.parametrize(
-        "funding_programme, expected_updateable",
-        [
-            (FundingProgrammes.ATF4, True),
-            (FundingProgramme("ATF100", False, False), False),
+            (FundingProgramme("ATF100", False), False),
         ],
     )
     def test_is_updateable_when_eligible_for_authority_update(
@@ -147,28 +128,6 @@ class TestFundingProgrammes:
     def test_code(self, funding_programme: FundingProgramme, expected_code: str) -> None:
         assert funding_programme.code == expected_code
 
-    @pytest.mark.parametrize(
-        "funding_programme, expected_is_under_embargo",
-        [
-            (FundingProgrammes.ATF2, False),
-            (FundingProgrammes.ATF3, False),
-            (FundingProgrammes.ATF4, False),
-            (FundingProgrammes.ATF4E, False),
-            (FundingProgrammes.ATF5, False),
-            (FundingProgrammes.CATF, False),
-            (FundingProgrammes.CRSTS, False),
-            (FundingProgrammes.IST, False),
-            (FundingProgrammes.LUF1, False),
-            (FundingProgrammes.LUF2, False),
-            (FundingProgrammes.LUF3, False),
-            (FundingProgrammes.MRN, False),
-            (FundingProgrammes.OTH, False),
-            (FundingProgrammes.CON, False),
-        ],
-    )
-    def test_is_under_embargo(self, funding_programme: FundingProgramme, expected_is_under_embargo: bool) -> None:
-        assert funding_programme.is_under_embargo == expected_is_under_embargo
-
     @pytest.mark.parametrize(
         "funding_programme, expected_is_eligible_for_authority_update",
         [