[Offering] Permanently enable service offering feature flag (#2917)

* feat(#2894): Permanently enable service offering feature flag

* feat(#2894): Remove unnecessary tests

* feat(#2894): Update tests

Author: pbanaszkiewicz

config/settings.py

@@ -653,14 +653,8 @@
     ],
     # ------------
     # Enable the Service Offering module.
-    # The "not_in_production" required condition evaluates to False when
-    # PROD_ENVIRONMENT=True, permanently disabling the flag in production.
-    # In lower environments the flag can be toggled on/off via URL parameter or session.
     "SERVICE_OFFERING": [
-        {"condition": "not_in_production", "value": True, "required": True},
-        {"condition": "anonymous", "value": False, "required": True},
-        {"condition": "parameter", "value": "enable_service_offering=true"},
-        {"condition": "session", "value": "enable_service_offering"},
+        {"condition": "boolean", "value": True},
     ],
 }
 

src/extrequests/tests/test_training_request.py

@@ -283,6 +283,8 @@ def setUp(self) -> None:
         self.learner = Role.objects.get(name="learner")
         self.ttt = Tag.objects.get(name="TTT")
 
+        self.benefit = Benefit.objects.get(name="Instructor Training")
+
         self.first_training = Event.objects.create(slug="ttt-event", host=self.org)
         self.first_training.tags.add(self.ttt)
         Task.objects.create(person=self.spiderman, role=self.learner, event=self.first_training)
@@ -363,6 +365,7 @@ def test_successful_matching_to_training(self) -> None:
             "match": "",
             "event": self.second_training.pk,
             "requests": [self.first_req.pk],
+            "benefit_override": self.benefit.pk,
             # "seat_public": "True",
         }
         rv = self.client.post(reverse("all_trainingrequests"), data, follow=True)
@@ -385,6 +388,7 @@ def test_successful_matching_twice_to_the_same_training(self) -> None:
             "match": "",
             "event": self.first_training.pk,
             "requests": [self.first_req.pk],
+            "benefit_override": self.benefit.pk,
         }
         # Spiderman is already matched with first_training
         assert self.spiderman.get_training_tasks()[0].event == self.first_training
@@ -419,6 +423,7 @@ def test_successful_matching_to_allocated_benefit(self) -> None:
             "event": self.second_training.pk,
             "requests": [self.first_req.pk],
             "allocated_benefit": account_benefit.pk,
+            "benefit_override": benefit.pk,
         }
 
         # Act
@@ -442,6 +447,7 @@ def test_trainee_accepted_during_matching(self) -> None:
             "match": "",
             "event": self.second_training.pk,
             "requests": [self.second_req.pk],
+            "benefit_override": self.benefit.pk,
             # "seat_public": "True",
         }
         rv = self.client.post(reverse("all_trainingrequests"), data, follow=True)
@@ -561,6 +567,7 @@ def test_matching_no_remaining__no_message(self) -> None:
             "requests": [self.first_req.pk, self.third_req.pk],
             "event": self.second_training.pk,
             "seat_membership": membership1.pk,
+            "benefit_override": self.benefit.pk,
             # "seat_public": True,
         }
         msg1 = f"Membership "{membership1}" is using more training seats than it's been allowed."
@@ -571,6 +578,7 @@ def test_matching_no_remaining__no_message(self) -> None:
             "requests": [self.second_req.pk],
             "event": self.second_training.pk,
             "seat_membership": membership2.pk,
+            "benefit_override": self.benefit.pk,
             # "seat_public": True,
         }
         msg2 = f"Membership "{membership2}" is using more training seats than it's been allowed."
@@ -649,6 +657,7 @@ def test_auto_assign_membership_seats(self) -> None:
             "event": self.first_training.pk,
             "auto_assign": "True",
             "requests": [req1.pk, req2.pk, req3.pk, self.first_req.pk],
+            "benefit_override": self.benefit.pk,
             # "seat_public": "True",
         }
 
@@ -664,7 +673,10 @@ def test_auto_assign_membership_seats(self) -> None:
         self.assertContains(rv, "2 request(s) were skipped due to errors")
         self.assertEqual(Task.objects.filter(seat_membership=membership_alpha).count(), 1)
         self.assertEqual(Task.objects.filter(seat_membership=membership_beta).count(), 1)
-        self.assertContains(rv, "No membership found for registration code "invalid"")
+        self.assertContains(
+            rv,
+            "No membership, partnership, or account benefit found for registration code "invalid"",
+        )
         self.assertContains(
             rv,
             "Request does not include a member registration code, so cannot be matched to a membership seat.",
@@ -1164,6 +1176,7 @@ def test_matching_without_membership_or_benefit(self) -> None:
             "match": "",
             "event": self.second_training.pk,
             "requests": [self.first_req.pk],
+            "benefit_override": self.benefit.pk,
             # No seat_membership or allocated_benefit provided
         }
 
@@ -1203,6 +1216,7 @@ def test_auto_assign_multiple_requests_partial_success(self) -> None:
             "event": self.first_training.pk,
             "auto_assign": "True",
             "requests": [req_valid.pk, req_invalid.pk, req_no_code.pk],
+            "benefit_override": self.benefit.pk,
         }
 
         # Act

src/offering/tests/test_feature_flags.py

@@ -1,10 +1,7 @@
-from typing import Any, cast
 from unittest.mock import MagicMock
 
-from django.conf import settings
 from django.http import HttpRequest
 from django.test import RequestFactory, TestCase, override_settings
-from flags.state import flag_enabled  # type: ignore[import-untyped]
 
 from src.offering.conditions import not_in_production_condition
 
@@ -35,37 +32,3 @@ def test_returns_false_in_production(self) -> None:
     def test_returns_true_outside_production(self) -> None:
         """Condition evaluates to True when PROD_ENVIRONMENT is False."""
         self.assertTrue(not_in_production_condition(True))
-
-
-class TestServiceOfferingFlagProductionGuard(TestCase):
-    """Verify that the SERVICE_OFFERING flag cannot be enabled in production."""
-
-    @override_settings(PROD_ENVIRONMENT=True)
-    def test_flag_disabled_in_production_without_parameter(self) -> None:
-        """Flag is disabled in production even without the enabling parameter."""
-        self.assertFalse(flag_enabled(FLAG_NAME, request=_make_request("/")))
-
-    @override_settings(PROD_ENVIRONMENT=True)
-    def test_flag_disabled_in_production_with_enabling_parameter(self) -> None:
-        """Flag stays disabled in production even when the enabling URL parameter is present."""
-        self.assertFalse(flag_enabled(FLAG_NAME, request=_make_request("/?enable_service_offering=true")))
-
-    @override_settings(PROD_ENVIRONMENT=False)
-    def test_flag_can_be_enabled_in_non_production_via_parameter(self) -> None:
-        """Flag can be enabled in non-production environments via URL parameter."""
-        self.assertTrue(flag_enabled(FLAG_NAME, request=_make_request("/?enable_service_offering=true")))
-
-    @override_settings(PROD_ENVIRONMENT=False)
-    def test_flag_disabled_in_non_production_without_parameter(self) -> None:
-        """Flag is still disabled in non-production when no enabling condition is present."""
-        self.assertFalse(flag_enabled(FLAG_NAME, request=_make_request("/")))
-
-    def test_settings_have_required_not_in_production_condition(self) -> None:
-        """SERVICE_OFFERING flag in settings has a required not_in_production condition."""
-        conditions = cast(list[Any], settings.FLAGS[FLAG_NAME])
-        required = [
-            c
-            for c in conditions
-            if isinstance(c, dict) and c.get("condition") == "not_in_production" and c.get("required") is True
-        ]
-        self.assertEqual(len(required), 1)