apps/web/app/interfaces/activity/IActivityReport.ts (2)

54-54: Consider using string literal unions for better type safety.

The properties payPeriod and employeeLevel could benefit from more specific type definitions.

-    payPeriod: 'NONE' | 'TWICE_PER_MONTH';
+    payPeriod: PayPeriodType;
-    employeeLevel: 'A' | 'B' | 'C';
+    employeeLevel: EmployeeLevelType;

+export type PayPeriodType = 'NONE' | 'TWICE_PER_MONTH';
+export type EmployeeLevelType = 'A' | 'B' | 'C';

Also applies to: 58-58

---

85-85: Add validation for percentage format.

The duration_percentage property is typed as string but should include format validation.

-    duration_percentage: string;
+    duration_percentage: `${number}%`;

apps/web/app/api/timesheet/activity/report/route.ts (1)

73-80: Consider using custom error types for better error handling.

Using custom error types would allow for more specific error handling and responses.

+class ActivityReportError extends Error {
+    constructor(
+        message: string,
+        public statusCode: number = 500
+    ) {
+        super(message);
+        this.name = 'ActivityReportError';
+    }
+}

         return new Response(
             JSON.stringify({
                 message: 'Internal server error',
-                error: error instanceof Error ? error.message : 'Unknown error'
+                error: error instanceof ActivityReportError 
+                    ? error.message 
+                    : 'Unknown error'
             }),

apps/web/app/hooks/features/useReportActivity.ts (2)

217-218: Consider adding error handling for individual promises.

The Promise.all() calls in updateDateRange and updateFilters could fail silently if any individual promise rejects.

Consider handling individual promise failures:

-Promise.all([
-  fetchReportActivity(newProps),
-  fetchDailyReport(newProps),
-  fetchStatisticsCounts(newProps),
-  fetchActivityReport(newProps)
-]).catch(console.error);
+Promise.allSettled([
+  fetchReportActivity(newProps).catch(err => console.error('Failed to fetch report activity:', err)),
+  fetchDailyReport(newProps).catch(err => console.error('Failed to fetch daily report:', err)),
+  fetchStatisticsCounts(newProps).catch(err => console.error('Failed to fetch statistics:', err)),
+  fetchActivityReport(newProps).catch(err => console.error('Failed to fetch activity report:', err))
+]);

Also applies to: 229-230

---

238-243: Consider adding retry logic for initial data fetching.

The initial data fetching in useEffect could benefit from retry logic to handle temporary network issues.

Consider implementing a retry mechanism:

const retryFetch = async (fn: () => Promise<any>, retries = 3, delay = 1000) => {
  try {
    return await fn();
  } catch (error) {
    if (retries > 0) {
      await new Promise(resolve => setTimeout(resolve, delay));
      return retryFetch(fn, retries - 1, delay * 2);
    }
    throw error;
  }
};

// Usage in useEffect
if (user) {
  Promise.allSettled([
    retryFetch(() => fetchReportActivity()),
    retryFetch(() => fetchDailyReport()),
    retryFetch(() => fetchStatisticsCounts()),
    retryFetch(() => fetchActivityReport())
  ]).catch(console.error);
}

apps/web/app/services/client/api/timer/timer-log.ts (1)

369-415: Add input validation and consider using a type-safe query builder.

The function could benefit from input validation and a more type-safe approach to query building.

Consider these improvements:

// Add input validation
if (!organizationId || !tenantId || !startDate || !endDate) {
  throw new Error('Required parameters missing: organizationId, tenantId, startDate, and endDate are required');
}

// Validate activity level range
if (activityLevel.start < 0 || activityLevel.end > 100 || activityLevel.start >= activityLevel.end) {
  throw new Error('Invalid activity level range');
}

// Use a type-safe query builder
const queryParams = {
  activityLevel,
  organizationId,
  tenantId,
  startDate: startDate instanceof Date ? startDate.toISOString() : startDate,
  endDate: endDate instanceof Date ? endDate.toISOString() : endDate,
  timeZone,
  groupBy,
  ...(projectIds?.length > 0 && { projectIds }),
  ...(employeeIds?.length > 0 && { employeeIds }),
  ...(source?.length > 0 && { source }),
  ...(logType?.length > 0 && { logType })
};

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro