From 271d757b62abfafd95015acca783425a899bc99d Mon Sep 17 00:00:00 2001 From: Mehul Kiran Chaudhari <55375534+MehulKChaudhari@users.noreply.github.com> Date: Wed, 14 Aug 2024 02:01:52 +0530 Subject: [PATCH] Revert "Feat: Add a cron job to hit the filter orphan tasks API every 6hours" --- src/handlers/scheduledEventHandler.ts | 56 +-------------------------- src/types/global.types.ts | 7 ---- src/worker.ts | 6 +-- 3 files changed, 2 insertions(+), 67 deletions(-) diff --git a/src/handlers/scheduledEventHandler.ts b/src/handlers/scheduledEventHandler.ts index c75c5e0..5dad138 100644 --- a/src/handlers/scheduledEventHandler.ts +++ b/src/handlers/scheduledEventHandler.ts @@ -4,13 +4,7 @@ import config from '../config/config'; import { NAMESPACE_NAME } from '../constants'; import { updateUserRoles } from '../services/discordBotServices'; import { getMissedUpdatesUsers } from '../services/rdsBackendService'; -import { - DiscordUserRole, - env, - NicknameUpdateResponseType, - OrphanTasksStatusUpdateResponseType, - UserStatusResponse, -} from '../types/global.types'; +import { DiscordUserRole, env, NicknameUpdateResponseType, UserStatusResponse } from '../types/global.types'; import { apiCaller } from '../utils/apiCaller'; import { chunks } from '../utils/arrayUtils'; import { generateJwt } from '../utils/generateJwt'; @@ -147,51 +141,3 @@ export const syncIdle7dUsers = async (env: env) => { export const syncOnboarding31dPlusUsers = async (env: env) => { return await apiCaller(env, 'discord-actions/group-onboarding-31d-plus', 'PUT'); }; - -export async function filterOrphanTasks(env: env) { - const namespace = env[NAMESPACE_NAME] as unknown as KVNamespace; - let lastOrphanTasksFilterationTimestamp: string | null = '0'; // O means it will take the oldest unix timestamp - try { - lastOrphanTasksFilterationTimestamp = await namespace.get('ORPHAN_TASKS_UPDATED_TIME'); - - if (!lastOrphanTasksFilterationTimestamp) { - console.log(`Empty KV ORPHAN_TASKS_UPDATED_TIME: ${lastOrphanTasksFilterationTimestamp}`); - lastOrphanTasksFilterationTimestamp = '0'; // O means it will take the oldest unix timestamp - } - } catch (err) { - console.error(err, 'Error while fetching the timestamp of last orphan tasks filteration'); - throw err; - } - - const url = config(env).RDS_BASE_API_URL; - let token; - try { - token = await generateJwt(env); - } catch (err) { - console.error(`Error while generating JWT token: ${err}`); - throw err; - } - const response = await fetch(`${url}/tasks/orphanTasks`, { - method: 'POST', - headers: { - Authorization: `Bearer ${token}`, - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - lastOrphanTasksFilterationTimestamp, - }), - }); - if (!response.ok) { - throw new Error('Error while trying to update status of orphan tasks to backlog'); - } - - const data: OrphanTasksStatusUpdateResponseType = await response.json(); - - try { - await namespace.put('ORPHAN_TASKS_UPDATED_TIME', Date.now().toString()); - } catch (err) { - console.error('Error while trying to update the last orphan tasks filteration timestamp'); - } - - return data; -} diff --git a/src/types/global.types.ts b/src/types/global.types.ts index 30092db..98a30fa 100644 --- a/src/types/global.types.ts +++ b/src/types/global.types.ts @@ -19,13 +19,6 @@ export type NicknameUpdateResponseType = { unsuccessfulNicknameUpdates: number; }; }; - -export type OrphanTasksStatusUpdateResponseType = { - message: string; - data: { - orphanTasksUpdatedCount: number; - }; -}; export type DiscordUsersResponse = { message: string; data: DiscordUserIdList; diff --git a/src/worker.ts b/src/worker.ts index 467a447..38f5c0a 100644 --- a/src/worker.ts +++ b/src/worker.ts @@ -1,7 +1,6 @@ import { addMissedUpdatesRole, callDiscordNicknameBatchUpdate, - filterOrphanTasks, syncExternalAccounts, syncIdle7dUsers, syncIdleUsers, @@ -21,10 +20,7 @@ export default { async scheduled(req: ScheduledController, env: env, ctx: ExecutionContext) { switch (req.cron) { case EVERY_6_HOURS: { - await callDiscordNicknameBatchUpdate(env); - await filterOrphanTasks(env); - console.log('Worker for filtering the orphan tasks has completed'); - break; + return await callDiscordNicknameBatchUpdate(env); } case EVERY_11_HOURS: { return await addMissedUpdatesRole(env);