(cleanup) move clear api traces into own file

Author: akshay288

backend/src/jobs.ts

@@ -4,6 +4,7 @@ import { AppDataSource } from "data-source"
 import { JobsService } from "services/jobs"
 import runAllTests from "services/testing/runAllTests"
 import { logAggregatedStats } from "services/logging"
+import clearApiTraces from "services/jobs/clearApiTraces"
 
 const main = async () => {
   const datasource = await AppDataSource.initialize()
@@ -70,7 +71,7 @@ const main = async () => {
   schedule.scheduleJob("0 * * * *", () => {
     clearApiTracesSem.take(async () => {
       console.log("\nClearing Api Trace data...")
-      await JobsService.clearApiTraces()
+      await clearApiTraces()
       console.log("Finished clearing Api Trace data.")
       clearApiTracesSem.leave()
     })

backend/src/services/jobs/clearApiTraces.ts

@@ -0,0 +1,48 @@
+import { DateTime } from "luxon"
+import { ApiTrace } from "models"
+import { AppDataSource } from "data-source"
+import {
+  aggregateTracesDataHourlyQuery,
+  aggregateTracesDataMinutelyQuery,
+} from "./queries"
+
+const clearApiTraces = async (): Promise<void> => {
+  const queryRunner = AppDataSource.createQueryRunner()
+  await queryRunner.connect()
+  try {
+    const now = DateTime.now().startOf("hour")
+    const oneHourAgo = now.minus({ hours: 1 }).toJSDate()
+
+    const maxTimeRes = await queryRunner.manager
+      .createQueryBuilder()
+      .select([`MAX("createdAt") as "maxTime"`])
+      .from(ApiTrace, "traces")
+      .where('"apiEndpointUuid" IS NOT NULL')
+      .andWhere("analyzed = TRUE")
+      .andWhere('"createdAt" < :oneHourAgo', { oneHourAgo })
+      .getRawOne()
+    const maxTime: Date = maxTimeRes?.maxTime ?? null
+
+    if (maxTime) {
+      await queryRunner.startTransaction()
+      await queryRunner.query(aggregateTracesDataMinutelyQuery, [maxTime])
+      await queryRunner.query(aggregateTracesDataHourlyQuery, [maxTime])
+      await queryRunner.manager
+        .createQueryBuilder()
+        .delete()
+        .from(ApiTrace)
+        .where('"apiEndpointUuid" IS NOT NULL')
+        .andWhere("analyzed = TRUE")
+        .andWhere('"createdAt" <= :maxTime', { maxTime })
+        .execute()
+      await queryRunner.commitTransaction()
+    }
+  } catch (err) {
+    console.error(`Encountered error while clearing trace data: ${err}`)
+    await queryRunner.rollbackTransaction()
+  } finally {
+    await queryRunner?.release()
+  }
+}
+
+export default clearApiTraces

backend/src/services/jobs/index.ts

@@ -1,6 +1,5 @@
 import { FindManyOptions, IsNull, LessThanOrEqual, Raw } from "typeorm"
 import { v4 as uuidv4 } from "uuid"
-import { DateTime } from "luxon"
 import {
   getDataType,
   isParameter,
@@ -27,8 +26,6 @@ import { DatabaseService } from "services/database"
 import axios from "axios"
 import { SpecService } from "services/spec"
 import {
-  aggregateTracesDataHourlyQuery,
-  aggregateTracesDataMinutelyQuery,
   getUnauthenticatedEndpointsSensitiveData,
   updateUnauthenticatedEndpoints,
 } from "./queries"
@@ -289,45 +286,6 @@ export class JobsService {
     }
   }
 
-  static async clearApiTraces(): Promise<void> {
-    const queryRunner = AppDataSource.createQueryRunner()
-    await queryRunner.connect()
-    try {
-      const now = DateTime.now().startOf("hour")
-      const oneHourAgo = now.minus({ hours: 1 }).toJSDate()
-
-      const maxTimeRes = await queryRunner.manager
-        .createQueryBuilder()
-        .select([`MAX("createdAt") as "maxTime"`])
-        .from(ApiTrace, "traces")
-        .where('"apiEndpointUuid" IS NOT NULL')
-        .andWhere("analyzed = TRUE")
-        .andWhere('"createdAt" < :oneHourAgo', { oneHourAgo })
-        .getRawOne()
-      const maxTime: Date = maxTimeRes?.maxTime ?? null
-
-      if (maxTime) {
-        await queryRunner.startTransaction()
-        await queryRunner.query(aggregateTracesDataMinutelyQuery, [maxTime])
-        await queryRunner.query(aggregateTracesDataHourlyQuery, [maxTime])
-        await queryRunner.manager
-          .createQueryBuilder()
-          .delete()
-          .from(ApiTrace)
-          .where('"apiEndpointUuid" IS NOT NULL')
-          .andWhere("analyzed = TRUE")
-          .andWhere('"createdAt" <= :maxTime', { maxTime })
-          .execute()
-        await queryRunner.commitTransaction()
-      }
-    } catch (err) {
-      console.error(`Encountered error while clearing trace data: ${err}`)
-      await queryRunner.rollbackTransaction()
-    } finally {
-      await queryRunner?.release()
-    }
-  }
-
   static async generateEndpointsFromTraces(): Promise<void> {
     const queryRunner = AppDataSource.createQueryRunner()
     await queryRunner.connect()