From edbaf555c27f4354dea5b09d0d8f83815788e8ed Mon Sep 17 00:00:00 2001
From: Akshay <akshay.allen26200@gmail.com>
Date: Wed, 19 Nov 2025 09:49:25 +0530
Subject: [PATCH] feat: Implement approved event count for companies and update
 event status badges to reflect approval status.

---
 app/api/companies/[slug]/route.ts       | 18 ++++++++++++--
 app/dashboard/company/events/page.tsx   | 31 +++++++++++++++++--------
 components/companies/CompanyCard.tsx    | 10 ++++----
 components/companies/CompanyProfile.tsx | 28 +++++++++++-----------
 lib/services/company-service.ts         | 18 +++++++++++++-
 types/company.ts                        |  1 +
 6 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/app/api/companies/[slug]/route.ts b/app/api/companies/[slug]/route.ts
index 2e459c5f..a8c5a38d 100644
--- a/app/api/companies/[slug]/route.ts
+++ b/app/api/companies/[slug]/route.ts
@@ -71,10 +71,24 @@ export async function GET(
       }
     }
 
+    // Get count of approved events for this company
+    const supabase = await createClient()
+    const { count: approvedCount } = await supabase
+      .from('events')
+      .select('*', { count: 'exact', head: true })
+      .eq('company_id', company.id)
+      .eq('approval_status', 'approved')
+
+    // Add approved_events_count to company object
+    const companyWithApprovedCount = {
+      ...company,
+      approved_events_count: approvedCount || 0,
+    }
+
     // Cache the result
-    await UnifiedCache.set(cacheKey, { company }, 'API_STANDARD')
+    await UnifiedCache.set(cacheKey, { company: companyWithApprovedCount }, 'API_STANDARD')
 
-    return UnifiedCache.createResponse({ company }, 'API_STANDARD')
+    return UnifiedCache.createResponse({ company: companyWithApprovedCount }, 'API_STANDARD')
   } catch (error) {
     console.error('Error in GET /api/companies/[slug]:', error)
 
diff --git a/app/dashboard/company/events/page.tsx b/app/dashboard/company/events/page.tsx
index e46252cf..36d5fc58 100644
--- a/app/dashboard/company/events/page.tsx
+++ b/app/dashboard/company/events/page.tsx
@@ -37,7 +37,7 @@ export default function CompanyEventsPage() {
       setLoading(true)
       // Fetch all events (not just approved) for company members
       const response = await fetch(`/api/companies/${currentCompany.slug}/events?status=all&limit=100`)
-      
+
       if (!response.ok) {
         throw new Error('Failed to fetch events')
       }
@@ -66,7 +66,7 @@ export default function CompanyEventsPage() {
   const handleDeleteEvent = async (eventSlug: string) => {
     try {
       setDeletingEventSlug(eventSlug)
-      
+
       const response = await fetch(`/api/events/${eventSlug}`, {
         method: 'DELETE',
       })
@@ -76,7 +76,7 @@ export default function CompanyEventsPage() {
       }
 
       toast.success('Event deleted successfully')
-      
+
       // Refresh the events list
       await fetchEvents()
     } catch (error) {
@@ -129,11 +129,22 @@ export default function CompanyEventsPage() {
     }
   }
 
-  const getStatusBadge = (status: string) => {
-    switch (status) {
-      case 'live':
-      case 'published':
+  const getStatusBadge = (status: string, approvalStatus: string) => {
+    // Only show "Live" if the event is published AND approved
+    if ((status === 'live' || status === 'published')) {
+      if (approvalStatus === 'approved') {
         return <Badge className="bg-blue-500/10 text-blue-600 border-blue-500/20">Live</Badge>
+      } else if (approvalStatus === 'pending') {
+        return <Badge className="bg-yellow-500/10 text-yellow-600 border-yellow-500/20">Pending Review</Badge>
+      } else if (approvalStatus === 'rejected') {
+        return <Badge className="bg-red-500/10 text-red-600 border-red-500/20">Rejected</Badge>
+      } else if (approvalStatus === 'changes_requested') {
+        return <Badge className="bg-orange-500/10 text-orange-600 border-orange-500/20">Changes Requested</Badge>
+      }
+    }
+
+    // For other statuses, use the original logic
+    switch (status) {
       case 'draft':
         return <Badge variant="outline">Draft</Badge>
       case 'cancelled':
@@ -289,7 +300,7 @@ export default function CompanyEventsPage() {
                     <TableCell>
                       <Badge variant="outline">{event.category}</Badge>
                     </TableCell>
-                    <TableCell>{getStatusBadge(event.status)}</TableCell>
+                    <TableCell>{getStatusBadge(event.status, event.approval_status)}</TableCell>
                     <TableCell>{getApprovalBadge(event.approval_status)}</TableCell>
                     <TableCell>
                       <div className="flex items-center gap-1">
@@ -314,8 +325,8 @@ export default function CompanyEventsPage() {
                         )}
                         <AlertDialog>
                           <AlertDialogTrigger asChild>
-                            <Button 
-                              variant="outline" 
+                            <Button
+                              variant="outline"
                               size="sm"
                               disabled={deletingEventSlug === event.slug}
                             >
diff --git a/components/companies/CompanyCard.tsx b/components/companies/CompanyCard.tsx
index b187a645..675f1a45 100644
--- a/components/companies/CompanyCard.tsx
+++ b/components/companies/CompanyCard.tsx
@@ -14,11 +14,11 @@ interface CompanyCardProps {
   className?: string
 }
 
-export function CompanyCard({ 
-  company, 
-  showStats = true, 
+export function CompanyCard({
+  company,
+  showStats = true,
   showVerificationBadge = true,
-  className 
+  className
 }: CompanyCardProps) {
   return (
     <Link href={`/companies/${company.slug}`}>
@@ -81,7 +81,7 @@ export function CompanyCard({
             <div className="flex items-center justify-between w-full text-xs text-muted-foreground">
               <div className="flex items-center gap-1">
                 <Calendar className="h-3.5 w-3.5" />
-                <span>{company.total_events} events</span>
+                <span>{company.approved_events_count ?? company.total_events ?? 0} events</span>
               </div>
               <div className="flex items-center gap-1">
                 <Users className="h-3.5 w-3.5" />
diff --git a/components/companies/CompanyProfile.tsx b/components/companies/CompanyProfile.tsx
index 77bb653a..6034f094 100644
--- a/components/companies/CompanyProfile.tsx
+++ b/components/companies/CompanyProfile.tsx
@@ -28,7 +28,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
       {/* Banner and Logo Section */}
       <Card className="overflow-hidden">
         {/* Banner */}
-        <div 
+        <div
           className="h-56 sm:h-64 bg-gradient-to-r from-primary/20 via-primary/10 to-primary/20"
           style={company.banner_url ? {
             backgroundImage: `url(${company.banner_url})`,
@@ -36,7 +36,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
             backgroundPosition: 'center',
           } : undefined}
         />
-        
+
         <CardHeader className="relative -mt-20 pb-4">
           <div className="flex flex-col sm:flex-row items-start sm:items-end gap-4">
             {/* Logo */}
@@ -51,10 +51,10 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
             <div className="flex-1 space-y-2">
               <div className="flex flex-wrap items-center gap-3">
                 <CardTitle className="text-3xl">{company.name}</CardTitle>
-                <VerificationBadge 
-                  status={company.verification_status} 
-                  size="lg" 
-                  showLabel 
+                <VerificationBadge
+                  status={company.verification_status}
+                  size="lg"
+                  showLabel
                 />
               </div>
               {company.legal_name && company.legal_name !== company.name && (
@@ -120,7 +120,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
             <div className="grid grid-cols-3 gap-4 text-center">
               <div className="space-y-1">
                 <p className="text-2xl font-bold text-primary">
-                  {company.total_events || 0}
+                  {company.approved_events_count ?? company.total_events ?? 0}
                 </p>
                 <p className="text-xs text-muted-foreground">Events Hosted</p>
               </div>
@@ -151,7 +151,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                 <Globe className="h-4 w-4 mt-0.5 text-muted-foreground" />
                 <div className="flex-1 min-w-0">
                   <p className="text-xs text-muted-foreground mb-1">Website</p>
-                  <a 
+                  <a
                     href={company.website}
                     target="_blank"
                     rel="noopener noreferrer"
@@ -168,7 +168,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                 <Mail className="h-4 w-4 mt-0.5 text-muted-foreground" />
                 <div className="flex-1 min-w-0">
                   <p className="text-xs text-muted-foreground mb-1">Email</p>
-                  <a 
+                  <a
                     href={`mailto:${company.email}`}
                     className="text-sm text-primary hover:underline break-all"
                   >
@@ -183,7 +183,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                 <Phone className="h-4 w-4 mt-0.5 text-muted-foreground" />
                 <div className="flex-1 min-w-0">
                   <p className="text-xs text-muted-foreground mb-1">Phone</p>
-                  <a 
+                  <a
                     href={`tel:${company.phone}`}
                     className="text-sm text-primary hover:underline"
                   >
@@ -230,7 +230,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                   <div className="flex flex-wrap gap-2">
                     {company.socials.linkedin && (
                       <Button variant="outline" size="sm" asChild>
-                        <a 
+                        <a
                           href={company.socials.linkedin}
                           target="_blank"
                           rel="noopener noreferrer"
@@ -241,7 +241,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                     )}
                     {company.socials.twitter && (
                       <Button variant="outline" size="sm" asChild>
-                        <a 
+                        <a
                           href={company.socials.twitter}
                           target="_blank"
                           rel="noopener noreferrer"
@@ -252,7 +252,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                     )}
                     {company.socials.facebook && (
                       <Button variant="outline" size="sm" asChild>
-                        <a 
+                        <a
                           href={company.socials.facebook}
                           target="_blank"
                           rel="noopener noreferrer"
@@ -263,7 +263,7 @@ export function CompanyProfile({ company, isOwner = false, className }: CompanyP
                     )}
                     {company.socials.instagram && (
                       <Button variant="outline" size="sm" asChild>
-                        <a 
+                        <a
                           href={company.socials.instagram}
                           target="_blank"
                           rel="noopener noreferrer"
diff --git a/lib/services/company-service.ts b/lib/services/company-service.ts
index 4804fd88..a5f177e6 100644
--- a/lib/services/company-service.ts
+++ b/lib/services/company-service.ts
@@ -371,11 +371,27 @@ class CompanyService {
       )
     }
 
+    // For each company, get the count of approved events
+    const companiesWithApprovedCount = await Promise.all(
+      (companies || []).map(async (company) => {
+        const { count: approvedCount } = await supabase
+          .from('events')
+          .select('*', { count: 'exact', head: true })
+          .eq('company_id', company.id)
+          .eq('approval_status', 'approved')
+
+        return {
+          ...company,
+          approved_events_count: approvedCount || 0,
+        }
+      })
+    )
+
     const total = count || 0
     const hasMore = offset + limit < total
 
     const result = {
-      companies: (companies || []) as Company[],
+      companies: companiesWithApprovedCount as Company[],
       total,
       hasMore,
     }
diff --git a/types/company.ts b/types/company.ts
index 8e6f6665..c60ae63f 100644
--- a/types/company.ts
+++ b/types/company.ts
@@ -43,6 +43,7 @@ export interface Company {
   total_hackathons: number
   total_participants: number
   total_registrations: number
+  approved_events_count?: number // Count of approved events only (for public display)
 }
 
 export interface CompanyAddress {