Merge pull request #12 from MyElectricalData/dashboard-pdl-type

Dashboard pdl type

Author: m4dm4rtig4n

apps/api/migrations/add_pricing_option_to_pdls.py

@@ -0,0 +1,43 @@
+"""
+Migration: Add pricing_option column to pdls table
+
+This migration adds a pricing_option VARCHAR(50) column to the pdls table
+to store the user's tariff type (BASE, HC_HP, TEMPO, EJP, HC_WEEKEND).
+"""
+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 pricing_option column to pdls table"""
+    async with async_session_maker() as session:
+        async with session.begin():
+            # Add pricing_option column
+            await session.execute(text('''
+                ALTER TABLE pdls
+                ADD COLUMN IF NOT EXISTS pricing_option VARCHAR(50) DEFAULT NULL
+            '''))
+
+            print("✅ Added pricing_option column to pdls table")
+
+
+async def rollback():
+    """Remove pricing_option column from pdls table"""
+    async with async_session_maker() as session:
+        async with session.begin():
+            await session.execute(text('''
+                ALTER TABLE pdls
+                DROP COLUMN IF EXISTS pricing_option
+            '''))
+
+            print("✅ Removed pricing_option column from pdls table")
+
+
+if __name__ == "__main__":
+    print("Running migration: add_pricing_option_to_pdls")
+    asyncio.run(migrate())
+    print("Migration completed successfully!")

apps/api/src/models/pdl.py

@@ -17,6 +17,7 @@ class PDL(Base, TimestampMixin):
     # Contract information
     subscribed_power: Mapped[int | None] = mapped_column(Integer, nullable=True)  # kVA
     offpeak_hours: Mapped[dict | None] = mapped_column(JSON, nullable=True)  # HC schedules by day
+    pricing_option: Mapped[str | None] = mapped_column(String(50), nullable=True)  # BASE, HC_HP, TEMPO, EJP, HC_WEEKEND
     has_consumption: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)  # PDL has consumption data
     has_production: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)  # PDL has production data
     is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)  # PDL is active/enabled

apps/api/src/routers/pdl.py

@@ -52,6 +52,10 @@ class PDLLinkProduction(BaseModel):
     linked_production_pdl_id: str | None = None  # None to unlink
 
 
+class PDLUpdatePricingOption(BaseModel):
+    pricing_option: str | None = None  # BASE, HC_HP, TEMPO, EJP, HC_WEEKEND
+
+
 class PDLOrderItem(BaseModel):
     id: str
     order: int
@@ -88,6 +92,7 @@ async def list_pdls(
             display_order=pdl.display_order,
             subscribed_power=pdl.subscribed_power,
             offpeak_hours=pdl.offpeak_hours,
+            pricing_option=pdl.pricing_option,
             has_consumption=pdl.has_consumption,
             has_production=pdl.has_production,
             is_active=pdl.is_active,
@@ -297,6 +302,7 @@ async def create_pdl(
         created_at=pdl.created_at,
         subscribed_power=pdl.subscribed_power,
         offpeak_hours=pdl.offpeak_hours,
+        pricing_option=pdl.pricing_option,
         has_consumption=pdl.has_consumption,
         has_production=pdl.has_production,
         is_active=pdl.is_active,
@@ -335,6 +341,7 @@ async def get_pdl(
         display_order=pdl.display_order,
         subscribed_power=pdl.subscribed_power,
         offpeak_hours=pdl.offpeak_hours,
+        pricing_option=pdl.pricing_option,
         has_consumption=pdl.has_consumption,
         has_production=pdl.has_production,
         is_active=pdl.is_active,
@@ -461,6 +468,62 @@ async def toggle_pdl_active(
     )
 
 
+@router.patch("/{pdl_id}/pricing-option", response_model=APIResponse)
+async def update_pdl_pricing_option(
+    pdl_id: str = Path(..., description="PDL ID (UUID)", openapi_examples={"example_uuid": {"summary": "Example UUID", "value": "550e8400-e29b-41d4-a716-446655440000"}}),
+    pricing_data: PDLUpdatePricingOption = Body(..., openapi_examples={
+        "base": {"summary": "Tarif Base", "value": {"pricing_option": "BASE"}},
+        "hc_hp": {"summary": "Heures Creuses / Heures Pleines", "value": {"pricing_option": "HC_HP"}},
+        "tempo": {"summary": "Tarif Tempo", "value": {"pricing_option": "TEMPO"}},
+        "ejp": {"summary": "Effacement Jour de Pointe", "value": {"pricing_option": "EJP"}},
+        "hc_weekend": {"summary": "HC Nuit & Week-end", "value": {"pricing_option": "HC_WEEKEND"}},
+        "clear": {"summary": "Remove pricing option", "value": {"pricing_option": None}}
+    }),
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> APIResponse:
+    """
+    Update PDL pricing option (tariff type).
+
+    Available options:
+    - **BASE**: Single price 24/7
+    - **HC_HP**: Off-peak hours (Heures Creuses) / Peak hours (Heures Pleines)
+    - **TEMPO**: 6-tier pricing based on day color (blue/white/red) and period (HC/HP)
+    - **EJP**: Peak Day Curtailment (22 expensive days per year)
+    - **HC_WEEKEND**: Off-peak hours extended to weekends
+    """
+    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"))
+
+    # Validate pricing option if provided
+    valid_options = ["BASE", "HC_HP", "TEMPO", "EJP", "HC_WEEKEND"]
+    if pricing_data.pricing_option is not None and pricing_data.pricing_option not in valid_options:
+        return APIResponse(
+            success=False,
+            error=ErrorDetail(
+                code="INVALID_PRICING_OPTION",
+                message=f"Invalid pricing option. Must be one of: {', '.join(valid_options)}"
+            )
+        )
+
+    pdl.pricing_option = pricing_data.pricing_option
+
+    await db.commit()
+    await db.refresh(pdl)
+
+    return APIResponse(
+        success=True,
+        data={
+            "id": pdl.id,
+            "usage_point_id": pdl.usage_point_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"}}),
@@ -701,6 +764,7 @@ async def admin_add_pdl(
         created_at=pdl.created_at,
         subscribed_power=pdl.subscribed_power,
         offpeak_hours=pdl.offpeak_hours,
+        pricing_option=pdl.pricing_option,
         has_consumption=pdl.has_consumption,
         has_production=pdl.has_production,
         is_active=pdl.is_active,

apps/api/src/schemas/responses.py

@@ -50,6 +50,7 @@ class PDLResponse(BaseModel):
     display_order: Optional[int] = None
     subscribed_power: Optional[int] = None
     offpeak_hours: Optional[Union[list[str], dict]] = None  # Array format or legacy object format
+    pricing_option: Optional[str] = None  # BASE, HC_HP, TEMPO, EJP, HC_WEEKEND
     has_consumption: bool = True
     has_production: bool = False
     is_active: bool = True

apps/docs/sidebars.ts

@@ -196,7 +196,7 @@ const sidebars: SidebarsConfig = {
     {
       type: "category",
       label: "Architecture",
-      items: ["architecture/summary"],
+      items: ["architecture/summary", "architecture/encryption"],
     },
   ],
 };

apps/web/src/api/pdl.ts

@@ -1,5 +1,5 @@
 import { apiClient } from './client'
-import type { PDL, PDLCreate } from '@/types/api'
+import type { PDL, PDLCreate, PricingOption } from '@/types/api'
 
 export const pdlApi = {
   list: async () => {
@@ -34,6 +34,14 @@ export const pdlApi = {
     return apiClient.patch<PDL>(`pdl/${id}/active`, { is_active })
   },
 
+  updatePricingOption: async (id: string, pricing_option: PricingOption | null) => {
+    return apiClient.patch<{
+      id: string
+      usage_point_id: string
+      pricing_option: PricingOption | null
+    }>(`pdl/${id}/pricing-option`, { pricing_option })
+  },
+
   linkProduction: async (consumptionPdlId: string, productionPdlId: string | null) => {
     return apiClient.patch<{
       id: string

apps/web/src/components/PDLCard.tsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { createPortal } from 'react-dom'
 import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { Info, Trash2, RefreshCw, Edit2, Save, X, Zap, Clock, Factory, Plus, Minus, Eye, EyeOff, Calendar, MoreVertical } from 'lucide-react'
+import { Info, Trash2, RefreshCw, Edit2, Save, X, Zap, Clock, Factory, Plus, Minus, Eye, EyeOff, Calendar, MoreVertical, Receipt } from 'lucide-react'
 import { pdlApi } from '@/api/pdl'
 import { oauthApi } from '@/api/oauth'
-import type { PDL } from '@/types/api'
+import type { PDL, PricingOption } from '@/types/api'
 
 interface PDLCardProps {
   pdl: PDL
@@ -293,6 +293,18 @@ export default function PDLCard({ pdl, onViewDetails, onDelete, isDemo = false,
     },
   })
 
+  const updatePricingOptionMutation = useMutation({
+    mutationFn: (pricing_option: PricingOption | null) => {
+      if (isDemo) {
+        return Promise.reject(new Error('Modifications désactivées en mode démo'))
+      }
+      return pdlApi.updatePricingOption(pdl.id, pricing_option)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['pdls'] })
+    },
+  })
+
   // Unused helper function - kept for potential future use
   // const saveContract = () => {
   //   const data: { subscribed_power?: number; offpeak_hours?: string[] } = {}
@@ -815,6 +827,31 @@ export default function PDLCard({ pdl, onViewDetails, onDelete, isDemo = false,
                     </select>
                   </div>
 
+                  {/* Pricing Option (Tariff Type) */}
+                  <div className="flex items-center justify-between" data-tour="pdl-pricing-option">
+                    <div className="flex items-center gap-2 text-gray-600 dark:text-gray-400">
+                      <Receipt size={16} />
+                      <span>Option tarifaire :</span>
+                    </div>
+                    <select
+                      value={pdl.pricing_option || ''}
+                      onChange={(e) => {
+                        const value = e.target.value as PricingOption | ''
+                        updatePricingOptionMutation.mutate(value === '' ? null : value as PricingOption)
+                      }}
+                      disabled={updatePricingOptionMutation.isPending}
+                      className="w-44 px-3 py-1.5 text-sm font-medium bg-white dark:bg-gray-800 border-2 border-blue-300 dark:border-blue-700 rounded-lg text-gray-900 dark:text-gray-100 focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-400 focus:border-blue-500 dark:focus:border-blue-400 cursor-pointer transition-all shadow-sm hover:shadow disabled:opacity-50 disabled:cursor-not-allowed"
+                    >
+                      <option value="">Sélectionner</option>
+                      <option value="BASE">Base</option>
+                      <option value="HC_HP">Heures Creuses</option>
+                      <option value="TEMPO">Tempo</option>
+                      <option value="WEEKEND">Nuit & Week-end</option>
+                      <option value="SEASONAL">Saisonnier</option>
+                      <option value="EJP">EJP (ancien)</option>
+                    </select>
+                  </div>
+
                   {/* Offpeak Hours */}
                   <div className="space-y-3" data-tour="pdl-offpeak">
                     <div className="flex items-center justify-between">
@@ -1095,6 +1132,11 @@ export default function PDLCard({ pdl, onViewDetails, onDelete, isDemo = false,
           Erreur lors de la mise à jour du type de PDL
         </div>
       )}
+      {updatePricingOptionMutation.isError && (
+        <div className="mt-2 text-xs text-red-600 dark:text-red-400">
+          Erreur lors de la mise à jour de l'option tarifaire
+        </div>
+      )}
 
       {/* Sync Warning Modal - using portal to escape transform context */}
       {showSyncWarning && createPortal(

apps/web/src/types/api.ts

@@ -63,6 +63,9 @@ export interface TokenResponse {
   token_type: string
 }
 
+// Pricing option types for electricity tariffs
+export type PricingOption = 'BASE' | 'HC_HP' | 'TEMPO' | 'EJP' | 'WEEKEND' | 'SEASONAL'
+
 export interface PDL {
   id: string
   usage_point_id: string
@@ -71,6 +74,7 @@ export interface PDL {
   display_order?: number
   subscribed_power?: number
   offpeak_hours?: string[] | Record<string, string> // Array format or legacy object format
+  pricing_option?: PricingOption // Tariff type: BASE, HC_HP, TEMPO, EJP, HC_WEEKEND
   has_consumption?: boolean
   has_production?: boolean
   is_active?: boolean