From 0d7555f219369007bb88928d524be9987354e680 Mon Sep 17 00:00:00 2001
From: Mahdi <mahdi.banilohi@gmail.com>
Date: Tue, 6 Oct 2026 12:44:09 +0330
Subject: [PATCH] Fixing the error in today's task count

---
 apps/api/src/activities/activities.service.ts | 22 +++++++++++++++++--
 apps/web/src/layouts/AppLayout.vue            |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/apps/api/src/activities/activities.service.ts b/apps/api/src/activities/activities.service.ts
index f5779b6..778a465 100644
--- a/apps/api/src/activities/activities.service.ts
+++ b/apps/api/src/activities/activities.service.ts
@@ -69,6 +69,24 @@ export class ActivitiesService {
   ): Promise<ActivitySummaryDto> {
     const { start, end } = dayBounds();
     const scope = assigneeWhere(actor);
+    const [todayCount, overdueCount] = await Promise.all([
+      this.prisma.activity.count({
+        where: {
+          organizationId,
+          ...scope,
+          status: 'open',
+          dueAt: { gte: start, lt: end },
+        },
+      }),
+      this.prisma.activity.count({
+        where: {
+          organizationId,
+          ...scope,
+          status: 'open',
+          dueAt: { lt: start },
+        },
+      }),
+    ]);
     const [today, overdue, upcoming] = await Promise.all([
       this.prisma.activity.findMany({
         where: {
@@ -109,8 +127,8 @@ export class ActivitiesService {
       today: today.map((row) => this.toDto(row)),
       overdue: overdue.map((row) => this.toDto(row)),
       upcoming: upcoming.map((row) => this.toDto(row)),
-      todayCount: today.length,
-      overdueCount: overdue.length,
+      todayCount,
+      overdueCount,
     };
   }
 
diff --git a/apps/web/src/layouts/AppLayout.vue b/apps/web/src/layouts/AppLayout.vue
index 14e2950..a526fe8 100644
--- a/apps/web/src/layouts/AppLayout.vue
+++ b/apps/web/src/layouts/AppLayout.vue
@@ -279,7 +279,7 @@ async function refreshNotifs() {
 async function loadActivityBadge() {
   try {
     const { data } = await api.get<ActivitySummaryDto>('/activities/summary');
-    activityBadge.value = data.todayCount + data.overdueCount;
+    activityBadge.value = data.todayCount;
   } catch {
     activityBadge.value = 0;
   }