feat: update date handling in nodes usage history

- Bump contract library version to 0.3.18
- Modify GetNodesUsageByRangeCommand to accept string dates
- Update NodesUsageHistoryController to convert string dates to Date objects
- Enhance response model and interface to include date as a Date object
- Adjust repository query to group by date and return formatted date

Author: kastov

libs/contract/commands/nodes/get-nodes-usage-by-range.command.ts

@@ -7,8 +7,8 @@ export namespace GetNodesUsageByRangeCommand {
     export const TSQ_url = url;
 
     export const RequestQuerySchema = z.object({
-        start: z.string().transform((str) => new Date(str)),
-        end: z.string().transform((str) => new Date(str)),
+        start: z.string(),
+        end: z.string(),
     });
 
     export type RequestQuery = z.infer<typeof RequestQuerySchema>;
@@ -24,6 +24,7 @@ export namespace GetNodesUsageByRangeCommand {
                 humanReadableTotal: z.string(),
                 humanReadableTotalDownload: z.string(),
                 humanReadableTotalUpload: z.string(),
+                date: z.string().transform((str) => new Date(str)),
             }),
         ),
     });

libs/contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remnawave/backend-contract",
-  "version": "0.3.14",
+  "version": "0.3.18",
   "public": true,
   "license": "AGPL-3.0-only",
   "description": "A contract library for Remnawave Backend. It can be used in backend and frontend.",

src/modules/nodes-usage-history/interfaces/get-nodes-usage-by-range.interface.ts

@@ -4,4 +4,5 @@ export interface IGetNodesUsageByRange {
     total: bigint;
     totalDownload: bigint;
     totalUpload: bigint;
+    date: string;
 }

src/modules/nodes-usage-history/models/get-nodes-usage-by-range.response.model.ts

@@ -11,13 +11,15 @@ export class GetNodesUsageByRangeResponseModel {
     humanReadableTotal: string;
     humanReadableTotalDownload: string;
     humanReadableTotalUpload: string;
+    date: Date;
 
     constructor(data: IGetNodesUsageByRange) {
         this.nodeUuid = data.nodeUuid;
         this.nodeName = data.nodeName;
         this.total = Number(data.total);
         this.totalDownload = Number(data.totalDownload);
         this.totalUpload = Number(data.totalUpload);
+        this.date = new Date(data.date);
         this.humanReadableTotal = prettyBytesUtil(this.total, true, 3, true);
         this.humanReadableTotalDownload = prettyBytesUtil(this.totalDownload, true, 3, true);
         this.humanReadableTotalUpload = prettyBytesUtil(this.totalUpload, true, 3, true);

src/modules/nodes-usage-history/nodes-usage-history.controller.ts

@@ -52,7 +52,10 @@ export class NodesUsageHistoryController {
         @Query() query: GetNodesUsageByRangeRequestQueryDto,
     ): Promise<GetNodesUsageByRangeResponseDto> {
         const { start, end } = query;
-        const result = await this.nodesUsageHistoryService.getNodesUsageByRange(start, end);
+        const result = await this.nodesUsageHistoryService.getNodesUsageByRange(
+            new Date(start),
+            new Date(end),
+        );
 
         const data = errorHandler(result);
         return {

src/modules/nodes-usage-history/nodes-usage-history.service.ts

@@ -30,6 +30,7 @@ export class NodesUsageHistoryService {
                 startDate,
                 endDate,
             );
+
             return {
                 isOk: true,
                 response: nodesUsage.map(

src/modules/nodes-usage-history/repositories/nodes-usage-history.repository.ts

@@ -113,12 +113,14 @@ export class NodesUsageHistoryRepository implements ICrud<NodesUsageHistoryEntit
                 n.name as "nodeName",
                 COALESCE(SUM(h."total_bytes"), 0) as total,
                 COALESCE(SUM(h."download_bytes"), 0) as "totalDownload",
-                COALESCE(SUM(h."upload_bytes"), 0) as "totalUpload"
+                COALESCE(SUM(h."upload_bytes"), 0) as "totalUpload",
+                DATE_TRUNC('day', h."created_at") as "date"
             FROM nodes n
-            LEFT JOIN "nodes_usage_history" h ON h."node_uuid" = n.uuid 
+            INNER JOIN "nodes_usage_history" h ON h."node_uuid" = n.uuid 
                 AND h."created_at" >= ${start}
                 AND h."created_at" <= ${end}
-            GROUP BY n.uuid, n.name
+            GROUP BY n.uuid, n.name, DATE_TRUNC('day', h."created_at")
+            ORDER BY "date" ASC
         `;
     }
 }