From 6df1c02d3062066e4820c85e40c9ea64ebf9b62c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 2 Sep 2024 15:27:31 +0200 Subject: [PATCH] (PC-30722)[PRO] feat: remove *_new_nav@* users. Those are not required any longer since the new portal is the default. --- .../creators/e2e/create_e2e_bank_accounts.py | 21 ------------------- .../create_users_and_offerers.py | 4 ---- .../creators/e2e/create_e2e_invoices.py | 4 +--- .../creators/e2e/create_e2e_pro_users.py | 4 ++-- .../create_industrial_bank_accounts.py | 21 ------------------- .../create_users_and_offerers.py | 4 ---- .../industrial/create_industrial_invoices.py | 4 +--- .../industrial/create_industrial_pro_users.py | 4 ++-- .../e2e/step-definitions/commonSteps.cy.ts | 4 ++-- 9 files changed, 8 insertions(+), 62 deletions(-) diff --git a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_bank_accounts.py b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_bank_accounts.py index d2ee4aeb388..c72919ae776 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_bank_accounts.py +++ b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_bank_accounts.py @@ -26,9 +26,6 @@ def create_offerer_without_bank_accounts() -> None: name="1 - [CB] Structure sans coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_without_bank_accounts, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_without_bank_accounts, user__email="activation_new_nav@example.com" - ) venue = offerers_factories.VenueFactory(managingOfferer=offerer_without_bank_accounts, pricing_point="self") offer = offers_factories.OfferFactory(venue=venue) offers_factories.StockFactory(offer=offer) @@ -42,9 +39,6 @@ def create_offerer_with_various_bank_accounts_state() -> None: offerers_factories.UserOffererFactory( offerer=offerer_with_various_bank_accounts_status, user__email="activation@example.com" ) - offerers_factories.UserOffererFactory( - offerer=offerer_with_various_bank_accounts_status, user__email="activation_new_nav@example.com" - ) finance_factories.BankAccountFactory( status=finance_models.BankAccountApplicationStatus.ACCEPTED, offerer=offerer_with_various_bank_accounts_status ) @@ -75,9 +69,6 @@ def create_offerer_with_all_his_venue_linked() -> None: name="1 - [CB] Structure avec tous ses lieux liés à des coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_with_all_venues_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_all_venues_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_all_venues_linked, pricing_point="self" ) @@ -98,9 +89,6 @@ def create_offerer_at_least_one_venue_linked() -> None: name="1 - [CB] Structure avec un de ses lieux non rattachés à des coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_with_one_venue_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_one_venue_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_one_venue_linked, pricing_point="self" ) @@ -120,9 +108,6 @@ def create_offerer_with_none_venue_linked() -> None: name="1 - [CB] Structure avec aucun de ses lieux liés à des coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_with_none_venue_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_none_venue_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_none_venue_linked, pricing_point="self" ) @@ -142,9 +127,6 @@ def create_offerer_with_all_his_venue_linked_to_one_bank_account() -> None: name="1 - [CB] Structure avec deux coordonnées bancaires dont tous les lieux sont liés à l’une d’entre elles." ) offerers_factories.UserOffererFactory(offerer=offerer_with_all_venues_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_all_venues_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_all_venues_linked, pricing_point="self" ) @@ -168,9 +150,6 @@ def create_offerer_with_only_one_venue_linked() -> None: offerers_factories.UserOffererFactory( offerer=offerer_with_only_one_venue_linked, user__email="activation@example.com" ) - offerers_factories.UserOffererFactory( - offerer=offerer_with_only_one_venue_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_only_one_venue_linked, pricing_point="self" ) diff --git a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_eac_data/create_users_and_offerers.py b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_eac_data/create_users_and_offerers.py index 681bef71f7d..ac41a2c56dc 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_eac_data/create_users_and_offerers.py +++ b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_eac_data/create_users_and_offerers.py @@ -18,10 +18,6 @@ def create_users_offerers() -> list[offerers_models.Offerer]: offerer__siren="444608442", offerer__allowedOnAdage=True, ) - offerers_factories.UserOffererFactory( - user__email="eac_2_lieu_new_nav@example.com", - offerer=user_offerer.offerer, - ) offerers.append(user_offerer.offerer) user_offerer = offerers_factories.UserOffererFactory( user__email="retention_structures@example.com", diff --git a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_invoices.py b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_invoices.py index 27d6f3074c4..defcccdf14c 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_invoices.py +++ b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_invoices.py @@ -39,7 +39,7 @@ def create_free_invoice() -> None: logger.info("create_free_invoice") offerer = offerers_factories.OffererFactory(name="0 - Structure avec compte bancaire et justificatif à 0€") bank_account = finance_factories.BankAccountFactory(offerer=offerer) - offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation_new_nav@example.com") + offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation@example.com") pricing_point = offerers_factories.VenueFactory( name="Point de valorisation pour justificatifs à 0€", managingOfferer=offerer, @@ -86,7 +86,6 @@ def create_specific_invoice() -> None: offerer = offerers_factories.OffererFactory(name="0 - Structure avec justificatif et compte bancaire") bank_account = finance_factories.BankAccountFactory(offerer=offerer) offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation@example.com") - offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation_new_nav@example.com") venue = offerers_factories.VenueFactory( name="Lieu avec justificatif", managingOfferer=offerer, @@ -212,7 +211,6 @@ def create_specific_cashflow_batch_without_invoice() -> None: logger.info("create_specific_cashflow_batch_without_invoice") offerer = offerers_factories.OffererFactory(name="0 - Structure avec justificatif copié") offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation@example.com") - offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation_new_nav@example.com") venue = offerers_factories.VenueFactory( name="Lieu avec justificatif copié", managingOfferer=offerer, diff --git a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_pro_users.py b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_pro_users.py index e64ec4eba10..3623292004e 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_pro_users.py +++ b/api/src/pcapi/sandboxes/scripts/creators/e2e/create_e2e_pro_users.py @@ -46,8 +46,8 @@ def create_e2e_pro_users(offerers_by_name: dict) -> dict[str, User]: users_by_name["pro retention"] = pro_retention users_by_name["pro retention structures"] = pro_retention_structures users_by_name["pro pro adage eligible"] = pro_adage_eligible - pro_new_nav_state = users_factories.ProFactory(email="activation_new_nav@example.com") - eac_new_nav_state = users_factories.ProFactory(email="eac_2_lieu_new_nav@example.com") + pro_new_nav_state = users_factories.ProFactory(email="activation@example.com") + eac_new_nav_state = users_factories.ProFactory(email="eac_2_lieu@example.com") repository.save(*users_by_name.values(), pro_new_nav_state, eac_new_nav_state) diff --git a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_bank_accounts.py b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_bank_accounts.py index 0955e68df60..e6c9d964ca4 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_bank_accounts.py +++ b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_bank_accounts.py @@ -26,9 +26,6 @@ def create_offerer_without_bank_accounts() -> None: name="1 - [CB] Structure sans coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_without_bank_accounts, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_without_bank_accounts, user__email="activation_new_nav@example.com" - ) venue = offerers_factories.VenueFactory(managingOfferer=offerer_without_bank_accounts, pricing_point="self") offer = offers_factories.OfferFactory(venue=venue) offers_factories.StockFactory(offer=offer) @@ -42,9 +39,6 @@ def create_offerer_with_various_bank_accounts_state() -> None: offerers_factories.UserOffererFactory( offerer=offerer_with_various_bank_accounts_status, user__email="activation@example.com" ) - offerers_factories.UserOffererFactory( - offerer=offerer_with_various_bank_accounts_status, user__email="activation_new_nav@example.com" - ) finance_factories.BankAccountFactory( status=finance_models.BankAccountApplicationStatus.ACCEPTED, offerer=offerer_with_various_bank_accounts_status ) @@ -75,9 +69,6 @@ def create_offerer_with_all_his_venue_linked() -> None: name="1 - [CB] Structure avec tous ses lieux liés à des coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_with_all_venues_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_all_venues_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_all_venues_linked, pricing_point="self" ) @@ -98,9 +89,6 @@ def create_offerer_at_least_one_venue_linked() -> None: name="1 - [CB] Structure avec un de ses lieux non rattachés à des coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_with_one_venue_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_one_venue_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_one_venue_linked, pricing_point="self" ) @@ -120,9 +108,6 @@ def create_offerer_with_none_venue_linked() -> None: name="1 - [CB] Structure avec aucun de ses lieux liés à des coordonnées bancaires" ) offerers_factories.UserOffererFactory(offerer=offerer_with_none_venue_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_none_venue_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_none_venue_linked, pricing_point="self" ) @@ -142,9 +127,6 @@ def create_offerer_with_all_his_venue_linked_to_one_bank_account() -> None: name="1 - [CB] Structure avec deux coordonnées bancaires dont tous les lieux sont liés à l’une d’entre elles." ) offerers_factories.UserOffererFactory(offerer=offerer_with_all_venues_linked, user__email="activation@example.com") - offerers_factories.UserOffererFactory( - offerer=offerer_with_all_venues_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_all_venues_linked, pricing_point="self" ) @@ -168,9 +150,6 @@ def create_offerer_with_only_one_venue_linked() -> None: offerers_factories.UserOffererFactory( offerer=offerer_with_only_one_venue_linked, user__email="activation@example.com" ) - offerers_factories.UserOffererFactory( - offerer=offerer_with_only_one_venue_linked, user__email="activation_new_nav@example.com" - ) first_venue_with_non_free_offer = offerers_factories.VenueFactory( managingOfferer=offerer_with_only_one_venue_linked, pricing_point="self" ) diff --git a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_eac_data/create_users_and_offerers.py b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_eac_data/create_users_and_offerers.py index a973a7f668b..044a5e2d8bd 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_eac_data/create_users_and_offerers.py +++ b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_eac_data/create_users_and_offerers.py @@ -18,10 +18,6 @@ def create_users_offerers() -> list[offerers_models.Offerer]: offerer__siren="444608442", offerer__allowedOnAdage=True, ) - offerers_factories.UserOffererFactory( - user__email="eac_2_lieu_new_nav@example.com", - offerer=user_offerer.offerer, - ) offerers.append(user_offerer.offerer) user_offerer = offerers_factories.UserOffererFactory( user__email="retention_structures@example.com", diff --git a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_invoices.py b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_invoices.py index 249de5c7f14..1a30cc6e678 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_invoices.py +++ b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_invoices.py @@ -39,7 +39,7 @@ def create_free_invoice() -> None: logger.info("create_free_invoice") offerer = offerers_factories.OffererFactory(name="0 - Structure avec compte bancaire et justificatif à 0€") bank_account = finance_factories.BankAccountFactory(offerer=offerer) - offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation_new_nav@example.com") + offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation@example.com") pricing_point = offerers_factories.VenueFactory( name="Point de valorisation pour justificatifs à 0€", managingOfferer=offerer, @@ -86,7 +86,6 @@ def create_specific_invoice() -> None: offerer = offerers_factories.OffererFactory(name="0 - Structure avec justificatif et compte bancaire") bank_account = finance_factories.BankAccountFactory(offerer=offerer) offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation@example.com") - offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation_new_nav@example.com") venue = offerers_factories.VenueFactory( name="Lieu avec justificatif", managingOfferer=offerer, @@ -212,7 +211,6 @@ def create_specific_cashflow_batch_without_invoice() -> None: logger.info("create_specific_cashflow_batch_without_invoice") offerer = offerers_factories.OffererFactory(name="0 - Structure avec justificatif copié") offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation@example.com") - offerers_factories.UserOffererFactory(offerer=offerer, user__email="activation_new_nav@example.com") venue = offerers_factories.VenueFactory( name="Lieu avec justificatif copié", managingOfferer=offerer, diff --git a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_pro_users.py b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_pro_users.py index c504ed8d7bf..d7ba47ef590 100644 --- a/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_pro_users.py +++ b/api/src/pcapi/sandboxes/scripts/creators/industrial/create_industrial_pro_users.py @@ -46,8 +46,8 @@ def create_industrial_pro_users(offerers_by_name: dict) -> dict[str, User]: users_by_name["pro retention"] = pro_retention users_by_name["pro retention structures"] = pro_retention_structures users_by_name["pro pro adage eligible"] = pro_adage_eligible - pro_new_nav_state = users_factories.ProFactory(email="activation_new_nav@example.com") - eac_new_nav_state = users_factories.ProFactory(email="eac_2_lieu_new_nav@example.com") + pro_new_nav_state = users_factories.ProFactory(email="activation@example.com") + eac_new_nav_state = users_factories.ProFactory(email="eac_2_lieu@example.com") repository.save(*users_by_name.values(), pro_new_nav_state, eac_new_nav_state) diff --git a/pro/cypress/e2e/step-definitions/commonSteps.cy.ts b/pro/cypress/e2e/step-definitions/commonSteps.cy.ts index df6ba55e900..2e834d8002b 100644 --- a/pro/cypress/e2e/step-definitions/commonSteps.cy.ts +++ b/pro/cypress/e2e/step-definitions/commonSteps.cy.ts @@ -31,7 +31,7 @@ Given('I am logged in with account 1', () => { Given('I am logged in with account 2', () => { cy.login({ - email: 'activation_new_nav@example.com', + email: 'activation@example.com', password: 'user@AZERTY123', }) cy.findAllByTestId('spinner').should('not.exist') @@ -39,7 +39,7 @@ Given('I am logged in with account 2', () => { Given('I am logged in with account 2 and no cookie selection', () => { cy.login({ - email: 'activation_new_nav@example.com', + email: 'activation@example.com', password: 'user@AZERTY123', refusePopupCookies: false, })