(PC-39018)[API] refactor: optimize query for get_expired_offers()

Author: tconte-pass

api/src/pcapi/core/offers/api.py

@@ -1607,17 +1607,15 @@ def unindex_expired_offers(process_all_expired: bool = False) -> None:
     offers.
     """
     start_of_day = datetime.datetime.combine(datetime.date.today(), datetime.time.min)
-    interval = [start_of_day - datetime.timedelta(days=2), start_of_day]
+    start_time = start_of_day - datetime.timedelta(days=2)
+    end_time = start_of_day
     if process_all_expired:
-        interval[0] = datetime.datetime(2000, 1, 1)  # arbitrary old date
+        start_time = datetime.datetime(2000, 1, 1)  # arbitrary old date
 
     page = 0
     limit = settings.ALGOLIA_DELETING_OFFERS_CHUNK_SIZE
     while True:
-        offers = offers_repository.get_expired_offers(interval)
-        offers = offers.offset(page * limit).limit(limit)
-        offer_ids = [offer_id for (offer_id,) in offers.with_entities(models.Offer.id)]
-
+        offer_ids = offers_repository.get_expired_offers(start_time, end_time, offset=page * limit, limit=limit)
         if not offer_ids:
             break
 

api/src/pcapi/core/offers/repository.py

@@ -744,24 +744,42 @@ def find_event_stocks_day(start: datetime.datetime, end: datetime.datetime) -> s
     )
 
 
-def get_expired_offers(interval: list[datetime.datetime]) -> sa_orm.Query:
+def get_expired_offers(
+    start_time: datetime.datetime, end_time: datetime.datetime, offset: int | None = None, limit: int | None = None
+) -> typing.Sequence[int]:
     """Return a query of offers whose latest booking limit occurs within
     the given interval.
 
     Inactive or deleted offers are ignored.
     """
-    return (
-        db.session.query(models.Offer)
-        .join(models.Stock)
-        .filter(
-            models.Offer.isActive,
+    exists_future_stock = (
+        sa.select(models.Stock.id)
+        .where(
+            models.Stock.offerId == models.Offer.id,
+            models.Stock.bookingLimitDatetime > end_time,
+            models.Stock.isSoftDeleted.is_(False),
+        )
+        .exists()
+        .correlate(models.Offer)
+    )
+    query = (
+        sa.select(models.Offer.id.distinct())
+        .select_from(models.Offer)
+        .join(models.Offer.stocks)
+        .where(
+            models.Offer.publicationDatetime.is_not(None),
             models.Stock.isSoftDeleted.is_(False),
             models.Stock.bookingLimitDatetime.is_not(None),
+            models.Stock.bookingLimitDatetime.between(start_time, end_time),
+            sa.not_(exists_future_stock),
         )
-        .having(sa.func.max(models.Stock.bookingLimitDatetime).between(*interval))  # type: ignore[arg-type]
-        .group_by(models.Offer.id)
         .order_by(models.Offer.id)
     )
+    if offset:
+        query = query.offset(offset)
+    if limit:
+        query = query.limit(limit)
+    return db.session.execute(query).scalars().all()
 
 
 def find_today_event_stock_ids_metropolitan_france(

api/tests/core/offers/test_repository.py

@@ -1239,10 +1239,8 @@ def test_find_today_digital_stock_ids_by_departments_with_address_different_than
 
 @pytest.mark.usefixtures("db_session")
 class GetExpiredOffersTest:
-    interval = [
-        datetime.datetime(2021, 1, 1, 0, 0),
-        datetime.datetime(2021, 1, 2, 0, 0),
-    ]
+    start_time = (datetime.datetime(2021, 1, 1, 0, 0),)
+    end_time = (datetime.datetime(2021, 1, 2, 0, 0),)
     dt_before = datetime.datetime(2020, 12, 31)
     dt_within = datetime.datetime(2021, 1, 1)
     dt_after = datetime.datetime(2021, 1, 3)
@@ -1260,9 +1258,9 @@ def test_basics(self):
         factories.StockFactory(bookingLimitDatetime=self.dt_before)
         factories.StockFactory(bookingLimitDatetime=self.dt_after)
 
-        offers = repository.get_expired_offers(self.interval)
+        offer_ids = repository.get_expired_offers(self.start_time, self.end_time)
 
-        assert offers.all() == [offer1, offer2, offer3]
+        assert offer_ids == [offer.id for offer in (offer1, offer2, offer3)]
 
     def test_exclude_if_latest_stock_outside_interval(self):
         offer1 = factories.OfferFactory()
@@ -1271,9 +1269,9 @@ def test_exclude_if_latest_stock_outside_interval(self):
         factories.StockFactory(offer=offer2, bookingLimitDatetime=self.dt_within)
         factories.StockFactory(offer=offer2, bookingLimitDatetime=self.dt_after)
 
-        offers = repository.get_expired_offers(self.interval)
+        offer_ids = repository.get_expired_offers(self.start_time, self.end_time)
 
-        assert offers.all() == [offer1]
+        assert offer_ids == [offer1.id]
 
 
 @pytest.mark.usefixtures("db_session")