Address greptile comments

backend/src/server/routes/v1/admin-router.ts

@@ -863,13 +863,6 @@ export const registerAdminRouter = async (server: FastifyZodProvider) => {
       });
     },
     handler: async () => {
-      const cfg = getConfig();
-      if (!cfg.LICENSE_KEY_OFFLINE) {
-        throw new BadRequestError({
-          message: "Offline usage reports are not enabled. LICENSE_KEY_OFFLINE must be configured."
-        });
-      }
-
       const result = await server.services.offlineUsageReport.generateUsageReportCSV();
 
       return {

backend/src/services/offline-usage-report/offline-usage-report-dal.ts

@@ -104,17 +104,21 @@ export const offlineUsageReportDALFactory = (db: TDbClient) => {
 
     // Calculate average secrets per project
     const secretsPerProject = (await db
-      .from(TableName.SecretV2)
-      .select("folderId")
-      .count("* as count")
-      .groupBy("folderId")) as Array<{ folderId: string; count: string }>;
+      .from(`${TableName.SecretV2} as s`)
+      .select("p.id as projectId")
+      .count("s.id as count")
+      .leftJoin(`${TableName.SecretFolder} as sf`, "s.folderId", "sf.id")
+      .leftJoin(`${TableName.Environment} as e`, "sf.envId", "e.id")
+      .leftJoin(`${TableName.Project} as p`, "e.projectId", "p.id")
+      .groupBy("p.id")
+      .whereNotNull("p.id")) as Array<{ projectId: string; count: string }>;
 
     const averageSecretsPerProject =
-      totalProjects > 0
+      secretsPerProject.length > 0
         ? secretsPerProject.reduce(
-            (sum, row: { folderId: string; count: string }) => sum + parseInt(row.count, 10),
+            (sum, row: { projectId: string; count: string }) => sum + parseInt(row.count, 10),
             0
-          ) / totalProjects
+          ) / secretsPerProject.length
         : 0;
 
     return {

backend/src/services/offline-usage-report/offline-usage-report-service.ts

@@ -58,8 +58,6 @@ export const offlineUsageReportServiceFactory = ({
       offlineUsageReportDAL.getSecretRotationMetrics()
     ]);
 
-    const csvLines: string[] = [];
-
     const headers = [
       "Total Users",
       "Admin Users",
@@ -89,8 +87,6 @@ export const offlineUsageReportServiceFactory = ({
 
     headers.push("Signature");
 
-    csvLines.push(headers.slice(0, -1).join(","));
-
     const dataRow: (string | number)[] = [
       userMetrics.totalUsers,
       userMetrics.adminUsers,
@@ -114,14 +110,13 @@ export const offlineUsageReportServiceFactory = ({
       dataRow.push(projectMetrics.projectsByType[type] || 0);
     });
 
-    const tempCsvLines = [headers.slice(0, -1).join(","), dataRow.join(",")];
-    const contentWithoutSignature = tempCsvLines.join("\n");
+    const headersWithoutSignature = headers.slice(0, -1);
+    const contentWithoutSignature = [headersWithoutSignature.join(","), dataRow.join(",")].join("\n");
 
     const signature = signReportContent(contentWithoutSignature, licenseId);
     dataRow.push(signature);
 
-    const finalCsvLines = [headers.join(","), dataRow.join(",")];
-    const csvContent = finalCsvLines.join("\n");
+    const csvContent = [headers.join(","), dataRow.join(",")].join("\n");
 
     return {
       csvContent,