feat: create target button is now working

Author: Yasir761

services/api/delivery_targets.py

@@ -414,6 +414,26 @@ def test_delivery_target(target_id: str, user_id: str = Depends(get_current_user
         db.close()
 
 
+
+@router.get("/{id}/logs")
+def get_target_logs(id: str, user_id: str = Depends(get_current_user)):
+    db = SessionLocal()
+    try:
+        rows = db.execute(
+            text("""
+                SELECT *
+                FROM delivery_logs
+                WHERE target_id = :id
+                ORDER BY created_at DESC
+                LIMIT 50
+            """),
+            {"id": id}
+        ).fetchall()
+
+        return {"items": [dict(r._mapping) for r in rows]}
+    finally:
+        db.close()
+
 @router.get("/{target_id}/stats")
 def get_target_stats(target_id: str, user_id: str = Depends(get_current_user)):
     db = SessionLocal()

services/api/events.py

@@ -138,5 +138,30 @@ def get_dlq_count(
 
         return {"dlq_count": result[0] if result else 0}
 
+    finally:
+        db.close()
+
+
+
+
+@router.get("/{id}/deliveries")
+def get_event_deliveries(id: int, user_id: str = Depends(get_current_user)):
+    db = SessionLocal()
+    try:
+        rows = db.execute(
+            text("""
+                SELECT dl.*, dt.name as target_name
+                FROM delivery_logs dl
+                JOIN delivery_targets dt ON dl.target_id = dt.id
+                JOIN webhook_events e ON dl.event_id = e.id
+                JOIN webhook_routes r ON e.route_id = r.id
+                WHERE dl.event_id = :id
+                AND r.user_id = :user_id
+                ORDER BY dl.created_at DESC
+            """),
+            {"id": id, "user_id": user_id}
+        ).fetchall()
+
+        return {"items": [dict(r._mapping) for r in rows]}
     finally:
         db.close()

services/api/replay.py

@@ -1,8 +1,82 @@
+# from fastapi import APIRouter, HTTPException, status
+# from sqlalchemy import text
+# from .database import SessionLocal
+# from .redis_client import redis_client
+# import json
+
+# router = APIRouter(prefix="/events", tags=["replay"])
+# QUEUE_MAIN = "webhook:queue"
+
+
+# @router.post("/{event_id}/replay", status_code=status.HTTP_202_ACCEPTED)
+# def replay_event(event_id: int):
+#     db = SessionLocal()
+#     try:
+#         event = db.execute(
+#             text("""
+#                 SELECT
+#                     e.id,
+#                     e.route_id,
+#                     r.mode,
+#                     r.dev_target,
+#                     r.prod_target
+#                 FROM webhook_events e
+#                 JOIN webhook_routes r
+#                   ON e.route_id = r.id
+#                   WHERE e.id = :id
+#             """),
+#             {"id": event_id},
+#         ).mappings().first()
+
+#         if not event:
+#             raise HTTPException(status_code=404, detail="Event not found")
+
+#         delivery_target = (
+#             event["dev_target"]
+#             if event["mode"] == "dev"
+#             else event["prod_target"]
+#         )
+
+#         if not delivery_target:
+#             raise HTTPException(
+#                 status_code=400,
+#                 detail="No delivery target configured for this route",
+#             )
+
+#         db.execute(
+#             text("""
+#                 UPDATE webhook_events
+#                 SET
+#                     status = 'pending',
+#                     attempt_count = 0,
+#                     last_error = NULL,
+#                     next_retry_at = NULL
+                    
+#                 WHERE id = :id
+#             """),
+#             {
+#                 "id": event_id,
+#                 "target": delivery_target,
+#             },
+#         )
+#         db.commit()
+
+#         redis_client.lpush(QUEUE_MAIN, str(event_id))
+
+#         return {"replayed": True, "event_id": event_id}
+
+#     finally:
+#         db.close()
+
+
+
+
+
+
 from fastapi import APIRouter, HTTPException, status
 from sqlalchemy import text
 from .database import SessionLocal
 from .redis_client import redis_client
-import json
 
 router = APIRouter(prefix="/events", tags=["replay"])
 QUEUE_MAIN = "webhook:queue"
@@ -14,35 +88,17 @@ def replay_event(event_id: int):
     try:
         event = db.execute(
             text("""
-                SELECT
-                    e.id,
-                    e.route_id,
-                    r.mode,
-                    r.dev_target,
-                    r.prod_target
-                FROM webhook_events e
-                JOIN webhook_routes r
-                  ON e.route_id = r.id
-                  WHERE e.id = :id
+                SELECT id
+                FROM webhook_events
+                WHERE id = :id
             """),
             {"id": event_id},
         ).mappings().first()
 
         if not event:
             raise HTTPException(status_code=404, detail="Event not found")
 
-        delivery_target = (
-            event["dev_target"]
-            if event["mode"] == "dev"
-            else event["prod_target"]
-        )
-
-        if not delivery_target:
-            raise HTTPException(
-                status_code=400,
-                detail="No delivery target configured for this route",
-            )
-
+        #  Reset event state (same as before)
         db.execute(
             text("""
                 UPDATE webhook_events
@@ -51,19 +107,17 @@ def replay_event(event_id: int):
                     attempt_count = 0,
                     last_error = NULL,
                     next_retry_at = NULL
-                    
                 WHERE id = :id
             """),
-            {
-                "id": event_id,
-                "target": delivery_target,
-            },
+            {"id": event_id},
         )
+
         db.commit()
 
+        #  Push to worker queue
         redis_client.lpush(QUEUE_MAIN, str(event_id))
 
         return {"replayed": True, "event_id": event_id}
 
     finally:
-        db.close()
+        db.close()