@hed-hog/core 0.0.171 → 0.0.173

package/dist/dashboard/dashboard-component/dashboard-component.service.js

@@ -104,7 +104,7 @@ let DashboardComponentService = class DashboardComponentService {
     }
     async getComponent(id, locale, userId) {
         if (userId) {
-            const userRoles = await this.prismaService.user_role.findMany({
+            const userRoles = await this.prismaService.role_user.findMany({
                 where: { user_id: userId },
                 select: { role_id: true },
             });

package/dist/dashboard/dashboard-core/dashboard-core.controller.d.ts

@@ -48,7 +48,7 @@ export declare class DashboardCoreController {
         x_axis: number;
         y_axis: number;
     })[]>;
-    getStatistics(): Promise<{
+    getUserStatistics(): Promise<{
         cards: {
             sessionsToday: {
                 value: number;
@@ -58,20 +58,12 @@ export declare class DashboardCoreController {
                 value: number;
                 change: number;
             };
-            emailsSent: {
-                value: number;
-                change: number;
-            };
             roles: {
                 value: number;
                 change: number;
             };
         };
         charts: {
-            emailsPerWeek: {
-                day: string;
-                sent: number;
-            }[];
             permissionDistribution: {
                 name: string;
                 value: number;
@@ -85,6 +77,20 @@ export declare class DashboardCoreController {
             }[];
         };
     }>;
+    getMailStatistics(): Promise<{
+        cards: {
+            emailsSent: {
+                value: number;
+                change: number;
+            };
+        };
+        charts: {
+            emailsPerWeek: {
+                day: string;
+                sent: number;
+            }[];
+        };
+    }>;
     getUserLayout(user: any, slug: string, locale: string): Promise<{
         i: string;
         component_id: number;

package/dist/dashboard/dashboard-core/dashboard-core.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard-core.controller.d.ts","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBAEa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAApB,oBAAoB,EAAE,oBAAoB;IAGvE,QAAQ,CAAgB,IAAI,EAAE,MAAM,EAAY,MAAM,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKtD,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKb,aAAa,CAAS,IAAI,KAAA,EAAiB,IAAI,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;IAKjF,cAAc,CACJ,IAAI,KAAA,EACG,IAAI,EAAE,MAAM,EACnB,IAAI,EAAE;QAAE,MAAM,EAAE,KAAK,CAAC;YAAE,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE;;;IAM5F,SAAS,CACC,IAAI,KAAA,EACG,IAAI,EAAE,MAAM,EACnB,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAC7B,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;IAW1B,YAAY,CACF,IAAI,KAAA,EACG,IAAI,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM;;;CAQtC"}
+{"version":3,"file":"dashboard-core.controller.d.ts","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBAEa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAApB,oBAAoB,EAAE,oBAAoB;IAGvE,QAAQ,CAAgB,IAAI,EAAE,MAAM,EAAY,MAAM,KAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKtD,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKjB,iBAAiB;;;;;;;;;;;;;;IAKjB,aAAa,CAAS,IAAI,KAAA,EAAiB,IAAI,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;IAKjF,cAAc,CACJ,IAAI,KAAA,EACG,IAAI,EAAE,MAAM,EACnB,IAAI,EAAE;QAAE,MAAM,EAAE,KAAK,CAAC;YAAE,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAC;YAAC,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE;;;IAM5F,SAAS,CACC,IAAI,KAAA,EACG,IAAI,EAAE,MAAM,EACnB,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAC7B,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;IAW1B,YAAY,CACF,IAAI,KAAA,EACG,IAAI,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM;;;CAQtC"}

package/dist/dashboard/dashboard-core/dashboard-core.controller.js

@@ -24,8 +24,11 @@ let DashboardCoreController = class DashboardCoreController {
     fromSlug(slug, locale) {
         return this.dashboardCoreService.fromSlug(slug, locale);
     }
-    getStatistics() {
-        return this.dashboardCoreService.getStatistics();
+    getUserStatistics() {
+        return this.dashboardCoreService.getUserStatistics();
+    }
+    getMailStatistics() {
+        return this.dashboardCoreService.getMailStatistics();
     }
     getUserLayout(user, slug, locale) {
         return this.dashboardCoreService.getUserLayout(user.id, slug, locale);
@@ -50,11 +53,17 @@ __decorate([
     __metadata("design:returntype", void 0)
 ], DashboardCoreController.prototype, "fromSlug", null);
 __decorate([
-    (0, common_1.Get)('stats/overview'),
+    (0, common_1.Get)('stats/overview/users'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], DashboardCoreController.prototype, "getUserStatistics", null);
+__decorate([
+    (0, common_1.Get)('stats/overview/mails'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], DashboardCoreController.prototype, "getStatistics", null);
+], DashboardCoreController.prototype, "getMailStatistics", null);
 __decorate([
     (0, common_1.Get)('layout/:slug'),
     __param(0, (0, api_1.User)()),

package/dist/dashboard/dashboard-core/dashboard-core.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard-core.controller.js","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sCAA0C;AAC1C,oDAA6C;AAC7C,2CAA4E;AAC5E,qEAAgE;AAIzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC,YAA6B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAG3E,QAAQ,CAAgB,IAAY,EAAY,MAAM;QACpD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAGD,aAAa;QACX,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,CAAC;IACnD,CAAC;IAGD,aAAa,CAAS,IAAI,EAAiB,IAAY,EAAY,MAAc;QAC/E,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAGD,cAAc,CACJ,IAAI,EACG,IAAY,EACnB,IAAkF;QAE1F,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;IAGD,SAAS,CACC,IAAI,EACG,IAAY,EACnB,IAA+B,EAC7B,MAAc;QAExB,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CACvD,IAAI,CAAC,EAAE,EACP,IAAI,EACJ,IAAI,CAAC,aAAa,EAClB,MAAM,CACP,CAAC;IACJ,CAAC;IAGD,YAAY,CACF,IAAI,EACG,IAAY,EACR,QAAgB;QAEnC,OAAO,IAAI,CAAC,oBAAoB,CAAC,6BAA6B,CAC5D,IAAI,CAAC,EAAE,EACP,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;CACF,CAAA;AAtDY,0DAAuB;AAIlC;IADC,IAAA,YAAG,EAAC,OAAO,CAAC;IACH,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;uDAE9C;AAGD;IADC,IAAA,YAAG,EAAC,gBAAgB,CAAC;;;;4DAGrB;AAGD;IADC,IAAA,YAAG,EAAC,cAAc,CAAC;IACL,WAAA,IAAA,UAAI,GAAE,CAAA;IAAQ,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;4DAEjE;AAGD;IADC,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,aAAI,GAAE,CAAA;;;;6DAGR;AAGD;IADC,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;wDAQV;AAGD;IADC,IAAA,eAAM,EAAC,wBAAwB,CAAC;IAE9B,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,UAAU,CAAC,CAAA;;;;2DAOnB;kCArDU,uBAAuB;IAFnC,IAAA,UAAI,GAAE;IACN,IAAA,mBAAU,EAAC,gBAAgB,CAAC;qCAEwB,6CAAoB;GAD5D,uBAAuB,CAsDnC"}
+{"version":3,"file":"dashboard-core.controller.js","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sCAA0C;AAC1C,oDAA6C;AAC7C,2CAA4E;AAC5E,qEAAgE;AAIzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC,YAA6B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAG3E,QAAQ,CAAgB,IAAY,EAAY,MAAM;QACpD,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAGD,iBAAiB;QACf,OAAO,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;IACvD,CAAC;IAGD,iBAAiB;QACf,OAAO,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;IACvD,CAAC;IAGD,aAAa,CAAS,IAAI,EAAiB,IAAY,EAAY,MAAc;QAC/E,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAGD,cAAc,CACJ,IAAI,EACG,IAAY,EACnB,IAAkF;QAE1F,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;IAGD,SAAS,CACC,IAAI,EACG,IAAY,EACnB,IAA+B,EAC7B,MAAc;QAExB,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CACvD,IAAI,CAAC,EAAE,EACP,IAAI,EACJ,IAAI,CAAC,aAAa,EAClB,MAAM,CACP,CAAC;IACJ,CAAC;IAGD,YAAY,CACF,IAAI,EACG,IAAY,EACR,QAAgB;QAEnC,OAAO,IAAI,CAAC,oBAAoB,CAAC,6BAA6B,CAC5D,IAAI,CAAC,EAAE,EACP,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;CACF,CAAA;AA3DY,0DAAuB;AAIlC;IADC,IAAA,YAAG,EAAC,OAAO,CAAC;IACH,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;uDAE9C;AAGD;IADC,IAAA,YAAG,EAAC,sBAAsB,CAAC;;;;gEAG3B;AAGD;IADC,IAAA,YAAG,EAAC,sBAAsB,CAAC;;;;gEAG3B;AAGD;IADC,IAAA,YAAG,EAAC,cAAc,CAAC;IACL,WAAA,IAAA,UAAI,GAAE,CAAA;IAAQ,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IAAgB,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;4DAEjE;AAGD;IADC,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,aAAI,GAAE,CAAA;;;;6DAGR;AAGD;IADC,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,mBAAM,GAAE,CAAA;;;;wDAQV;AAGD;IADC,IAAA,eAAM,EAAC,wBAAwB,CAAC;IAE9B,WAAA,IAAA,UAAI,GAAE,CAAA;IACN,WAAA,IAAA,cAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,cAAK,EAAC,UAAU,CAAC,CAAA;;;;2DAOnB;kCA1DU,uBAAuB;IAFnC,IAAA,UAAI,GAAE;IACN,IAAA,mBAAU,EAAC,gBAAgB,CAAC;qCAEwB,6CAAoB;GAD5D,uBAAuB,CA2DnC"}

package/dist/dashboard/dashboard-core/dashboard-core.service.d.ts

@@ -48,7 +48,8 @@ export declare class DashboardCoreService {
         x_axis: number;
         y_axis: number;
     })[]>;
-    getStatistics(): Promise<{
+    calculateChange(current: number, previous: number): number;
+    getUserStatistics(): Promise<{
         cards: {
             sessionsToday: {
                 value: number;
@@ -58,20 +59,12 @@ export declare class DashboardCoreService {
                 value: number;
                 change: number;
             };
-            emailsSent: {
-                value: number;
-                change: number;
-            };
             roles: {
                 value: number;
                 change: number;
             };
         };
         charts: {
-            emailsPerWeek: {
-                day: string;
-                sent: number;
-            }[];
             permissionDistribution: {
                 name: string;
                 value: number;
@@ -85,6 +78,20 @@ export declare class DashboardCoreService {
             }[];
         };
     }>;
+    getMailStatistics(): Promise<{
+        cards: {
+            emailsSent: {
+                value: number;
+                change: number;
+            };
+        };
+        charts: {
+            emailsPerWeek: {
+                day: string;
+                sent: number;
+            }[];
+        };
+    }>;
     getUserLayout(userId: number, slug: string, localeCode: string): Promise<{
         i: string;
         component_id: number;

package/dist/dashboard/dashboard-core/dashboard-core.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard-core.service.d.ts","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,qBACa,oBAAoB;IACnB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoBnC,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoKb,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;IA6D9D,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CAAC;QACZ,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;;;IA4DE,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;IA6Gd,6BAA6B,CACjC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM;;;CAYnB"}
+{"version":3,"file":"dashboard-core.service.d.ts","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,qBACa,oBAAoB;IACnB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAoBzC,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK3C,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA0HjB,iBAAiB;;;;;;;;;;;;;;IAoDjB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;IA6D9D,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,CAAC;QACZ,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;;;IA4DE,wBAAwB,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;IA6Gd,6BAA6B,CACjC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM;;;CAYnB"}

package/dist/dashboard/dashboard-core/dashboard-core.service.js

@@ -35,55 +35,33 @@ let DashboardCoreService = class DashboardCoreService {
             },
         });
     }
-    async getStatistics() {
+    calculateChange(current, previous) {
+        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);
         const lastMonthEnd = new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59);
-        const [sessionsTodayCount, activeUsersCount, emailsSentCount, rolesCount, sessionsCurrentMonth, usersCurrentMonth, emailsCurrentMonth, rolesCurrentMonth, sessionsLastMonth, usersLastMonth, emailsLastMonth, rolesLastMonth,] = await Promise.all([
+        const [sessionsTodayCount, activeUsersCount, rolesCount, sessionsCurrentMonth, usersCurrentMonth, rolesCurrentMonth, sessionsLastMonth, usersLastMonth, 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, previous) => {
-            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 `
-      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 `
       SELECT 
         r.slug as name,
@@ -148,23 +126,59 @@ let DashboardCoreService = 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,
             },
         };
     }
+    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 `
+      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, slug, localeCode) {
         const dashboard = await this.prismaService.dashboard.findFirst({ where: { slug } });
         if (!dashboard) {

package/dist/dashboard/dashboard-core/dashboard-core.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard-core.service.js","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dashboard-core.service.js","sourceRoot":"","sources":["../../../src/dashboard/dashboard-core/dashboard-core.service.ts"],"names":[],"mappings":"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"}

package/hedhog/data/role.yaml

@@ -12,6 +12,20 @@
   description:
     en: Access to administrative features.
     pt: Acesso a funcionalidades administrativas.
+- slug: admin-user
+  name:
+    en: Admin User
+    pt: Administrador de Usuário
+  description:
+    en: Access to administrative privileges related to users.
+    pt: Acesso a privilégios administrativos relacionados á usuários.
+- slug: admin-mail
+  name:
+    en: Admin Mail
+    pt: Administrador de E-mails
+  description:
+    en: Access to administrative privileges related to e-mails.
+    pt: Acesso a privilégios administrativos relacionados á e-mails.
 - slug: user
   name:
     en: User

package/hedhog/data/route.yaml

@@ -620,18 +620,18 @@
     role:
       - where:
           slug: admin
-- url: /dashboard-core/stats/overview
+- url: /dashboard-core/stats/overview/users
   method: GET
   relations:
     role:
       - where:
-          slug: admin
-- url: /dashboard-core/stats/user-growth
+          slug: admin-user
+- url: /dashboard-core/stats/overview/mails
   method: GET
   relations:
     role:
       - where:
-          slug: admin
+          slug: admin-mail
 - url: /dashboard-core/layout/:slug
   method: GET
   relations:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hed-hog/core",
-  "version": "0.0.171",
+  "version": "0.0.173",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
@@ -30,10 +30,10 @@
     "speakeasy": "^2.0.0",
     "uuid": "^11.1.0",
     "@hed-hog/api-locale": "0.0.11",
-    "@hed-hog/api-prisma": "0.0.4",
     "@hed-hog/api-mail": "0.0.7",
-    "@hed-hog/api": "0.0.3",
     "@hed-hog/types": "0.0.1",
+    "@hed-hog/api": "0.0.3",
+    "@hed-hog/api-prisma": "0.0.4",
     "@hed-hog/api-pagination": "0.0.5"
   },
   "exports": {

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

@@ -126,7 +126,7 @@ export class DashboardComponentService {
 
   async getComponent(id: number, locale: string, userId?: number) {
     if (userId) {
-      const userRoles = await this.prismaService.user_role.findMany({
+      const userRoles = await this.prismaService.role_user.findMany({
         where: { user_id: userId },
         select: { role_id: true },
       });

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

@@ -13,9 +13,14 @@ export class DashboardCoreController {
     return this.dashboardCoreService.fromSlug(slug, locale);
   }
 
-  @Get('stats/overview')
-  getStatistics() {
-    return this.dashboardCoreService.getStatistics();
+  @Get('stats/overview/users')
+  getUserStatistics() {
+    return this.dashboardCoreService.getUserStatistics();
+  }
+
+  @Get('stats/overview/mails')
+  getMailStatistics() {
+    return this.dashboardCoreService.getMailStatistics();
   }
 
   @Get('layout/:slug')

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 } });