(PC-8815) Remove some feature default disability

src/pcapi/models/feature.py

@@ -64,12 +64,9 @@ def nameKey(self) -> str:
 
 
 FEATURES_DISABLED_BY_DEFAULT = (
-    FeatureToggle.APPLY_BOOKING_LIMITS_V2,
-    FeatureToggle.WHOLE_FRANCE_OPENING,
     FeatureToggle.AUTO_ACTIVATE_DIGITAL_BOOKINGS,
     FeatureToggle.ENABLE_ACTIVATION_CODES,
     FeatureToggle.USE_NEW_BATCH_INDEX_OFFERS_BEHAVIOUR,
-    FeatureToggle.ENABLE_NATIVE_ID_CHECK_VERSION,
     FeatureToggle.FORCE_PHONE_VALIDATION,
 )
 

tests/emails/beneficiary_activation_test.py

@@ -94,7 +94,7 @@ def test_return_correct_email_metadata(self):
             "Mj-TemplateID": 2016025,
             "Mj-TemplateLanguage": True,
             "Vars": {
-                "depositAmount": 500,
+                "depositAmount": 300,
             },
         }
 

tests/routes/native/v1/account_test.py

@@ -655,6 +655,7 @@ def test_against_beneficiary(self, beneficiary, expected):
         assert account_serializers.UserProfileResponse._show_eligible_card(user) == expected
 
     @pytest.mark.parametrize("departement,expected", [("93", True), ("92", False)])
+    @override_features(WHOLE_FRANCE_OPENING=False)
     def test_against_departement(self, departement, expected):
         date_of_birth = datetime.now() - relativedelta(years=18, days=5)
         date_of_creation = datetime.now() - relativedelta(years=4)

tests/scripts/beneficiary/remote_import_test.py

@@ -280,7 +280,7 @@ def test_new_beneficiaries_are_recorded_with_deposit(self, app):
         # then
         first = User.query.first()
         assert first.email == "jane.doe@example.com"
-        assert first.wallet_balance == 500
+        assert first.wallet_balance == 300
         assert first.civility == "Mme"
         assert first.activity == "Étudiant"
 
@@ -290,7 +290,7 @@ def test_new_beneficiaries_are_recorded_with_deposit(self, app):
                     "date(u.date_created)": first.dateCreated.strftime("%Y-%m-%dT%H:%M:%S"),
                     "date(u.date_of_birth)": "2000-05-01T00:00:00",
                     "date(u.deposit_expiration_date)": first.deposit.expirationDate.strftime("%Y-%m-%dT%H:%M:%S"),
-                    "u.credit": 50000,
+                    "u.credit": 30000,
                     "u.is_beneficiary": True,
                     "u.marketing_push_subscription": True,
                     "u.postal_code": "93130",
@@ -789,7 +789,7 @@ def test_import_makes_user_beneficiary(self):
                     "date(u.date_created)": user.dateCreated.strftime("%Y-%m-%dT%H:%M:%S"),
                     "date(u.date_of_birth)": date_of_birth,
                     "date(u.deposit_expiration_date)": user.deposit.expirationDate.strftime("%Y-%m-%dT%H:%M:%S"),
-                    "u.credit": 50000,
+                    "u.credit": 30000,
                     "u.is_beneficiary": True,
                     "u.marketing_push_subscription": True,
                     "u.postal_code": "93450",

tests/scripts/change_pro_users_to_beneficiary_test.py

@@ -1,5 +1,6 @@
 import pytest
 
+from pcapi.core.testing import override_features
 from pcapi.model_creators.generic_creators import create_offerer
 from pcapi.model_creators.generic_creators import create_user
 from pcapi.model_creators.generic_creators import create_user_offerer
@@ -26,6 +27,35 @@ def test_should_change_pro_users_to_beneficiary(app):
     # when
     change_pro_users_to_beneficiary(pro_users_list_to_change)
 
+    # then
+    assert pro_1.isBeneficiary
+    assert pro_1.needsToFillCulturalSurvey
+    assert pro_1.wallet_balance == 300
+    assert pro_2.isBeneficiary
+    assert pro_2.needsToFillCulturalSurvey
+    assert pro_2.wallet_balance == 300
+    assert UserOfferer.query.count() == 1
+
+
+@pytest.mark.usefixtures("db_session")
+@override_features(APPLY_BOOKING_LIMITS_V2=False)
+def test_should_change_pro_users_to_beneficiary_with_v1_deposit(app):
+    # given
+    offerer_1 = create_offerer(siren="987654321")
+    offerer_2 = create_offerer(siren="567890342")
+    offerer_3 = create_offerer(siren="345987987")
+    pro_1 = create_user(email="email@example.com", is_beneficiary=False, needs_to_fill_cultural_survey=False)
+    pro_2 = create_user(email="email2@example.com")
+    pro_3 = create_user(email="email3@example.com")
+    user_offerer_1 = create_user_offerer(pro_1, offerer_1)
+    user_offerer_2 = create_user_offerer(pro_1, offerer_2)
+    user_offerer_3 = create_user_offerer(pro_3, offerer_3)
+    repository.save(pro_1, pro_2, user_offerer_1, user_offerer_2, user_offerer_3)
+    pro_users_list_to_change = [pro_1.id, pro_2.id]
+
+    # when
+    change_pro_users_to_beneficiary(pro_users_list_to_change)
+
     # then
     assert pro_1.isBeneficiary
     assert pro_1.needsToFillCulturalSurvey

tests/scripts/grant_wallet_to_existing_users_test.py

@@ -1,14 +1,34 @@
-import pytest
-
+from pcapi.core.testing import override_features
 from pcapi.core.users.models import User
 from pcapi.model_creators.generic_creators import create_user
 from pcapi.models import Deposit
 from pcapi.repository import repository
 from pcapi.scripts.grant_wallet_to_existing_users import grant_wallet_to_existing_users
 
 
-@pytest.mark.usefixtures("db_session")
-def test_should_grant_wallet_to_existing_users(app):
+def test_should_grant_wallet_to_existing_users(app, db_session):
+    # given
+    beneficiary = create_user(email="email@example.com")
+    beneficiary_2 = create_user(email="email2@example.com")
+
+    repository.save(beneficiary, beneficiary_2)
+
+    # when
+    grant_wallet_to_existing_users([beneficiary.id, beneficiary_2.id])
+
+    # then
+    users = User.query.join(Deposit).with_entities(Deposit.amount, User.isBeneficiary).all()
+    user_1 = users[0]
+    user_2 = users[1]
+
+    assert user_1.amount == 300
+    assert user_1.isBeneficiary
+    assert user_2.amount == 300
+    assert user_2.isBeneficiary
+
+
+@override_features(APPLY_BOOKING_LIMITS_V2=False)
+def test_should_grant_wallet_to_existing_users_with_v1_deposit(app, db_session):
     # given
     beneficiary = create_user(email="email@example.com")
     beneficiary_2 = create_user(email="email2@example.com")

tests/use_cases/create_beneficiary_from_application_test.py

@@ -82,7 +82,7 @@ def test_saved_a_beneficiary_from_application(stubed_random_token, mocked_send_a
     assert beneficiary.notificationSubscriptions == {"marketing_push": True, "marketing_email": True}
 
     deposit = Deposit.query.one()
-    assert deposit.amount == 500
+    assert deposit.amount == 300
     assert deposit.source == "dossier jouve [35]"
     assert deposit.userId == beneficiary.id
 
@@ -100,7 +100,7 @@ def test_saved_a_beneficiary_from_application(stubed_random_token, mocked_send_a
         {
             "user_id": beneficiary.id,
             "attribute_values": {
-                "u.credit": 50000,
+                "u.credit": 30000,
                 "date(u.date_of_birth)": "1995-02-05T00:00:00",
                 "u.postal_code": "35123",
                 "date(u.date_created)": beneficiary.dateCreated.strftime("%Y-%m-%dT%H:%M:%S"),
@@ -141,7 +141,7 @@ def test_application_for_native_app_user(mocked_send_accepted_as_beneficiary_ema
 
     beneficiary = User.query.one()
     deposit = Deposit.query.one()
-    assert deposit.amount == 500
+    assert deposit.amount == 300
     assert deposit.source == "dossier jouve [35]"
     assert deposit.userId == beneficiary.id
 
@@ -155,7 +155,7 @@ def test_application_for_native_app_user(mocked_send_accepted_as_beneficiary_ema
         {
             "user_id": beneficiary.id,
             "attribute_values": {
-                "u.credit": 50000,
+                "u.credit": 30000,
                 "date(u.date_of_birth)": "1995-02-05T00:00:00",
                 "u.postal_code": "35123",
                 "date(u.date_created)": beneficiary.dateCreated.strftime("%Y-%m-%dT%H:%M:%S"),