@hed-hog/core 0.0.170 → 0.0.172

package/src/dashboard/dashboard-core/dashboard-core.service.ts

@@ -25,10 +25,14 @@ export class DashboardCoreService {
     });
   }
 
-  async getStatistics() {
+  calculateChange(current: number, previous: number){
+    if (previous === 0) return current === 0 ? 0 : 100;
+    return Number((((current - previous) / previous) * 100).toFixed(1));
+  };
+
+  async getUserStatistics() {
     const now = new Date();
     const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-    const sevenDaysAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000);
     const twelveMonthsAgo = new Date(now.getFullYear() - 1, now.getMonth(), 1);
     const currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
     const lastMonthStart = new Date(now.getFullYear(), now.getMonth() - 1, 1);
@@ -37,64 +41,28 @@ export class DashboardCoreService {
     const [
       sessionsTodayCount, 
       activeUsersCount, 
-      emailsSentCount, 
       rolesCount,
       sessionsCurrentMonth,
       usersCurrentMonth,
-      emailsCurrentMonth,
       rolesCurrentMonth,
       sessionsLastMonth,
       usersLastMonth,
-      emailsLastMonth,
       rolesLastMonth,
     ] = await Promise.all([
       this.prismaService.user_session.count({ where: { created_at: { gte: todayStart } } }),
       this.prismaService.user.count(),
-      this.prismaService.mail_sent.count(),
       this.prismaService.role.count(),
       this.prismaService.user_session.count({ where: { created_at: { gte: currentMonthStart } } }),
       this.prismaService.user.count({ where: { created_at: { gte: currentMonthStart } } }),
-      this.prismaService.mail_sent.count({ where: { created_at: { gte: currentMonthStart } } }),
       this.prismaService.role.count({ where: { created_at: { gte: currentMonthStart } } }),
       this.prismaService.user_session.count({ where: { created_at: { gte: lastMonthStart, lte: lastMonthEnd } } }),
       this.prismaService.user.count({ where: { created_at: { gte: lastMonthStart, lte: lastMonthEnd } } }),
-      this.prismaService.mail_sent.count({ where: { created_at: { gte: lastMonthStart, lte: lastMonthEnd } } }),
       this.prismaService.role.count({ where: { created_at: { gte: lastMonthStart, lte: lastMonthEnd } } }),
     ]);
 
-    const calculateChange = (current: number, previous: number) => {
-      if (previous === 0) {
-        return current === 0 ? 0 : 100;
-      }
-      return Number((((current - previous) / previous) * 100).toFixed(1));
-    };
-
-    const sessionsChange = calculateChange(sessionsCurrentMonth, sessionsLastMonth);
-    const usersChange = calculateChange(usersCurrentMonth, usersLastMonth);
-    const emailsChange = calculateChange(emailsCurrentMonth, emailsLastMonth);
-    const rolesChange = calculateChange(rolesCurrentMonth, rolesLastMonth);
-
-    const emailsPerWeek = await this.prismaService.$queryRaw<
-      Array<{ day: Date; sent: bigint }>
-    >`
-      SELECT 
-        DATE("created_at") as day,
-        COUNT(*) as sent
-      FROM "mail_sent"
-      WHERE "created_at" >= ${sevenDaysAgo}
-      GROUP BY DATE("created_at")
-      ORDER BY day ASC
-    `;
-
-    const weekDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    const emailWeekData = emailsPerWeek.map((item) => {
-      const dayOfWeek = new Date(item.day).getDay();
-      return {
-        day: weekDays[dayOfWeek],
-        sent: Number(item.sent),
-      };
-    });
-
+    const sessionsChange = this.calculateChange(sessionsCurrentMonth, sessionsLastMonth);
+    const usersChange = this.calculateChange(usersCurrentMonth, usersLastMonth);
+    const rolesChange = this.calculateChange(rolesCurrentMonth, rolesLastMonth);
     const permissionDistribution = await this.prismaService.$queryRaw<
       Array<{ name: string; value: bigint }>
     >`
@@ -171,17 +139,12 @@ export class DashboardCoreService {
           value: activeUsersCount,
           change: usersChange,
         },
-        emailsSent: {
-          value: emailsSentCount,
-          change: emailsChange,
-        },
         roles: {
           value: rolesCount,
           change: rolesChange,
         },
       },
       charts: {
-        emailsPerWeek: emailWeekData,
         permissionDistribution: permissionsData,
         sessionActivity: sessionActivityData,
         userGrowth: userGrowthData,
@@ -189,6 +152,58 @@ export class DashboardCoreService {
     };
   }
 
+  async getMailStatistics(){
+    const now = new Date();
+    const currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+    const lastMonthStart = new Date(now.getFullYear(), now.getMonth() - 1, 1);
+    const lastMonthEnd = new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59);
+    const sevenDaysAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000);
+
+    const [
+      emailsSentCount, 
+      emailsCurrentMonth,
+      emailsLastMonth,
+    ] = await Promise.all([
+      this.prismaService.mail_sent.count(),
+      this.prismaService.mail_sent.count({ where: { created_at: { gte: currentMonthStart } } }),
+      this.prismaService.mail_sent.count({ where: { created_at: { gte: lastMonthStart, lte: lastMonthEnd } } }),
+    ]);
+
+    const emailsChange = this.calculateChange(emailsCurrentMonth, emailsLastMonth);
+    const emailsPerWeek = await this.prismaService.$queryRaw<
+      Array<{ day: Date; sent: bigint }>
+    >`
+      SELECT 
+        DATE("created_at") as day,
+        COUNT(*) as sent
+      FROM "mail_sent"
+      WHERE "created_at" >= ${sevenDaysAgo}
+      GROUP BY DATE("created_at")
+      ORDER BY day ASC
+    `;
+
+    const weekDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+    const emailWeekData = emailsPerWeek.map((item) => {
+      const dayOfWeek = new Date(item.day).getDay();
+      return {
+        day: weekDays[dayOfWeek],
+        sent: Number(item.sent),
+      };
+    });
+
+    return {
+      cards: {
+        emailsSent: {
+          value: emailsSentCount,
+          change: emailsChange,
+        },
+      },
+      charts: {
+        emailsPerWeek: emailWeekData,
+      },
+    };
+  }
+
   async getUserLayout(userId: number, slug: string, localeCode: string) {
     const dashboard = await this.prismaService.dashboard.findFirst({ where: { slug } });
 

package/src/dashboard/dashboard.module.ts

@@ -1,6 +1,7 @@
 import { LocaleModule } from '@hed-hog/api-locale';
 import { PrismaModule } from '@hed-hog/api-prisma';
 import { forwardRef, Module } from '@nestjs/common';
+import { DashboardComponentRoleModule } from './dashboard-component-role/dashboard-component-role.module';
 import { DashboardComponentModule } from './dashboard-component/dashboard-component.module';
 import { DashboardCoreModule } from './dashboard-core/dashboard-core.module';
 import { DashboardItemModule } from './dashboard-item/dashboard-item.module';
@@ -13,6 +14,7 @@ import { DashboardCrudModule } from './dashboard/dashboard.module';
     forwardRef(() => PrismaModule),
     forwardRef(() => DashboardCrudModule),
     forwardRef(() => DashboardComponentModule),
+    forwardRef(() => DashboardComponentRoleModule),
     forwardRef(() => DashboardItemModule),
     forwardRef(() => DashboardUserModule),
     forwardRef(() => DashboardCoreModule),