Skip to content

Commit fe9089c

Browse files
authored
Merge pull request RealDevSquad#155 from Real-Dev-Squad/fixing/auto-fetch-overdue
Fixing auto fetch over due tasks
2 parents f2b1f76 + 47cbd92 commit fe9089c

File tree

5 files changed

+15
-20
lines changed

5 files changed

+15
-20
lines changed

src/handlers/scheduledEventHandler.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ export async function send(env: env): Promise<void> {
2929
}
3030
});
3131

32-
if (
33-
assigneeIds === error.INTERNAL_SERVER_ERROR ||
34-
discordIds === error.INTERNAL_SERVER_ERROR
35-
) {
36-
throw new Error(error.INTERNAL_SERVER_ERROR);
37-
}
38-
3932
const bodyObj = {
4033
content: stringToBeSent,
4134
};

src/utils/getDiscordIds.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as response from "../constants/responses";
44

55
export const getDiscordIds = async (
66
userIds: string[] | string
7-
): Promise<string[] | string> => {
7+
): Promise<string[]> => {
88
try {
99
const url = `${RDS_BASE_API_URL}/users/userId`;
1010

@@ -65,6 +65,7 @@ export const getDiscordIds = async (
6565

6666
return discordIds;
6767
} catch (e) {
68-
return response.INTERNAL_SERVER_ERROR;
68+
console.log(e);
69+
throw e;
6970
}
7071
};

src/utils/taskOverDueDiscordMembers.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export const taskOverDueDiscordMembers = async (): Promise<
2020

2121
return assigneeIds;
2222
} catch (e) {
23-
return errors.INTERNAL_SERVER_ERROR;
23+
console.log(e);
24+
throw e;
2425
}
2526
};

tests/unit/utils/getDiscordIds.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ describe("getDiscordIds()", () => {
3939
.spyOn(global, "fetch")
4040
.mockRejectedValueOnce(new Error("Network error"));
4141

42-
const result = await getDiscordIds([userBackendMock.user.id]);
43-
44-
expect(result).toEqual(
45-
"Oops! We have encountered an internal Server Error"
46-
);
42+
try {
43+
await getDiscordIds([userBackendMock.user.id]);
44+
} catch (error: any) {
45+
expect(error.message).toEqual("Network error");
46+
}
4747

4848
expect(global.fetch).toHaveBeenCalledWith(
4949
`${RDS_BASE_API_URL}/users/userId/${userBackendMock.user.id}`

tests/unit/utils/taskOverDueDiscordMembers.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ describe("taskOverDueDiscordMembers()", () => {
2727
.spyOn(global, "fetch")
2828
.mockRejectedValueOnce(new Error("Network error"));
2929

30-
const result = await taskOverDueDiscordMembers();
31-
32-
expect(result).toEqual(
33-
"Oops! We have encountered an internal Server Error"
34-
);
30+
try {
31+
await taskOverDueDiscordMembers();
32+
} catch (error: any) {
33+
expect(error.message).toEqual("Network error");
34+
}
3535

3636
expect(global.fetch).toHaveBeenCalledWith(
3737
`${RDS_BASE_API_URL}/tasks?dev=true&status=overdue&size=100`

0 commit comments

Comments
 (0)