(PC-34394)[API] chore: Delete obsolete variable isOnboardingOngoing

pass-culture · Feb 4, 2025 · e5de5aa · e5de5aa
1 parent b21f993
commit e5de5aa
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 79 deletions.
diff --git a/api/src/pcapi/core/offerers/repository.py b/api/src/pcapi/core/offerers/repository.py
@@ -544,19 +544,6 @@ def get_offerer_and_extradata(offerer_id: int) -> models.Offerer | None:
         .exists()
     )
 
-    has_offer = (
-        sqla.select(1)
-        .select_from(offers_models.Offer)
-        .join(models.Venue, models.Venue.managingOffererId == models.Offerer.id)
-        .where(
-            sqla.and_(
-                offers_models.Offer.venueId == models.Venue.id,
-            )
-        )
-        .correlate(models.Offerer)
-        .exists()
-    )
-
     has_adage_ds_application = (
         sqla.select(1)
         .select_from(models.Venue)
@@ -610,7 +597,6 @@ def get_offerer_and_extradata(offerer_id: int) -> models.Offerer | None:
             sqla.or_(has_adage_ds_application, has_collective_ds_applications, has_non_draft_offers).label(
                 "isOnboarded"
             ),
-            sqla.and_(has_offer, ~has_adage_ds_application, ~has_non_draft_offers).label("isOnboardingOngoing"),
             has_headline_offer.label("hasHeadlineOffer"),
         )
         .filter(models.Offerer.id == offerer_id)

diff --git a/api/src/pcapi/routes/serialization/offerers_serialize.py b/api/src/pcapi/routes/serialization/offerers_serialize.py
@@ -117,7 +117,6 @@ class GetOffererResponseModel(BaseModel):
     allowedOnAdage: bool
     hasBankAccountWithPendingCorrections: bool
     isOnboarded: bool
-    isOnboardingOngoing: bool
     hasHeadlineOffer: bool
 
     @classmethod
@@ -150,7 +149,6 @@ def from_orm(cls, row: Row) -> "GetOffererResponseModel":
         offerer.hasActiveOffer = row.hasActiveOffer
         offerer.hasBankAccountWithPendingCorrections = row.hasBankAccountWithPendingCorrections
         offerer.isOnboarded = row.isOnboarded
-        offerer.isOnboardingOngoing = row.isOnboardingOngoing
         offerer.hasHeadlineOffer = row.hasHeadlineOffer
 
         # We would like the response attribute to be called

diff --git a/api/tests/routes/pro/get_offerer_test.py b/api/tests/routes/pro/get_offerer_test.py
@@ -127,7 +127,6 @@ def test_basics(self, client):
             "street": offerer.street,
             "allowedOnAdage": offerer.allowedOnAdage,
             "isOnboarded": True,
-            "isOnboardingOngoing": False,
         }
         assert response.json == expected_serialized_offerer
 
@@ -443,65 +442,6 @@ def test_offerer_has_inactive_non_free_offer(self, client):
         assert response.json["venuesWithNonFreeOffersWithoutBankAccounts"] == []
         assert response.json["hasNonFreeOffer"] is False
 
-    @pytest.mark.parametrize(
-        "has_adage,num_draft_offer,num_approved_offers",
-        [
-            (True, 1, 3),
-            (True, 2, 1),
-            (True, 0, 3),
-            (True, 3, 3),
-            (True, 0, 0),
-            (False, 1, 3),
-            (False, 2, 1),
-            (False, 0, 3),
-            (False, 3, 3),
-            (False, 0, 0),
-        ],
-    )
-    def test_offerer_has_started_on_boarding(self, client, has_adage, num_draft_offer, num_approved_offers):
-        pro = users_factories.ProFactory()
-        offerer = offerers_factories.OffererFactory()
-        offerers_factories.UserOffererFactory(user=pro, offerer=offerer)
-
-        adage_id = None
-        if has_adage:
-            adage_id = "1"
-
-        venue_with_offer = offerers_factories.VenueFactory(managingOfferer=offerer, adageId=adage_id)
-        if num_approved_offers:
-            offers_factories.OfferFactory.create_batch(
-                num_approved_offers, venue=venue_with_offer, validation=offers_models.OfferValidationStatus.APPROVED
-            )
-        if num_draft_offer:
-            offers_factories.OfferFactory.create_batch(
-                num_draft_offer, venue=venue_with_offer, validation=offers_models.OfferValidationStatus.DRAFT
-            )
-
-        offerer_id = offerer.id
-        client = client.with_session_auth(pro.email)
-        num_queries = testing.AUTHENTICATION_QUERIES
-        num_queries += 1  # check user_offerer exists
-        num_queries += 1  # select offerer
-        num_queries += 1  # select api_key
-        num_queries += 1  # select venue
-        num_queries += 1  # check offerer has non free offers
-        num_queries += 1  # select venue_id
-        num_queries += 1  # select offerer_address
-
-        num_queries += 1  # select venues_id with active offers
-        with testing.assert_num_queries(num_queries):
-            response = client.get(f"/offerers/{offerer_id}")
-            assert response.status_code == 200
-
-        assert response.json["managedVenues"][0]["hasCreatedOffer"] is (num_approved_offers > 0)
-        assert response.json["hasValidBankAccount"] is False
-        assert response.json["hasPendingBankAccount"] is False
-        assert response.json["venuesWithNonFreeOffersWithoutBankAccounts"] == []
-        assert response.json["hasNonFreeOffer"] is False
-        assert response.json["isOnboardingOngoing"] is bool(
-            num_draft_offer >= 1 and num_approved_offers == 0 and not has_adage
-        )
-
     def test_offerer_has_inactive_non_free_collective_offer(self, client):
         pro = users_factories.ProFactory()
         offerer = offerers_factories.OffererFactory()

diff --git a/pro/src/apiClient/v1/models/GetOffererResponseModel.ts b/pro/src/apiClient/v1/models/GetOffererResponseModel.ts
@@ -20,7 +20,6 @@ export type GetOffererResponseModel = {
   id: number;
   isActive: boolean;
   isOnboarded: boolean;
-  isOnboardingOngoing: boolean;
   isValidated: boolean;
   managedVenues?: Array<GetOffererVenueResponseModel>;
   name: string;

diff --git a/pro/src/commons/utils/factories/individualApiFactories.ts b/pro/src/commons/utils/factories/individualApiFactories.ts
@@ -352,7 +352,6 @@ export const defaultGetOffererResponseModel: GetOffererResponseModel = {
   street: 'Fake Address',
   allowedOnAdage: true,
   isOnboarded: true,
-  isOnboardingOngoing: false,
 }
 
 export const defaultGetOffererVenueResponseModel: GetOffererVenueResponseModel =

diff --git a/pro/src/pages/Onboarding/OnboardingOfferIndividual/OnboardingOfferIndividual.spec.tsx b/pro/src/pages/Onboarding/OnboardingOfferIndividual/OnboardingOfferIndividual.spec.tsx
@@ -6,12 +6,12 @@ import {
 
 import { api } from 'apiClient/api'
 import { OfferStatus } from 'apiClient/v1'
+import * as useHasAccessToDidacticOnboarding from 'commons/hooks/useHasAccessToDidacticOnboarding'
 import {
   defaultGetOffererResponseModel,
   defaultGetOffererVenueResponseModel,
   listOffersOfferFactory,
 } from 'commons/utils/factories/individualApiFactories'
-import * as useHasAccessToDidacticOnboarding from 'commons/hooks/useHasAccessToDidacticOnboarding'
 import {
   renderWithProviders,
   RenderWithProvidersOptions,