♻️(ingestion:presentation) refacto to prepare list of metiers endpoint (#603)

* ♻️(ingestion-infrastructure) make QuerySetPage generic

* ♻️(ingestion-infrastructure) consistency in the naming domaine fonctionnel property across entity and model

* ♻️(ingestion-presentation) simplify error serializer

* ♻️(ingestion-presentation) simplify pagination in list offers

refactor for upcoming #569

* 📝(presentation-ingestion) update schema

Author: vincentporte

src/web/application/ingestion/interfaces/list_offers_input.py

@@ -1,16 +1,8 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from domain.entities.offer import Offer
-from domain.interfaces.page_interface import IPage
-
 
 @dataclass
 class GetFilteredOffersInput:
     active: bool
     external_id_contains: Optional[str]
-
-
-class ListOffersPageResult:
-    def __init__(self, page: IPage[Offer]):
-        self.page = page

src/web/application/ingestion/usecases/list_offers.py

@@ -1,13 +1,12 @@
-from application.ingestion.interfaces.list_offers_input import (
-    GetFilteredOffersInput,
-    ListOffersPageResult,
-)
+from application.ingestion.interfaces.list_offers_input import GetFilteredOffersInput
+from domain.entities.offer import Offer
+from domain.interfaces.page_interface import IPage
 from domain.interfaces.usecase_interface import IUseCase
 from domain.repositories.offers_repository_interface import IOffersRepository
 from domain.services.logger_interface import ILogger
 
 
-class ListOffersUseCase(IUseCase[GetFilteredOffersInput, ListOffersPageResult]):
+class ListOffersUseCase(IUseCase[GetFilteredOffersInput, IPage[Offer]]):
     def __init__(
         self,
         offers_repository: IOffersRepository,
@@ -16,9 +15,8 @@ def __init__(
         self.offers_repository = offers_repository
         self.logger = logger
 
-    def execute(self, input_data: GetFilteredOffersInput) -> ListOffersPageResult:
-        page = self.offers_repository.get_filtered(
+    def execute(self, input_data: GetFilteredOffersInput) -> IPage[Offer]:
+        return self.offers_repository.get_filtered(
             active=input_data.active,
             external_id_contains=input_data.external_id_contains,
         )
-        return ListOffersPageResult(page=page)

src/web/infrastructure/django_apps/shared/admin.py

@@ -125,13 +125,13 @@ class MetierAdmin(admin.ModelAdmin):
     list_display = (
         "external_id",
         "libelle_long",
-        "code_domaine_fonctionnel",
+        "domaine_fonctionnel_code",
         "offer_family_code",
         "processed_at",
         "archived_at",
     )
     list_filter = (
-        "code_domaine_fonctionnel",
+        "domaine_fonctionnel_code",
         "offer_family_code",
         "processed_at",
         "archived_at",
@@ -140,7 +140,7 @@ class MetierAdmin(admin.ModelAdmin):
         "id",
         "external_id",
         "libelle_long",
-        "code_domaine_fonctionnel",
+        "domaine_fonctionnel_code",
         "offer_family_code",
     )
     readonly_fields = [f.name for f in MetierModel._meta.get_fields()]

src/web/infrastructure/django_apps/shared/migrations/0027_rename_code_domaine_fonctionnel_metiermodel_domaine_fonctionnel_code.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.5 on 2026-05-19 15:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("shared", "0026_offermodel_area"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="metiermodel",
+            old_name="code_domaine_fonctionnel",
+            new_name="domaine_fonctionnel_code",
+        ),
+    ]

src/web/infrastructure/django_apps/shared/models/metier.py

@@ -11,7 +11,7 @@ class MetierModel(models.Model):
     external_id = models.CharField(max_length=8, unique=True)
     libelle_long = models.CharField(max_length=500)
     definition_synthetique = models.TextField(null=True, blank=True)
-    code_domaine_fonctionnel = models.CharField(max_length=3)
+    domaine_fonctionnel_code = models.CharField(max_length=3)
     offer_family_code = models.CharField(max_length=8)
     versants = models.JSONField(default=list, null=True, blank=True)
     conditions_particulieres = models.JSONField(default=list, null=True, blank=True)
@@ -41,7 +41,7 @@ def to_entity(self):
             external_id=self.external_id,
             libelle=self.libelle_long,
             description=self.definition_synthetique or "",
-            domaine_fonctionnel_code=self.code_domaine_fonctionnel,
+            domaine_fonctionnel_code=self.domaine_fonctionnel_code,
             versants=versants,
             activites=self.activites or [],
             conditions_particulieres=self.conditions_particulieres or [],
@@ -60,7 +60,7 @@ def from_entity(cls, metier):
             external_id=metier.external_id,
             libelle_long=metier.libelle,
             definition_synthetique=metier.description,
-            code_domaine_fonctionnel=metier.domaine_fonctionnel_code,
+            domaine_fonctionnel_code=metier.domaine_fonctionnel_code,
             offer_family_code=metier.offer_family_code or "",
             versants=versants,
             activites=metier.activites,

…structure/mappers/offer_queryset_page.py …/infrastructure/mappers/queryset_page.pysrc/web/infrastructure/mappers/offer_queryset_page.py renamed to src/web/infrastructure/mappers/queryset_page.py src/web/infrastructure/mappers/offer_queryset_page.py renamed to src/web/infrastructure/mappers/queryset_page.py

@@ -1,8 +1,11 @@
-from domain.entities.offer import Offer
+from typing import Generic, TypeVar
+
 from domain.interfaces.page_interface import IPage
 
+T = TypeVar("T")
+
 
-class OfferQuerySetPage(IPage[Offer]):
+class QuerySetPage(IPage[T], Generic[T]):
     def __init__(self, qs):
         self._qs = qs
 

src/web/infrastructure/repositories/shared/postgres_metier_repository.py

@@ -72,7 +72,7 @@ def upsert_batch(self, metiers: List[Metier]) -> IUpsertResult:
                             fields=[
                                 "libelle_long",
                                 "definition_synthetique",
-                                "code_domaine_fonctionnel",
+                                "domaine_fonctionnel_code",
                                 "offer_family_code",
                                 "versants",
                                 "activites",

src/web/infrastructure/repositories/shared/postgres_offers_repository.py

@@ -15,7 +15,7 @@
 from domain.repositories.offers_repository_interface import IOffersRepository
 from domain.services.logger_interface import ILogger
 from infrastructure.django_apps.shared.models.offer import OfferModel
-from infrastructure.mappers.offer_queryset_page import OfferQuerySetPage
+from infrastructure.mappers.queryset_page import QuerySetPage
 
 
 class PostgresOffersRepository(IOffersRepository):
@@ -139,7 +139,7 @@ def get_filtered(
         if external_id_contains:
             qs = qs.filter(external_id__contains=external_id_contains)
 
-        return OfferQuerySetPage(qs.order_by("-updated_at"))
+        return QuerySetPage(qs.order_by("-updated_at"))
 
     @transaction.atomic
     def get_pending_processing(self, limit: int = 1000) -> List[Offer]:

src/web/presentation/ingestion/serializers.py

@@ -1,24 +1,18 @@
 from rest_framework import serializers
 
 
-class ValidationErrorSerializer(serializers.Serializer):
-    row = serializers.IntegerField()
+class GenericErrorSerializer(serializers.Serializer):
     error = serializers.CharField()
 
 
-class FileErrorSerializer(serializers.Serializer):
-    error = serializers.CharField()
+class ValidationErrorSerializer(GenericErrorSerializer):
+    row = serializers.IntegerField()
 
 
-class NoValidRowsErrorSerializer(serializers.Serializer):
-    error = serializers.CharField()
+class NoValidRowsErrorSerializer(GenericErrorSerializer):
     validation_errors = ValidationErrorSerializer(many=True)
 
 
-class ServerErrorSerializer(serializers.Serializer):
-    error = serializers.CharField()
-
-
 class TokenErrorMessageSerializer(serializers.Serializer):
     token_class = serializers.CharField()
     token_type = serializers.CharField()

src/web/presentation/ingestion/views.py

@@ -40,12 +40,10 @@
     ArchiveOfferRequestSerializer,
     ArchiveOfferSuccessSerializer,
     ConcoursUploadResponseSerializer,
-    FileErrorSerializer,
-    ListOffersErrorSerializer,
+    GenericErrorSerializer,
     ListOffersFiltersSerializer,
     ListOffersResponseSerializer,
     NoValidRowsErrorSerializer,
-    ServerErrorSerializer,
     SourceSerializer,
     TokenErrorSerializer,
 )
@@ -144,11 +142,11 @@ class ConcoursUploadView(APIView):
             201: ConcoursUploadResponseSerializer,
             400: PolymorphicProxySerializer(
                 component_name="ConcoursUpload400Error",
-                serializers=[FileErrorSerializer, NoValidRowsErrorSerializer],
+                serializers=[GenericErrorSerializer, NoValidRowsErrorSerializer],
                 resource_type_field_name=None,
             ),
             401: TokenErrorSerializer,
-            500: ServerErrorSerializer,
+            500: GenericErrorSerializer,
         },
     )
     def post(self, request):
@@ -335,9 +333,9 @@ def _create_success_response(
     tags=["offres"],
     responses={
         200: ListOffersResponseSerializer,
-        400: ListOffersErrorSerializer,
+        400: GenericErrorSerializer,
         401: TokenErrorSerializer,
-        500: ServerErrorSerializer,
+        500: GenericErrorSerializer,
     },
 )
 class OffersListView(APIView):
@@ -360,13 +358,13 @@ def get(self, request):
             result = self.usecase.execute(input_data)
 
             paginator = IngestionPagination()
-            items = paginator.paginate(result.page, request)
+            items = paginator.paginate(result, request)
             return paginator.get_paginated_response(
                 ListOffersResponseSerializer(items, many=True).data
             )
         except Exception as e:
             self.logger.error("Unexpected error in OffersListView: %s", str(e))
-            serializer = ServerErrorSerializer({"error": "Unexpected error"})
+            serializer = GenericErrorSerializer({"error": "Unexpected error"})
             return Response(
                 serializer.data, status=status.HTTP_500_INTERNAL_SERVER_ERROR
             )