Merge branch 'Prakharrdev:main' into main

Author: MrPanda009

backend/main.py

@@ -180,6 +180,11 @@ class AdminWorkerCreate(BaseModel):
     city: Optional[str] = None
     department: str
 
+class AdminUserStatusUpdate(BaseModel):
+    user_id: str
+    is_blocked: bool
+    role: str  # 'worker' or 'authority'
+
 
 class ComplaintAssignRequest(BaseModel):
     complaint_id: str
@@ -1400,9 +1405,59 @@ async def assign_complaint(
         raise HTTPException(status_code=500, detail=f"Assignment failed: {str(e)}")
 
 
+@app.post("/api/admin/complaints/invalidate")
+async def invalidate_admin_complaints_cache(
+    authorization: Optional[str] = Header(None)
+):
+    """Explicitly clear the admin complaints cache (e.g., after an update)."""
+    get_citizen_id_from_token(authorization)
+    if redis_client:
+        try:
+            for key in redis_client.scan_iter("admin:complaints:*"):
+                redis_client.delete(key)
+        except Exception as e:
+            print(f"Redis invalidation failed: {e}")
+    return {"status": "success"}
+
+
+# =========================================================
+# 8f. ADMIN USER STATUS (Block/Unblock)
+# =========================================================
+
+@app.post("/api/admin/users/status")
+async def update_user_status(
+    payload: AdminUserStatusUpdate,
+    authorization: Optional[str] = Header(None)
+):
+    """Block/Unblock a user and invalidate corresponding Redis cache."""
+    await require_admin(authorization)
+    
+    try:
+        # Update Profiles table
+        await asyncio.to_thread(
+            lambda: supabase.table("profiles")
+            .update({"is_blocked": payload.is_blocked})
+            .eq("id", payload.user_id)
+            .execute()
+        )
+
+        # Invalidate Redis based on role
+        if redis_client:
+            try:
+                if payload.role == "worker":
+                    redis_client.delete("admin:workers:list")
+                elif payload.role == "authority":
+                    redis_client.delete("admin:authorities:list")
+            except Exception as e:
+                print(f"Redis status invalidation failed: {e}")
+
+        return {"status": "success", "is_blocked": payload.is_blocked}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Failed to update user status: {str(e)}")
+
 
 # =========================================================
-# 8f. ADMIN COMPLAINTS LIST (Consolidated + Redis)
+# 8g. ADMIN COMPLAINTS LIST (Consolidated + Redis)
 # =========================================================
 
 

backend/shared.py

@@ -212,14 +212,12 @@ def get_redis_client() -> Optional[redis.Redis]:
             socket_connect_timeout=2,
             socket_timeout=2
         )
-        # Verify connection immediately
-        client.ping()
-        print(f"SUCCESS: Connected to Redis at {url.split('@')[-1]}")
+        # We removed the blocking client.ping() here to prevent cold-start delays.
+        # Connections will be established lazily during the first request.
         return client
     except Exception as e:
-        # Hide the actual password in the logs for security
         safe_url = url.split('@')[-1] if "@" in url else url
-        print(f"WARNING: Redis connection failed (URL: {safe_url}): {e}")
+        print(f"WARNING: Redis client initialization failed (URL: {safe_url}): {e}")
         return None
 
 redis_client = get_redis_client()

backend/whatsapp_webhook.py

@@ -42,6 +42,7 @@
     _find_active_spatial_duplicate,
     build_complaint_record,
     send_resend_email,
+    redis_client,
 )
 
 
@@ -338,6 +339,14 @@ async def confirm_ticket(phone: str, session: dict):
         await send_text(phone, f"❌ Failed to submit complaint: {e}")
         return
 
+    # Invalidate Redis Caches so Admin Dashboard shows new ticket
+    if redis_client:
+        try:
+            for key in redis_client.scan_iter("admin:complaints:*"):
+                redis_client.delete(key)
+        except Exception as e:
+            print(f"Redis invalidation failed: {e}")
+
     if not response.data:
         await send_text(phone, "❌ Submission failed. Please try again.")
         return

frontend/app/admin/Authorities.tsx

@@ -121,6 +121,9 @@ export default function Authorities({ onViewReports }: { onViewReports?: () => v
       });
 
       setAuthorities(mapped as AuthAccount[]);
+
+      // Update persistent local cache
+      localStorage.setItem("admin:authorities:cache", JSON.stringify(mapped));
     } catch (err) {
       console.error("Dashboard fetch error:", err);
       toast.error("Failed to load authorities.");
@@ -130,6 +133,17 @@ export default function Authorities({ onViewReports }: { onViewReports?: () => v
   };
 
   useEffect(() => {
+    // Initial hydration from local storage
+    const cached = localStorage.getItem("admin:authorities:cache");
+    if (cached) {
+      try {
+        setAuthorities(JSON.parse(cached));
+        setLoading(false);
+      } catch (e) {
+        console.error("Failed to parse authorities cache", e);
+      }
+    }
+    
     void fetchAuthorities();
 
     const channel = supabase.channel('admin-auth-rt')
@@ -220,24 +234,55 @@ export default function Authorities({ onViewReports }: { onViewReports?: () => v
   const handleAssignDept = async () => {
     if (!assigningAuth || !selectedNewDept) return;
 
-    const updatedCats = assigningAuth.categories.includes(selectedNewDept) 
-            ? assigningAuth.categories 
-            : [...assigningAuth.categories, selectedNewDept];
-
-    // Attempt pushing sync to profile metadata
-    const { error } = await (supabase as any).from('profiles').update({ 
-       categories: updatedCats,
-       department: selectedNewDept
-    }).eq("id", assigningAuth.id);
-    
-    if (error) {
-       toast.error("Failed to assign department in database. Refreshing...");
-    } else {
-       toast.success(`Assigned ${selectedNewDept} to ${assigningAuth.name}`);
-    }
-
-    void fetchAuthorities();
+    const workerId = assigningAuth.id;
+    const previousAuthorities = [...authorities];
+
+    // 1. Optimistic UI update
+    setAuthorities(prev => prev.map(a => 
+      a.id === workerId ? { ...a, categories: [selectedNewDept] } : a
+    ));
+    const currentAssigningName = assigningAuth.name;
     handleCloseAssignModal();
+
+    try {
+      const { data: { session } } = await supabase.auth.getSession();
+      if (!session) {
+        toast.error("Session expired.");
+        setAuthorities(previousAuthorities);
+        return;
+      }
+
+      const apiUrl = process.env.NEXT_PUBLIC_API_URL || "https://api.vihaan.perkkk.dev";
+      const response = await fetch(`${apiUrl}/api/admin/authorities`, {
+        method: "PATCH",
+        headers: {
+          "Content-Type": "application/json",
+          "Authorization": `Bearer ${session.access_token}`
+        },
+        body: JSON.stringify({
+          authority_id: workerId,
+          department: selectedNewDept
+        })
+      });
+
+      if (!response.ok) {
+        throw new Error("Failed to update department in database");
+      }
+
+      toast.success(`Assigned ${selectedNewDept} to ${currentAssigningName}`);
+      
+      // Update persistent cache
+      localStorage.setItem("admin:authorities:cache", JSON.stringify(
+        authorities.map(a => a.id === workerId ? { ...a, categories: [selectedNewDept] } : a)
+      ));
+
+      // Refresh in background
+      void fetchAuthorities();
+    } catch (e: any) {
+      console.error("Assignment failed:", e);
+      toast.error(e.message || "Failed to assign department");
+      setAuthorities(previousAuthorities);
+    }
   };
 
   useEffect(() => {
@@ -336,12 +381,18 @@ export default function Authorities({ onViewReports }: { onViewReports?: () => v
 
 
   return (
-    <div className={styles.dashboardContainer} ref={containerRef}>
-      <div className={styles.header}>
-        <h1 className={styles.title} style={{display:'flex', alignItems:'center', gap: 8}}>
-            <ShieldCheck size={28}/> Authorities
-        </h1>
-        <p className={styles.subtitle}>Manage registered authority accounts.</p>
+    <div className={styles.dashboardContainer} ref={containerRef} style={{paddingRight: 40}}>
+      <div className={styles.header} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
+        <div>
+          <h1 className={styles.title} style={{display:'flex', alignItems:'center', gap: 8}}>
+              <ShieldCheck size={28}/> Authorities
+          </h1>
+          <p className={styles.subtitle}>Supervise and monitor authority level accounts.</p>
+        </div>
+        <div style={{ display: 'flex', gap: '16px', alignItems: 'center', marginTop: 8 }}>
+          {!loading && <span className={`${styles.cPill} ${styles.resolved}`} style={{ padding: '6px 12px', fontSize: 11, fontWeight: 700 }}>Live Sync Active</span>}
+          {loading && <span className={`${styles.cPill} ${styles.pending}`} style={{ padding: '6px 12px', fontSize: 11, fontWeight: 700 }}>Updating Cache...</span>}
+        </div>
       </div>
 
          {/* 4-Item KPI Metrics Matrix */}