Merge pull request #89 from MyElectricalData/develop

Develop

Author: m4dm4rtig4n

.github/workflows/release.yml

@@ -259,3 +259,47 @@ jobs:
           echo "docker pull ${{ env.IMAGE_PREFIX }}/backend:$VERSION" >> $GITHUB_STEP_SUMMARY
           echo "docker pull ${{ env.IMAGE_PREFIX }}/frontend:$VERSION" >> $GITHUB_STEP_SUMMARY
           echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
+
+  # ===========================================
+  # Sync develop with main (only after main release)
+  # ===========================================
+  sync-develop:
+    name: Sync develop
+    needs: [release]
+    # Only sync when releasing from main (not develop)
+    if: >
+      needs.release.outputs.new_release_published == 'true' &&
+      github.ref_name == 'main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Sync develop with main
+        env:
+          RELEASE_VERSION: ${{ needs.release.outputs.new_release_version }}
+        run: |
+          # Fetch all branches
+          git fetch origin main develop
+
+          # Log current state
+          echo "=== Main branch HEAD ==="
+          git log -1 --oneline origin/main
+
+          echo "=== Develop branch HEAD ==="
+          git log -1 --oneline origin/develop
+
+          # Checkout develop and merge main
+          git checkout develop
+          git merge origin/main -m "chore: sync develop with main after v${RELEASE_VERSION} [skip ci]"
+          git push origin develop
+
+          echo "✅ Develop synced with main"

.github/workflows/sync-develop.yml

@@ -1,5 +1,44 @@
 # Changelog
 
+## [1.3.0-dev.2](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.3.0-dev.1...1.3.0-dev.2) (2025-12-20)
+
+### Bug Fixes
+
+* **ci:** move sync-develop into Release workflow ([74e3240](https://github.com/MyElectricalData/myelectricaldata_new/commit/74e3240fdd84e4cb5b4bc10894396784408c1800))
+* **web:** resolve race condition in OfferSelector initial load ([d1fe1db](https://github.com/MyElectricalData/myelectricaldata_new/commit/d1fe1db96fcd460589f4459706bee0c28c042370))
+
+## [1.3.0-dev.1](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.2.0...1.3.0-dev.1) (2025-12-20)
+
+### Features
+
+* **api:** add Slack notifications for new contributions ([4a87243](https://github.com/MyElectricalData/myelectricaldata_new/commit/4a872435d5c019122ed32d9df031583af17d7300))
+* **simulator:** add PDF export per offer and calculation explanations ([bdfa4aa](https://github.com/MyElectricalData/myelectricaldata_new/commit/bdfa4aa5ba3a2400af4fc083b4cc38b74c0032dc))
+* **workflow:** update sync process to trigger on successful Release workflow ([a2d039b](https://github.com/MyElectricalData/myelectricaldata_new/commit/a2d039b3d552655959c0b7a0ff68a4ad92779b26))
+
+### Bug Fixes
+
+* **api:** fix type annotations in SlackService ([bb055e9](https://github.com/MyElectricalData/myelectricaldata_new/commit/bb055e9296a3426c68a0bbd2dbff0e4383209141))
+
+### Refactoring
+
+* **web:** consolidate info blocks in Simulator page ([1c4d5d5](https://github.com/MyElectricalData/myelectricaldata_new/commit/1c4d5d59e5750ce1279300274811c5f664e93ac0))
+
+## [1.2.1-dev.1](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.2.0...1.2.1-dev.1) (2025-12-20)
+
+### Features
+
+* **api:** add Slack notifications for new contributions ([4a87243](https://github.com/MyElectricalData/myelectricaldata_new/commit/4a872435d5c019122ed32d9df031583af17d7300))
+* **simulator:** add PDF export per offer and calculation explanations ([bdfa4aa](https://github.com/MyElectricalData/myelectricaldata_new/commit/bdfa4aa5ba3a2400af4fc083b4cc38b74c0032dc))
+* **workflow:** update sync process to trigger on successful Release workflow ([a2d039b](https://github.com/MyElectricalData/myelectricaldata_new/commit/a2d039b3d552655959c0b7a0ff68a4ad92779b26))
+
+### Bug Fixes
+
+* **api:** fix type annotations in SlackService ([bb055e9](https://github.com/MyElectricalData/myelectricaldata_new/commit/bb055e9296a3426c68a0bbd2dbff0e4383209141))
+
+### Refactoring
+
+* **web:** consolidate info blocks in Simulator page ([1c4d5d5](https://github.com/MyElectricalData/myelectricaldata_new/commit/1c4d5d59e5750ce1279300274811c5f664e93ac0))
+
 ## [1.2.0](https://github.com/MyElectricalData/myelectricaldata_new/compare/1.1.0...1.2.0) (2025-12-20)
 
 ### Features

CHANGELOG.md

@@ -1,6 +1,6 @@
 [project]
 name = "myelectricaldata-api"
-version = "1.2.0"
+version = "1.3.0-dev.2"
 description = "MyElectricalData API Gateway for Enedis data"
 authors = [{name = "m4dm4rtig4n"}]
 license = {text = "Apache-2.0"}

apps/api/pyproject.toml

@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+"""
+Script de test pour les notifications Slack
+
+Usage:
+    python scripts/test_slack_notification.py
+
+Configuration:
+    Définir SLACK_WEBHOOK_URL et SLACK_NOTIFICATIONS_ENABLED=true dans .env
+"""
+
+import asyncio
+import sys
+from pathlib import Path
+
+# Add src to path
+sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
+
+from services.slack import slack_service
+from models.energy_provider import OfferContribution
+from models.user import User
+from unittest.mock import MagicMock
+
+
+async def test_notification():
+    """Test sending a Slack notification"""
+    print("Testing Slack notification service...")
+    print(f"Enabled: {slack_service.enabled}")
+    print(f"Webhook URL configured: {bool(slack_service.webhook_url)}")
+    
+    if not slack_service.enabled:
+        print("\n⚠️  Slack notifications are disabled.")
+        print("Set SLACK_NOTIFICATIONS_ENABLED=true in .env to enable.")
+        return
+    
+    if not slack_service.webhook_url:
+        print("\n⚠️  Slack webhook URL is not configured.")
+        print("Set SLACK_WEBHOOK_URL in .env with your webhook URL.")
+        return
+    
+    # Create mock objects
+    print("\nCreating mock contribution and user...")
+    
+    user = MagicMock(spec=User)
+    user.id = "test-user-123"
+    user.email = "[email protected]"
+    
+    contribution = MagicMock(spec=OfferContribution)
+    contribution.id = "test-contrib-456"
+    contribution.contribution_type = "NEW_OFFER"
+    contribution.offer_name = "Test Offer - EDF Tempo 2025"
+    contribution.offer_type = "TEMPO"
+    contribution.provider_name = "EDF"
+    contribution.power_kva = 6
+    contribution.pricing_data = {
+        "subscription_price": 12.50,
+        "tempo_blue_hc": 0.12340,
+        "tempo_blue_hp": 0.23450,
+        "tempo_white_hc": 0.34560,
+        "tempo_white_hp": 0.45670,
+        "tempo_red_hc": 0.56780,
+        "tempo_red_hp": 0.67890,
+    }
+    contribution.price_sheet_url = "https://example.com/edf-tempo-2025.pdf"
+    
+    print("\nSending notification to Slack...")
+    result = await slack_service.send_contribution_notification(contribution, user)
+    
+    if result:
+        print("✅ Notification sent successfully!")
+    else:
+        print("❌ Failed to send notification. Check logs for details.")
+
+
+if __name__ == "__main__":
+    asyncio.run(test_notification())

apps/api/scripts/test_slack_notification.py

@@ -66,6 +66,10 @@ def database_type(self) -> str:
     # Admin
     ADMIN_EMAILS: str = ""
 
+    # Slack Notifications
+    SLACK_WEBHOOK_URL: str = ""
+    SLACK_NOTIFICATIONS_ENABLED: bool = False
+
     def is_admin(self, email: str) -> bool:
         """Check if an email is in the admin list"""
         if not self.ADMIN_EMAILS:

apps/api/src/config/settings.py

@@ -7,6 +7,7 @@
 from ..schemas import APIResponse, ErrorDetail
 from ..middleware import get_current_user, require_permission, require_action, require_not_demo
 from ..services.email import email_service
+from ..services.slack import slack_service
 from ..config import settings
 import logging
 
@@ -156,6 +157,13 @@ async def create_contribution(
         logger.error(f"[CONTRIBUTION] Failed to send admin notifications: {str(e)}")
         # Don't fail the contribution if email fails
 
+    # Send Slack notification (fire-and-forget, don't block on errors)
+    try:
+        await slack_service.send_contribution_notification(contribution, current_user)
+    except Exception as e:
+        logger.error(f"[CONTRIBUTION] Failed to send Slack notification: {str(e)}")
+        # Don't fail the contribution if Slack fails
+
     return APIResponse(
         success=True,
         data={

apps/api/src/routers/energy_offers.py

@@ -1,5 +1,6 @@
 from .cache import cache_service
 from .email import email_service
 from .rate_limiter import rate_limiter
+from .slack import slack_service
 
-__all__ = ["cache_service", "email_service", "rate_limiter"]
+__all__ = ["cache_service", "email_service", "rate_limiter", "slack_service"]