From 05d85d065fc567104c448adce15131e3e3137a64 Mon Sep 17 00:00:00 2001 From: pavangbhat Date: Tue, 26 Mar 2024 23:28:55 +0530 Subject: [PATCH] renamed functions --- src/handlers/scheduledEventHandler.ts | 18 +++++----- src/tests/handlers/missedRoleHandler.test.ts | 16 ++++----- .../handlers/scheduledEventHandler.test.ts | 28 +++++++-------- src/worker.ts | 34 +++++++++---------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/handlers/scheduledEventHandler.ts b/src/handlers/scheduledEventHandler.ts index fdc92c3..c89e423 100644 --- a/src/handlers/scheduledEventHandler.ts +++ b/src/handlers/scheduledEventHandler.ts @@ -15,7 +15,7 @@ export async function ping(env: env) { return response; } -export async function callDiscordNicknameBatchUpdate(env: env) { +export async function callDiscordNicknameBatchUpdateHandler(env: env) { const namespace = env[NAMESPACE_NAME] as unknown as KVNamespace; let lastNicknameUpdate: string | null = '0'; try { @@ -64,7 +64,7 @@ export async function callDiscordNicknameBatchUpdate(env: env) { return data; } -export const addMissedUpdatesRole = async (env: env) => { +export const addMissedUpdatesRoleHandler = async (env: env) => { const MAX_ROLE_UPDATE = 25; try { let cursor: string | undefined = undefined; @@ -96,30 +96,30 @@ export const addMissedUpdatesRole = async (env: env) => { } }; -export const syncUsersStatus = async (env: env) => { +export const syncUsersStatusHandler = async (env: env) => { fireAndForgetApiCall(env, 'users/status/sync', 'PATCH'); }; -export const syncExternalAccounts = async (env: env) => { +export const syncExternalAccountsHandler = async (env: env) => { fireAndForgetApiCall(env, 'external-accounts/users?action=discord-users-sync', 'POST'); }; -export const syncUnverifiedUsers = async (env: env) => { +export const syncUnverifiedUsersHandler = async (env: env) => { fireAndForgetApiCall(env, 'users', 'POST'); }; -export const syncIdleUsers = async (env: env) => { +export const syncIdleUsersHandler = async (env: env) => { fireAndForgetApiCall(env, 'discord-actions/group-idle', 'PUT'); }; -export const syncNickNames = async (env: env) => { +export const syncNickNamesHandler = async (env: env) => { fireAndForgetApiCall(env, 'discord-actions/nicknames/sync?dev=true', 'POST'); }; -export const syncIdle7dUsers = async (env: env) => { +export const syncIdle7dUsersHandler = async (env: env) => { fireAndForgetApiCall(env, 'discord-actions/group-idle-7d', 'PUT'); }; -export const syncOnboarding31dPlusUsers = async (env: env) => { +export const syncOnboarding31dPlusUsersHandler = async (env: env) => { fireAndForgetApiCall(env, 'discord-actions/group-onboarding-31d-plus', 'PUT'); }; diff --git a/src/tests/handlers/missedRoleHandler.test.ts b/src/tests/handlers/missedRoleHandler.test.ts index 0052c37..c8d6fb4 100644 --- a/src/tests/handlers/missedRoleHandler.test.ts +++ b/src/tests/handlers/missedRoleHandler.test.ts @@ -1,4 +1,4 @@ -import { addMissedUpdatesRole } from '../../handlers/scheduledEventHandler'; +import { addMissedUpdatesRoleHandler } from '../../handlers/scheduledEventHandler'; import { updateUserRoles } from '../../services/discordBotServices'; import { getMissedUpdatesUsers } from '../../services/rdsBackendService'; import { @@ -13,7 +13,7 @@ jest.mock('.../../../../services/rdsBackendService', () => ({ jest.mock('.../../../../services/discordBotServices', () => ({ updateUserRoles: jest.fn(), })); -describe('addMissedUpdatesRole', () => { +describe('addMissedUpdatesRoleHandler', () => { beforeEach(() => { jest.resetAllMocks(); }); @@ -25,7 +25,7 @@ describe('addMissedUpdatesRole', () => { (getMissedUpdatesUsers as jest.Mock) .mockResolvedValueOnce(missedUpdatesUsersMock) .mockResolvedValueOnce(missedUpdatesUsersMockWithoutCursor); - await addMissedUpdatesRole({}); + await addMissedUpdatesRoleHandler({}); expect(getMissedUpdatesUsers).toHaveBeenCalledTimes(2); expect(updateUserRoles).toHaveBeenCalledTimes(2); }); @@ -34,7 +34,7 @@ describe('addMissedUpdatesRole', () => { const usersMockData = { ...missedUpdatesUsersMockWithoutCursor }; usersMockData.usersToAddRole = usersMockData.usersToAddRole.slice(0, 1); (getMissedUpdatesUsers as jest.Mock).mockResolvedValueOnce(usersMockData); - await addMissedUpdatesRole({}); + await addMissedUpdatesRoleHandler({}); expect(getMissedUpdatesUsers).toHaveBeenCalledTimes(1); expect(updateUserRoles).toHaveBeenCalledTimes(1); }); @@ -42,7 +42,7 @@ describe('addMissedUpdatesRole', () => { it('should not call updateUserRoles when there are no users to add role', async () => { (getMissedUpdatesUsers as jest.Mock).mockResolvedValueOnce(missedUpdatesUsersMockWithNoUsers); - await addMissedUpdatesRole({}); + await addMissedUpdatesRoleHandler({}); expect(getMissedUpdatesUsers).toHaveBeenCalledTimes(1); expect(updateUserRoles).toHaveBeenCalledTimes(0); }); @@ -51,7 +51,7 @@ describe('addMissedUpdatesRole', () => { const mockValue: any = { ...missedUpdatesUsersMockWithoutCursor, usersToAddRole: new Array(75).fill('id') }; (getMissedUpdatesUsers as jest.Mock).mockResolvedValueOnce(mockValue); - await addMissedUpdatesRole({}); + await addMissedUpdatesRoleHandler({}); expect(getMissedUpdatesUsers).toHaveBeenCalledTimes(1); expect(updateUserRoles).toHaveBeenCalledTimes(3); }); @@ -59,7 +59,7 @@ describe('addMissedUpdatesRole', () => { it('should handle errors', async () => { (getMissedUpdatesUsers as jest.Mock).mockRejectedValueOnce(new Error('Error fetching missed updates users')); const consoleSpy = jest.spyOn(console, 'error'); - await addMissedUpdatesRole({}); + await addMissedUpdatesRoleHandler({}); expect(consoleSpy).toHaveBeenCalledWith('Error while adding missed updates roles'); }); @@ -68,7 +68,7 @@ describe('addMissedUpdatesRole', () => { const consoleSpy = jest.spyOn(console, 'error'); const mockValue: any = { ...missedUpdatesUsersMockWithoutCursor, usersToAddRole: new Array(75).fill('id') }; (getMissedUpdatesUsers as jest.Mock).mockResolvedValueOnce(mockValue); - await addMissedUpdatesRole({}); + await addMissedUpdatesRoleHandler({}); expect(getMissedUpdatesUsers).toHaveBeenCalledTimes(1); expect(consoleSpy).toHaveBeenCalledTimes(1); expect(updateUserRoles).toHaveBeenCalledTimes(3); diff --git a/src/tests/handlers/scheduledEventHandler.test.ts b/src/tests/handlers/scheduledEventHandler.test.ts index e29e2eb..597df14 100644 --- a/src/tests/handlers/scheduledEventHandler.test.ts +++ b/src/tests/handlers/scheduledEventHandler.test.ts @@ -1,11 +1,11 @@ import { - syncExternalAccounts, - syncIdle7dUsers, - syncIdleUsers, - syncNickNames, - syncOnboarding31dPlusUsers, - syncUnverifiedUsers, - syncUsersStatus, + syncExternalAccountsHandler, + syncIdle7dUsersHandler, + syncIdleUsersHandler, + syncNickNamesHandler, + syncOnboarding31dPlusUsersHandler, + syncUnverifiedUsersHandler, + syncUsersStatusHandler, } from '../../handlers/scheduledEventHandler'; import { env } from '../../types/global.types'; import * as apiCallerModule from '../../utils/apiCaller'; @@ -37,30 +37,30 @@ describe('sync apis', () => { }; it('should sync users status', async () => { - testSyncFunction(syncUsersStatus, 'users/status/sync', 'PATCH'); + testSyncFunction(syncUsersStatusHandler, 'users/status/sync', 'PATCH'); }); it('should sync unverified users', async () => { - testSyncFunction(syncUnverifiedUsers, 'users', 'POST'); + testSyncFunction(syncUnverifiedUsersHandler, 'users', 'POST'); }); it('should sync idle users', async () => { - testSyncFunction(syncIdleUsers, 'discord-actions/group-idle', 'PUT'); + testSyncFunction(syncIdleUsersHandler, 'discord-actions/group-idle', 'PUT'); }); it('should sync external accounts', async () => { - testSyncFunction(syncExternalAccounts, 'external-accounts/users?action=discord-users-sync', 'POST'); + testSyncFunction(syncExternalAccountsHandler, 'external-accounts/users?action=discord-users-sync', 'POST'); }); it('should sync nicknames', async () => { - testSyncFunction(syncNickNames, 'discord-actions/nicknames/sync?dev=true', 'POST'); + testSyncFunction(syncNickNamesHandler, 'discord-actions/nicknames/sync?dev=true', 'POST'); }); it('should sync idle 7d users', async () => { - testSyncFunction(syncIdle7dUsers, 'discord-actions/group-idle-7d', 'PUT'); + testSyncFunction(syncIdle7dUsersHandler, 'discord-actions/group-idle-7d', 'PUT'); }); it('should sync onboarding 31d+ users', async () => { - testSyncFunction(syncOnboarding31dPlusUsers, 'discord-actions/group-onboarding-31d-plus', 'PUT'); + testSyncFunction(syncOnboarding31dPlusUsersHandler, 'discord-actions/group-onboarding-31d-plus', 'PUT'); }); }); diff --git a/src/worker.ts b/src/worker.ts index fc079cc..d40c37e 100644 --- a/src/worker.ts +++ b/src/worker.ts @@ -1,12 +1,12 @@ import { - addMissedUpdatesRole, - callDiscordNicknameBatchUpdate, - syncExternalAccounts, - syncIdle7dUsers, - syncIdleUsers, - syncOnboarding31dPlusUsers, - syncUnverifiedUsers, - syncUsersStatus, + addMissedUpdatesRoleHandler, + callDiscordNicknameBatchUpdateHandler, + syncExternalAccountsHandler, + syncIdle7dUsersHandler, + syncIdleUsersHandler, + syncOnboarding31dPlusUsersHandler, + syncUnverifiedUsersHandler, + syncUsersStatusHandler, } from './handlers/scheduledEventHandler'; import { env } from './types/global.types'; @@ -18,19 +18,19 @@ export default { async scheduled(req: ScheduledController, env: env, ctx: ExecutionContext) { switch (req.cron) { case EVERY_11_HOURS: { - callDiscordNicknameBatchUpdate(env); - addMissedUpdatesRole(env); + callDiscordNicknameBatchUpdateHandler(env); + addMissedUpdatesRoleHandler(env); break; } case EVERY_20_MINUTES: { - syncIdleUsers(env); - // syncNickNames(env); TODO: Enable it once changes from website-backend is merged - syncIdle7dUsers(env); - syncOnboarding31dPlusUsers(env); - syncUsersStatus(env); - syncExternalAccounts(env); - syncUnverifiedUsers(env); + syncIdleUsersHandler(env); + // syncNickNamesHandler(env); TODO: Enable it once changes from website-backend is merged + syncIdle7dUsersHandler(env); + syncOnboarding31dPlusUsersHandler(env); + syncUsersStatusHandler(env); + syncExternalAccountsHandler(env); + syncUnverifiedUsersHandler(env); console.log(`Worker for syncing idle users, nicknames, idle 7d users, and onboarding 31d+ users has completed. Worker for syncing user status, external accounts, and unverified users has completed.`); break;