MyElectricalData
diff --git a/‎apps/api/migrations/add_selected_offer_id.py‎
Lines changed: 67 additions & 0 deletions b/‎apps/api/migrations/add_selected_offer_id.py‎
Lines changed: 67 additions & 0 deletions
diff --git a/‎apps/api/src/models/pdl.py‎
Lines changed: 2 additions & 0 deletions b/‎apps/api/src/models/pdl.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/api/src/routers/pdl.py‎
Lines changed: 78 additions & 0 deletions b/‎apps/api/src/routers/pdl.py‎
Lines changed: 78 additions & 0 deletions
diff --git a/‎apps/api/src/schemas/responses.py‎
Lines changed: 1 addition & 0 deletions b/‎apps/api/src/schemas/responses.py‎
Lines changed: 1 addition & 0 deletions
@@ -0,0 +1,67 @@
+"""
+Migration: Add selected_offer_id column to pdls table
+
+This migration adds a selected_offer_id column to the pdls table
+to allow users to select an energy offer for their PDL.
+"""
+import asyncio
+import sys
+sys.path.insert(0, '/app')
+
+from sqlalchemy import text
+from src.models.database import async_session_maker
+
+
+async def migrate():
+    """Add selected_offer_id column to pdls table"""
+    async with async_session_maker() as session:
+        async with session.begin():
+            # Add selected_offer_id column
+            await session.execute(text('''
+                ALTER TABLE pdls
+                ADD COLUMN IF NOT EXISTS selected_offer_id VARCHAR(36)
+            '''))
+
+            # Add foreign key constraint to energy_offers table
+            await session.execute(text('''
+                DO $$
+                BEGIN
+                    IF NOT EXISTS (
+                        SELECT 1
+                        FROM pg_constraint
+                        WHERE conname = 'fk_pdls_selected_offer_id'
+                    ) THEN
+                        ALTER TABLE pdls
+                        ADD CONSTRAINT fk_pdls_selected_offer_id
+                        FOREIGN KEY (selected_offer_id) REFERENCES energy_offers(id)
+                        ON DELETE SET NULL;
+                    END IF;
+                END $$;
+            '''))
+
+            print("Added selected_offer_id column to pdls table")
+
+
+async def rollback():
+    """Remove selected_offer_id column from pdls table"""
+    async with async_session_maker() as session:
+        async with session.begin():
+            # Drop foreign key constraint first
+            await session.execute(text('''
+                ALTER TABLE pdls
+                DROP CONSTRAINT IF EXISTS fk_pdls_selected_offer_id
+            '''))
+
+            # Drop the column
+            await session.execute(text('''
+                ALTER TABLE pdls
+                DROP COLUMN IF EXISTS selected_offer_id
+            '''))
+
+            print("Removed selected_offer_id column from pdls table")
+
+
+if __name__ == "__main__":
+    print("Running migration: add_selected_offer_id")
+    asyncio.run(migrate())
+    print("Migration completed successfully!")
@@ -24,10 +24,12 @@ class PDL(Base, TimestampMixin):
     oldest_available_data_date: Mapped[date | None] = mapped_column(Date, nullable=True)  # Oldest date where Enedis has data (meter activation date)
     activation_date: Mapped[date | None] = mapped_column(Date, nullable=True)  # Contract activation date (from Enedis)
     linked_production_pdl_id: Mapped[str | None] = mapped_column(String(36), ForeignKey("pdls.id"), nullable=True)  # Link to production PDL for combined graphs
+    selected_offer_id: Mapped[str | None] = mapped_column(String(36), ForeignKey("energy_offers.id", ondelete="SET NULL"), nullable=True)  # Selected energy offer
 
     # Relations
     user: Mapped["User"] = relationship("User", back_populates="pdls")
     linked_production_pdl: Mapped["PDL | None"] = relationship("PDL", remote_side=[id], foreign_keys=[linked_production_pdl_id], uselist=False)
+    selected_offer: Mapped["EnergyOffer | None"] = relationship("EnergyOffer", foreign_keys=[selected_offer_id])
 
     def __repr__(self) -> str:
         return f"<PDL(id={self.id}, usage_point_id={self.usage_point_id})>"
@@ -3,6 +3,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from pydantic import BaseModel
 from ..models import User, PDL
+from ..models.energy_provider import EnergyOffer
 from ..models.database import get_db
 from ..schemas import PDLCreate, PDLResponse, APIResponse, ErrorDetail
 from ..schemas.requests import AdminPDLCreate
@@ -56,6 +57,10 @@ class PDLUpdatePricingOption(BaseModel):
     pricing_option: str | None = None  # BASE, HC_HP, TEMPO, EJP, HC_WEEKEND
 
 
+class PDLUpdateSelectedOffer(BaseModel):
+    selected_offer_id: str | None = None  # Energy offer ID or None to unselect
+
+
 class PDLOrderItem(BaseModel):
     id: str
     order: int
@@ -99,6 +104,7 @@ async def list_pdls(
             oldest_available_data_date=pdl.oldest_available_data_date,
             activation_date=pdl.activation_date,
             linked_production_pdl_id=pdl.linked_production_pdl_id,
+            selected_offer_id=pdl.selected_offer_id,
         )
         for pdl in pdls
     ]
@@ -309,6 +315,7 @@ async def create_pdl(
         oldest_available_data_date=pdl.oldest_available_data_date,
         activation_date=pdl.activation_date,
         linked_production_pdl_id=pdl.linked_production_pdl_id,
+        selected_offer_id=pdl.selected_offer_id,
     )
 
     return APIResponse(success=True, data=pdl_response.model_dump())
@@ -348,6 +355,7 @@ async def get_pdl(
         oldest_available_data_date=pdl.oldest_available_data_date,
         activation_date=pdl.activation_date,
         linked_production_pdl_id=pdl.linked_production_pdl_id,
+        selected_offer_id=pdl.selected_offer_id,
     )
 
     return APIResponse(success=True, data=pdl_response.model_dump())
@@ -524,6 +532,75 @@ async def update_pdl_pricing_option(
     )
 
 
+@router.patch("/{pdl_id}/selected-offer", response_model=APIResponse)
+async def update_pdl_selected_offer(
+    pdl_id: str = Path(..., description="PDL ID (UUID)", openapi_examples={"example_uuid": {"summary": "Example UUID", "value": "550e8400-e29b-41d4-a716-446655440000"}}),
+    offer_data: PDLUpdateSelectedOffer = Body(..., openapi_examples={
+        "select_offer": {"summary": "Select an energy offer", "value": {"selected_offer_id": "550e8400-e29b-41d4-a716-446655440001"}},
+        "clear": {"summary": "Remove selected offer", "value": {"selected_offer_id": None}}
+    }),
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> APIResponse:
+    """
+    Update PDL selected energy offer.
+
+    This endpoint allows you to select an energy offer for a PDL.
+    When an offer is selected, the PDL's pricing_option will be automatically
+    updated to match the offer's offer_type.
+
+    Set `selected_offer_id` to `null` to remove the selection.
+    """
+    result = await db.execute(select(PDL).where(PDL.id == pdl_id, PDL.user_id == current_user.id))
+    pdl = result.scalar_one_or_none()
+
+    if not pdl:
+        return APIResponse(success=False, error=ErrorDetail(code="PDL_NOT_FOUND", message="PDL not found"))
+
+    # If clearing the selection
+    if offer_data.selected_offer_id is None:
+        pdl.selected_offer_id = None
+        await db.commit()
+        await db.refresh(pdl)
+
+        return APIResponse(
+            success=True,
+            data={
+                "id": pdl.id,
+                "usage_point_id": pdl.usage_point_id,
+                "selected_offer_id": None,
+                "pricing_option": pdl.pricing_option,
+            },
+        )
+
+    # Validate the offer exists and is active
+    result = await db.execute(select(EnergyOffer).where(EnergyOffer.id == offer_data.selected_offer_id, EnergyOffer.is_active == True))
+    offer = result.scalar_one_or_none()
+
+    if not offer:
+        return APIResponse(
+            success=False,
+            error=ErrorDetail(code="OFFER_NOT_FOUND", message="Energy offer not found or not active")
+        )
+
+    # Update PDL with selected offer and sync pricing_option
+    pdl.selected_offer_id = offer.id
+    pdl.pricing_option = offer.offer_type
+
+    await db.commit()
+    await db.refresh(pdl)
+
+    return APIResponse(
+        success=True,
+        data={
+            "id": pdl.id,
+            "usage_point_id": pdl.usage_point_id,
+            "selected_offer_id": pdl.selected_offer_id,
+            "pricing_option": pdl.pricing_option,
+        },
+    )
+
+
 @router.patch("/{pdl_id}/link-production", response_model=APIResponse)
 async def link_production_pdl(
     pdl_id: str = Path(..., description="PDL ID (UUID) of the consumption PDL", openapi_examples={"example_uuid": {"summary": "Example UUID", "value": "550e8400-e29b-41d4-a716-446655440000"}}),
@@ -771,6 +848,7 @@ async def admin_add_pdl(
         oldest_available_data_date=pdl.oldest_available_data_date,
         activation_date=pdl.activation_date,
         linked_production_pdl_id=pdl.linked_production_pdl_id,
+        selected_offer_id=pdl.selected_offer_id,
     )
 
     return APIResponse(success=True, data=pdl_response.model_dump())
 
@@ -57,6 +57,7 @@ class PDLResponse(BaseModel):
     oldest_available_data_date: Optional[date] = None  # Oldest date where Enedis has data (meter activation)
     activation_date: Optional[date] = None  # Contract activation date (from Enedis)
     linked_production_pdl_id: Optional[str] = None  # Link to production PDL for combined graphs
+    selected_offer_id: Optional[str] = None  # Selected energy offer ID
 
 
 class CacheDeleteResponse(BaseModel):