feat: upload statistics for the last week on each run gf-600

scripts/analytics/src/libs/modules/git-service/base-git-service.module.ts

@@ -5,8 +5,8 @@ class BaseGITService implements GITService {
 		return "git fetch";
 	};
 
-	public getShortLogCommand = (since: string): string => {
-		return `git shortlog -sne --all --no-merges --since="${since}"`;
+	public getShortLogCommand = (): string => {
+		return "git shortlog -sne --all --no-merges --group='%cs %cn <%ce>' --since='1 week ago'";
 	};
 }
 

scripts/analytics/src/libs/modules/git-service/libs/types/git-service.type.ts

@@ -1,6 +1,6 @@
 type GITService = {
 	getFetchCommand: () => string;
-	getShortLogCommand: (since: string) => string;
+	getShortLogCommand: () => string;
 };
 
 export { type GITService };

scripts/analytics/src/modules/analytics/analytics.service.ts

@@ -1,6 +1,6 @@
 import fs from "node:fs/promises";
 
-import { executeCommand, formatDate } from "~/libs/helpers/helpers.js";
+import { executeCommand } from "~/libs/helpers/helpers.js";
 import { type GITService } from "~/libs/modules/git-service/git-service.js";
 import { logger } from "~/libs/modules/logger/logger.js";
 import { type AnalyticsScriptConfig } from "~/libs/types/types.js";
@@ -12,10 +12,7 @@ import {
 	FIRST_ARRAY_INDEX,
 } from "./libs/constants/constants.js";
 import { mergeStats } from "./libs/helpers/helpers.js";
-import {
-	type ActivityLogCreateItemRequestDto,
-	type CommitStatistics,
-} from "./libs/types/types.js";
+import { type ActivityLogCreateItemRequestDto } from "./libs/types/types.js";
 
 type Constructor = {
 	analyticsApi: typeof analyticsApi;
@@ -37,22 +34,34 @@ class AnalyticsService {
 	private async collectStatsByRepository(
 		repoPath: string,
 	): Promise<ActivityLogCreateItemRequestDto[]> {
-		const stats: ActivityLogCreateItemRequestDto[] = [];
+		const statsByDate = new Map<string, ActivityLogCreateItemRequestDto>();
 		const shortLogResult = await executeCommand(
-			this.gitService.getShortLogCommand("midnight"),
+			this.gitService.getShortLogCommand(),
 			repoPath,
 		);
 
-		const commitItems: CommitStatistics[] = [];
 		let match;
 
 		while (
 			(match = COMMIT_REGEX.exec(shortLogResult.stdout.toString())) !== null
 		) {
-			const [, commitsNumber, authorName, authorEmail] = match;
+			const [, commitsNumber, commitDate, authorName, authorEmail] = match;
+
+			if (!commitDate) {
+				logger.error("Invalid data from git log.");
+
+				continue;
+			}
+
+			let statsForCommitDate = statsByDate.get(commitDate);
+
+			if (!statsForCommitDate) {
+				statsForCommitDate = { date: commitDate, items: [] };
+				statsByDate.set(commitDate, statsForCommitDate);
+			}
 
 			if (commitsNumber && authorName && authorEmail) {
-				commitItems.push({
+				statsForCommitDate.items.push({
 					authorEmail,
 					authorName,
 					commitsNumber: Number.parseInt(commitsNumber, 10),
@@ -62,12 +71,7 @@ class AnalyticsService {
 			}
 		}
 
-		stats.push({
-			date: formatDate(new Date(), "yyyy-MM-dd"),
-			items: commitItems,
-		});
-
-		return stats;
+		return [...statsByDate.values()];
 	}
 
 	private async fetchRepository(repoPath: string): Promise<void> {

scripts/analytics/src/modules/analytics/libs/constants/commit-regex.constant.ts

@@ -1,3 +1,3 @@
-const COMMIT_REGEX = /^\s*(\d+)\s+(.+?)\s+<(.+?)>/gm;
+const COMMIT_REGEX = /^\s*(\d+)\s+(\d{4}-\d{2}-\d{2})\s+(.+?)\s+<(.+?)>/gm;
 
 export { COMMIT_REGEX };

scripts/analytics/src/modules/analytics/libs/types/types.ts

@@ -1,4 +1,3 @@
-export { type CommitStatistics } from "./commit-statistics.type.js";
 export {
 	type ActivityLogCreateItemRequestDto,
 	type ActivityLogCreateRequestDto,