refactor: make projectId be a number in ActivityLogQueryParameters ty…

…pe gf-504
BinaryStudioAcademy · Sep 26, 2024 · daf3498 · daf3498
1 parent 3e14e24
commit daf3498
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/apps/backend/src/modules/activity-logs/activity-log.controller.ts b/apps/backend/src/modules/activity-logs/activity-log.controller.ts
@@ -168,8 +168,17 @@ class ActivityLogController extends BaseController {
 			query: ActivityLogQueryParameters;
 		}>,
 	): Promise<APIHandlerResponse> {
+		const { contributorName, endDate, projectId, startDate } = options.query;
+
+		const query = {
+			endDate,
+			startDate,
+			...(contributorName ? { contributorName } : {}),
+			...(projectId ? { projectId: Number(projectId) } : {}),
+		};
+
 		return {
-			payload: await this.activityLogService.findAll(options.query),
+			payload: await this.activityLogService.findAll(query),
 			status: HTTPCode.OK,
 		};
 	}

diff --git a/apps/backend/src/modules/activity-logs/activity-log.service.ts b/apps/backend/src/modules/activity-logs/activity-log.service.ts
@@ -165,7 +165,7 @@ class ActivityLogService implements Service {
 
 		const allContributors = await this.contributorService.findAll({
 			contributorName,
-			projectId: projectId ? Number(projectId) : undefined,
+			projectId,
 		});
 
 		const dateRange = getDateRange(formattedStartDate, formattedEndDate);

diff --git a/apps/frontend/src/modules/activity/activity-logs-api.ts b/apps/frontend/src/modules/activity/activity-logs-api.ts
@@ -29,7 +29,7 @@ class ActivityLogApi extends BaseHTTPApi {
 			...(contributorName ? { contributorName } : {}),
 			endDate,
 			startDate,
-			...(projectId ? { projectId } : {}),
+			...(projectId ? { projectId: String(projectId) } : {}),
 		};
 
 		const response = await this.load(

diff --git a/apps/frontend/src/modules/projects/slices/actions.ts b/apps/frontend/src/modules/projects/slices/actions.ts
@@ -106,7 +106,7 @@ const loadAllContributorsByProjectId = createAsyncThunk<
 		void dispatch(
 			loadAllContributorsActivityByProjectId({
 				endDate,
-				projectId: String(projectId),
+				projectId,
 				startDate,
 			}),
 		);

diff --git a/apps/frontend/src/pages/analytics/analytics.tsx b/apps/frontend/src/pages/analytics/analytics.tsx
@@ -94,7 +94,7 @@ const Analytics = (): JSX.Element => {
 				activityLogActions.loadAll({
 					contributorName: search,
 					endDate: formattedEndDate,
-					projectId: projectId?.toString() ?? undefined,
+					projectId: projectId ?? undefined,
 					startDate: formattedStartDate,
 				}),
 			);

diff --git a/packages/shared/src/modules/activity-logs/libs/types/activity-log-query-parameters.type.ts b/packages/shared/src/modules/activity-logs/libs/types/activity-log-query-parameters.type.ts
@@ -1,7 +1,7 @@
 type ActivityLogQueryParameters = {
 	contributorName?: string | undefined;
 	endDate: string;
-	projectId?: string | undefined;
+	projectId?: number | undefined;
 	startDate: string;
 };
 

diff --git a/...d/src/modules/activity-logs/libs/validation-schemas/activity-log-get.validation-schema.ts b/...d/src/modules/activity-logs/libs/validation-schemas/activity-log-get.validation-schema.ts
@@ -7,7 +7,6 @@ const activityLogGet: z.ZodType<ActivityLogQueryParameters> = z.object({
 	endDate: z.string({
 		required_error: ActivityLogValidationMessage.END_DATE_REQUIRED,
 	}),
-	projectId: z.string().optional(),
 	startDate: z.string({
 		required_error: ActivityLogValidationMessage.START_DATE_REQUIRED,
 	}),