From 1433b5b842e7d97cabc991683681c2563d624b43 Mon Sep 17 00:00:00 2001 From: Derek Date: Sun, 1 Nov 2026 22:30:51 -0500 Subject: [PATCH 1/3] DINO-1082: add discord announcement route and admin ui button --- js/src/app/admin/_components/AdminIndex.tsx | 4 + .../NewDiscordAnnouncementModal.tsx | 73 +++++++++++++++++++ js/src/lib/api/queries/admin/index.ts | 35 +++++++++ js/src/lib/api/schema/admin/index.ts | 4 + .../codebloom/api/admin/AdminController.java | 22 ++++++ .../jda/CreateDiscordAnnouncementBody.java | 17 +++++ .../common/components/DiscordClubManager.java | 32 ++++++++ .../api/admin/AdminControllerTest.java | 37 ++++++++++ 8 files changed, 224 insertions(+) create mode 100644 js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx create mode 100644 src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java diff --git a/js/src/app/admin/_components/AdminIndex.tsx b/js/src/app/admin/_components/AdminIndex.tsx index 6a040509c..52d81224f 100644 --- a/js/src/app/admin/_components/AdminIndex.tsx +++ b/js/src/app/admin/_components/AdminIndex.tsx @@ -1,5 +1,6 @@ import DeleteAnnouncementButton from "@/app/admin/_components/announcements/DeleteAnnouncementButton"; import NewAnnouncementModal from "@/app/admin/_components/announcements/NewAnnouncementModal"; +import NewDiscordAnnouncementModal from "@/app/admin/_components/announcements/NewDiscordAnnouncementModal"; import IncompleteQuestionList from "@/app/admin/_components/incomplete/IncompleteQuestionList"; import RequeueIncompleteQuestionsModal from "@/app/admin/_components/incomplete/RequeueIncompleteQuestionsModal"; import AllLeaderboardAdmin from "@/app/admin/_components/leaderboards/pagination/AllLeaderboardAdmin"; @@ -19,6 +20,9 @@ export default function AdminIndex() { + + + diff --git a/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx b/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx new file mode 100644 index 000000000..27cb41ea2 --- /dev/null +++ b/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx @@ -0,0 +1,73 @@ +import { useCreateDiscordAnnouncementMutation } from "@/lib/api/queries/admin"; +import { newDiscordAnnouncementSchema } from "@/lib/api/schema/admin"; +import { Button, Modal, TextInput } from "@mantine/core"; +import { useForm } from "@mantine/form"; +import { notifications } from "@mantine/notifications"; +import { zodResolver } from "mantine-form-zod-resolver"; +import { useState } from "react"; +import { z } from "zod"; + +export default function NewDiscordAnnouncementModal() { + const [isModalOpen, setModalOpen] = useState(false); + const { mutate, status } = useCreateDiscordAnnouncementMutation(); + const form = useForm({ + validate: zodResolver(newDiscordAnnouncementSchema), + initialValues: { + message: "", + }, + }); + + const toggleModal = () => { + setModalOpen((prev) => !prev); + }; + + const onSubmit = (data: z.infer) => { + mutate( + { ...data }, + { + onSuccess: async (data) => { + notifications.show({ + message: data.message, + color: data.success ? undefined : "red", + }); + if (data.success) { + form.reset(); + setModalOpen(false); + } + }, + }, + ); + }; + + return ( + <> + + +
+ + + +
+ + ); +} diff --git a/js/src/lib/api/queries/admin/index.ts b/js/src/lib/api/queries/admin/index.ts index 50ba3948d..c69c0483f 100644 --- a/js/src/lib/api/queries/admin/index.ts +++ b/js/src/lib/api/queries/admin/index.ts @@ -254,6 +254,41 @@ async function deleteAnnouncement({ id }: { id: string }) { return res(await response.json()); } +/** + * Creates Discord announcement + */ + +export const useCreateDiscordAnnouncementMutation = () => { + const queryClient = useQueryClient(); + return useMutation({ + mutationFn: createDiscordAnnouncement, + onSuccess: async (data) => { + if (data.success) { + queryClient.invalidateQueries({ + queryKey: ApiURL.prefix("/api/admin/discord/announcement"), + }); + } + }, + }); +}; + +async function createDiscordAnnouncement({ message }: { message: string }) { + const { url, method, req, res } = ApiURL.create( + "/api/admin/discord/announcement/", + { + method: "POST", + }, + ); + const response = await fetch(url, { + method, + body: req({ + message, + }), + }); + + return res(await response.json()); +} + /** * Trigger a refresh of the LeetCode auth token. */ diff --git a/js/src/lib/api/schema/admin/index.ts b/js/src/lib/api/schema/admin/index.ts index ba191f8ef..29678baf0 100644 --- a/js/src/lib/api/schema/admin/index.ts +++ b/js/src/lib/api/schema/admin/index.ts @@ -5,3 +5,7 @@ export const newAnnouncementSchema = z.object({ showTimer: z.boolean(), expiresAt: z.string(), }); + +export const newDiscordAnnouncementSchema = z.object({ + message: z.string().trim().min(1).max(4096), +}); diff --git a/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java b/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java index 3244b17a4..49e3b3a20 100644 --- a/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java +++ b/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Optional; import org.patinanetwork.codebloom.api.admin.body.*; +import org.patinanetwork.codebloom.api.admin.body.jda.CreateDiscordAnnouncementBody; import org.patinanetwork.codebloom.api.admin.body.jda.DeleteMessageBody; import org.patinanetwork.codebloom.common.components.DiscordClubManager; import org.patinanetwork.codebloom.common.components.IncompleteQuestionRequeuer; @@ -322,6 +323,27 @@ public ResponseEntity> deleteDiscordMessage( return ResponseEntity.ok(ApiResponder.success("Discord Message successfully deleted", Empty.of())); } + @Operation( + summary = "Sends announcement to all clubs' discord channels", + description = + "Sends an embedded message to the leaderboard channels of all guilds associated with their clubs. Only accessible to admins.") + @PostMapping("/discord/announcement/") + public ResponseEntity> sendDiscordAnnouncement( + @Valid @RequestBody final CreateDiscordAnnouncementBody createDiscordAnnouncementBody, + @Protected(admin = true) final AuthenticationObject authenticationObject) { + + boolean allSent = + discordClubManager.sendAnnouncementDiscordMessageToAllClubs(createDiscordAnnouncementBody.getMessage()); + + if (!allSent) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(ApiResponder.failure( + "Announcement failed to send to one or more clubs. Check logs for details.")); + } + + return ResponseEntity.ok(ApiResponder.success("Announcement successfully sent to all clubs!", Empty.of())); + } + @Operation( summary = "Refresh LeetCode auth token", description = diff --git a/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java b/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java new file mode 100644 index 000000000..a1a263bf2 --- /dev/null +++ b/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java @@ -0,0 +1,17 @@ +package org.patinanetwork.codebloom.api.admin.body.jda; + +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Builder +@AllArgsConstructor +public class CreateDiscordAnnouncementBody { + + @Size(min = 1, max = 4096) + private String message; +} diff --git a/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java b/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java index 5a4b62441..815dc8472 100644 --- a/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java +++ b/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java @@ -364,4 +364,36 @@ public boolean sendTestEmbedMessageToClub(DiscordClub club) { public boolean deleteMessageById(Long channelId, Long messageId) { return jdaClient.deleteMessageById(channelId, messageId); } + + private boolean sendAnnouncementDiscordMessage(final DiscordClub club, final String announcement) { + try { + var guildId = club.getDiscordClubMetadata().flatMap(DiscordClubMetadata::getGuildId); + var channelId = club.getDiscordClubMetadata().flatMap(DiscordClubMetadata::getLeaderboardChannelId); + if (guildId.isEmpty() || channelId.isEmpty()) { + log.warn("Missing guildId or leaderboardChannelId for club {}", club.getId()); + return false; + } + jdaClient.sendEmbedWithImages(EmbeddedImagesMessageOptions.builder() + .guildId(Long.valueOf(guildId.get())) + .channelId(Long.valueOf(channelId.get())) + .description(announcement) + .title("Announcement for %s".formatted(club.getName())) + .footerText("Codebloom - LeetCode Leaderboard for %s".formatted(club.getName())) + .footerIcon("%s/favicon.ico".formatted(serverUrlUtils.getUrl())) + .color(new Color(69, 129, 103)) + .build()); + } catch (Exception e) { + log.error("Error in DiscordClubManager when sending announcement to club {}", club.getName(), e); + return false; + } + return true; + } + + public boolean sendAnnouncementDiscordMessageToAllClubs(final String announcement) { + var discordClubs = discordClubRepository.getAllActiveDiscordClubs(); + return discordClubs.stream() + .map(club -> sendAnnouncementDiscordMessage(club, announcement)) + .reduce(Boolean::logicalAnd) + .orElse(false); + } } diff --git a/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java b/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java index 24647b32a..34e5abc5f 100644 --- a/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java +++ b/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java @@ -13,6 +13,7 @@ import org.patinanetwork.codebloom.api.admin.body.DeleteAnnouncementBody; import org.patinanetwork.codebloom.api.admin.body.EditLeaderboardBody; import org.patinanetwork.codebloom.api.admin.body.NewLeaderboardBody; +import org.patinanetwork.codebloom.api.admin.body.jda.CreateDiscordAnnouncementBody; import org.patinanetwork.codebloom.api.admin.body.jda.DeleteMessageBody; import org.patinanetwork.codebloom.common.components.DiscordClubManager; import org.patinanetwork.codebloom.common.components.IncompleteQuestionRequeuer; @@ -509,6 +510,42 @@ void testDeleteDiscordMessageSuccess() { assertEquals("Discord Message successfully deleted", response.getBody().getMessage()); } + @Test + void testDiscordAnnouncementFailure() { + when(discordClubManager.sendAnnouncementDiscordMessageToAllClubs((anyString()))) + .thenReturn(false); + + CreateDiscordAnnouncementBody body = CreateDiscordAnnouncementBody.builder() + .message("This is a test announcement.") + .build(); + + ResponseEntity> response = adminController.sendDiscordAnnouncement(body, null); + assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode()); + assertNotNull(response.getBody()); + assertFalse(response.getBody().isSuccess()); + assertEquals( + "Announcement failed to send to one or more clubs. Check logs for details.", + response.getBody().getMessage()); + } + + @Test + void testDiscordAnnouncementSuccess() { + when(discordClubManager.sendAnnouncementDiscordMessageToAllClubs((anyString()))) + .thenReturn(true); + + CreateDiscordAnnouncementBody body = CreateDiscordAnnouncementBody.builder() + .message("This is a test announcement.") + .build(); + + ResponseEntity> response = adminController.sendDiscordAnnouncement(body, null); + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertNotNull(response.getBody()); + assertTrue(response.getBody().isSuccess()); + assertEquals( + "Announcement successfully sent to all clubs!", + response.getBody().getMessage()); + } + @Test void testEditCurrentLeaderboardSuccess() { OffsetDateTime date = StandardizedOffsetDateTime.normalize(OffsetDateTime.parse("4096-01-01T00:00:00Z")); From c3888d0eb2180d7dceb557969586248c415cd29d Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 2 Nov 2026 14:12:05 -0500 Subject: [PATCH 2/3] DINO-1082: fix code rabbit suggestions and add frontend backend tests --- js/src/__mock__/admin/index.ts | 49 ++++++++ .../NewDiscordAnnouncementModal.test.tsx | 117 ++++++++++++++++++ .../NewDiscordAnnouncementModal.tsx | 9 +- .../codebloom/api/admin/AdminController.java | 8 +- .../jda/CreateDiscordAnnouncementBody.java | 2 + .../common/components/DiscordClubManager.java | 8 +- .../api/admin/AdminControllerTest.java | 6 +- .../components/DiscordClubManagerTest.java | 54 ++++++++ 8 files changed, 241 insertions(+), 12 deletions(-) create mode 100644 js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.test.tsx diff --git a/js/src/__mock__/admin/index.ts b/js/src/__mock__/admin/index.ts index cc703f723..7eb082127 100644 --- a/js/src/__mock__/admin/index.ts +++ b/js/src/__mock__/admin/index.ts @@ -91,3 +91,52 @@ export const requeueIncompleteFailureHandler = http.post( ); }, ); + +const createDiscordAnnouncement = ApiURL.create( + "/api/admin/discord/announcement/", + { + method: "POST", + }, +); + +export const CREATE_DISCORD_ANNOUNCEMENT_SUCCESS_MESSAGE = + "Announcement sent to all clubs."; +export const CREATE_DISCORD_ANNOUNCEMENT_FAILURE_MESSAGE = + "Failed to send announcement to: Club 1"; +export const CREATE_DISCORD_ANNOUNCEMENT_SERVER_ERROR_MESSAGE = + "Failed to send announcement: server error."; + +export const createDiscordAnnouncementSuccessHandler = http.post( + createDiscordAnnouncement.url.toString(), + () => { + return HttpResponse.json({ + success: true, + payload: {}, + message: CREATE_DISCORD_ANNOUNCEMENT_SUCCESS_MESSAGE, + } satisfies UnknownApiResponse); + }, +); + +// 200 with success: false, which is how the backend reports clubs that failed. +export const createDiscordAnnouncementPartialFailureHandler = http.post( + createDiscordAnnouncement.url.toString(), + () => { + return HttpResponse.json({ + success: false, + message: CREATE_DISCORD_ANNOUNCEMENT_FAILURE_MESSAGE, + }); + }, +); + +export const createDiscordAnnouncementServerErrorHandler = http.post( + createDiscordAnnouncement.url.toString(), + () => { + return HttpResponse.json( + { + success: false, + message: CREATE_DISCORD_ANNOUNCEMENT_SERVER_ERROR_MESSAGE, + }, + { status: 500 }, + ); + }, +); diff --git a/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.test.tsx b/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.test.tsx new file mode 100644 index 000000000..871667722 --- /dev/null +++ b/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.test.tsx @@ -0,0 +1,117 @@ +import { + CREATE_DISCORD_ANNOUNCEMENT_FAILURE_MESSAGE, + CREATE_DISCORD_ANNOUNCEMENT_SUCCESS_MESSAGE, + CREATE_DISCORD_ANNOUNCEMENT_SERVER_ERROR_MESSAGE, + createDiscordAnnouncementPartialFailureHandler, + createDiscordAnnouncementServerErrorHandler, + createDiscordAnnouncementSuccessHandler, +} from "@/__mock__/admin"; +import NewDiscordAnnouncementModal from "@/app/admin/_components/announcements/NewDiscordAnnouncementModal"; +import { TestUtils, TestUtilTypes } from "@/lib/test"; +import { screen, waitFor } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import { setupServer } from "msw/node"; + +describe("NewDiscordAnnouncementModal", () => { + const server = setupServer(createDiscordAnnouncementSuccessHandler); + let requestCount = 0; + let requestBodies: unknown[] = []; + + beforeAll(() => server.listen()); + afterEach(() => server.resetHandlers()); + afterAll(() => server.close()); + + let renderProviderFn: TestUtilTypes.RenderWithAllProvidersFn | null = null; + beforeEach(() => { + renderProviderFn = TestUtils.getRenderWithAllProvidersFn(); + requestCount = 0; + requestBodies = []; + server.events.removeAllListeners(); + server.events.on("request:start", async ({ request }) => { + requestCount++; + requestBodies.push(await request.clone().json()); + }); + }); + + const openModal = async (user: ReturnType) => { + await user.click( + screen.getByRole("button", { name: "New Discord Announcement" }), + ); + return screen.findByRole("textbox", { name: /Announcement message/ }); + }; + + it("should be closed until the button is clicked", async () => { + renderProviderFn?.(); + const user = userEvent.setup(); + + expect(screen.queryByRole("textbox")).not.toBeInTheDocument(); + + expect(await openModal(user)).toBeInTheDocument(); + expect( + screen.getByText("Create new discord announcement"), + ).toBeInTheDocument(); + }); + + it("should not call the API when the message is only whitespace", async () => { + renderProviderFn?.(); + const user = userEvent.setup(); + + const input = await openModal(user); + await user.type(input, " "); + await user.click(screen.getByRole("button", { name: "Submit" })); + + expect(requestCount).toBe(0); + expect(input).toBeInTheDocument(); + }); + + it("should send the trimmed message, notify, close, and clear the field on success", async () => { + renderProviderFn?.(); + const user = userEvent.setup(); + + const input = await openModal(user); + await user.type(input, " big news "); + await user.click(screen.getByRole("button", { name: "Submit" })); + + expect( + await screen.findByText(CREATE_DISCORD_ANNOUNCEMENT_SUCCESS_MESSAGE), + ).toBeInTheDocument(); + expect(requestCount).toBe(1); + expect(requestBodies[0]).toEqual({ message: "big news" }); + await waitFor(() => { + expect(screen.queryByRole("textbox")).not.toBeInTheDocument(); + }); + + expect(await openModal(user)).toHaveValue(""); + }); + + it("should notify and keep the modal open when the API reports failure", async () => { + server.use(createDiscordAnnouncementPartialFailureHandler); + renderProviderFn?.(); + const user = userEvent.setup(); + + const input = await openModal(user); + await user.type(input, "big news"); + await user.click(screen.getByRole("button", { name: "Submit" })); + + expect( + await screen.findByText(CREATE_DISCORD_ANNOUNCEMENT_FAILURE_MESSAGE), + ).toBeInTheDocument(); + expect(input).toBeInTheDocument(); + expect(input).toHaveValue("big news"); + }); + + it("should show the error message when the request fails", async () => { + server.use(createDiscordAnnouncementServerErrorHandler); + renderProviderFn?.(); + const user = userEvent.setup(); + + const input = await openModal(user); + await user.type(input, "big news"); + await user.click(screen.getByRole("button", { name: "Submit" })); + + expect( + await screen.findByText(CREATE_DISCORD_ANNOUNCEMENT_SERVER_ERROR_MESSAGE), + ).toBeInTheDocument(); + expect(input).toBeInTheDocument(); + }); +}); diff --git a/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx b/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx index 27cb41ea2..c19825d97 100644 --- a/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx +++ b/js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx @@ -18,12 +18,13 @@ export default function NewDiscordAnnouncementModal() { }); const toggleModal = () => { + form.clearErrors(); setModalOpen((prev) => !prev); }; const onSubmit = (data: z.infer) => { mutate( - { ...data }, + { ...data, message: data.message.trim() }, { onSuccess: async (data) => { notifications.show({ @@ -35,6 +36,12 @@ export default function NewDiscordAnnouncementModal() { setModalOpen(false); } }, + onError: (error) => { + notifications.show({ + message: error.message, + color: "red", + }); + }, }, ); }; diff --git a/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java b/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java index 49e3b3a20..796ea1154 100644 --- a/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java +++ b/src/main/java/org/patinanetwork/codebloom/api/admin/AdminController.java @@ -332,13 +332,13 @@ public ResponseEntity> sendDiscordAnnouncement( @Valid @RequestBody final CreateDiscordAnnouncementBody createDiscordAnnouncementBody, @Protected(admin = true) final AuthenticationObject authenticationObject) { - boolean allSent = + List failedClubs = discordClubManager.sendAnnouncementDiscordMessageToAllClubs(createDiscordAnnouncementBody.getMessage()); - if (!allSent) { + if (!failedClubs.isEmpty()) { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(ApiResponder.failure( - "Announcement failed to send to one or more clubs. Check logs for details.")); + .body(ApiResponder.failure("Announcement failed to send to: %s. Check logs for details." + .formatted(String.join(", ", failedClubs)))); } return ResponseEntity.ok(ApiResponder.success("Announcement successfully sent to all clubs!", Empty.of())); diff --git a/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java b/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java index a1a263bf2..4805a8e22 100644 --- a/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java +++ b/src/main/java/org/patinanetwork/codebloom/api/admin/body/jda/CreateDiscordAnnouncementBody.java @@ -1,5 +1,6 @@ package org.patinanetwork.codebloom.api.admin.body.jda; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,6 +13,7 @@ @AllArgsConstructor public class CreateDiscordAnnouncementBody { + @NotBlank @Size(min = 1, max = 4096) private String message; } diff --git a/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java b/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java index 815dc8472..d76478f46 100644 --- a/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java +++ b/src/main/java/org/patinanetwork/codebloom/common/components/DiscordClubManager.java @@ -389,11 +389,11 @@ private boolean sendAnnouncementDiscordMessage(final DiscordClub club, final Str return true; } - public boolean sendAnnouncementDiscordMessageToAllClubs(final String announcement) { + public List sendAnnouncementDiscordMessageToAllClubs(final String announcement) { var discordClubs = discordClubRepository.getAllActiveDiscordClubs(); return discordClubs.stream() - .map(club -> sendAnnouncementDiscordMessage(club, announcement)) - .reduce(Boolean::logicalAnd) - .orElse(false); + .filter(club -> !sendAnnouncementDiscordMessage(club, announcement)) + .map(DiscordClub::getName) + .toList(); } } diff --git a/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java b/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java index 34e5abc5f..3be65b20c 100644 --- a/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java +++ b/src/test/java/org/patinanetwork/codebloom/api/admin/AdminControllerTest.java @@ -513,7 +513,7 @@ void testDeleteDiscordMessageSuccess() { @Test void testDiscordAnnouncementFailure() { when(discordClubManager.sendAnnouncementDiscordMessageToAllClubs((anyString()))) - .thenReturn(false); + .thenReturn(List.of("Club A", "Club B")); CreateDiscordAnnouncementBody body = CreateDiscordAnnouncementBody.builder() .message("This is a test announcement.") @@ -524,14 +524,14 @@ void testDiscordAnnouncementFailure() { assertNotNull(response.getBody()); assertFalse(response.getBody().isSuccess()); assertEquals( - "Announcement failed to send to one or more clubs. Check logs for details.", + "Announcement failed to send to: Club A, Club B. Check logs for details.", response.getBody().getMessage()); } @Test void testDiscordAnnouncementSuccess() { when(discordClubManager.sendAnnouncementDiscordMessageToAllClubs((anyString()))) - .thenReturn(true); + .thenReturn(List.of()); CreateDiscordAnnouncementBody body = CreateDiscordAnnouncementBody.builder() .message("This is a test announcement.") diff --git a/src/test/java/org/patinanetwork/codebloom/common/components/DiscordClubManagerTest.java b/src/test/java/org/patinanetwork/codebloom/common/components/DiscordClubManagerTest.java index 8a03df40f..d3599e8b1 100644 --- a/src/test/java/org/patinanetwork/codebloom/common/components/DiscordClubManagerTest.java +++ b/src/test/java/org/patinanetwork/codebloom/common/components/DiscordClubManagerTest.java @@ -529,6 +529,60 @@ void testRefreshSubmissionsWithZeroScore() throws LeaderboardException { assertEquals(20, result.getClubRank()); } + @Test + void testSendAnnouncementDiscordMessageToAllClubsEmptyClubList() { + when(discordClubRepository.getAllActiveDiscordClubs()).thenReturn(Collections.emptyList()); + + List failed = discordClubManager.sendAnnouncementDiscordMessageToAllClubs("hello"); + + assertTrue(failed.isEmpty()); + verify(jdaClient, never()).sendEmbedWithImages(any()); + } + + @Test + void testSendAnnouncementDiscordMessageToAllClubsSuccess() { + DiscordClub mockClub = createMockDiscordClub("Club 1", Tag.Rpi); + when(discordClubRepository.getAllActiveDiscordClubs()).thenReturn(Arrays.asList(mockClub)); + + List failed = discordClubManager.sendAnnouncementDiscordMessageToAllClubs("big news"); + + assertTrue(failed.isEmpty()); + + ArgumentCaptor captor = + ArgumentCaptor.forClass(EmbeddedImagesMessageOptions.class); + verify(jdaClient).sendEmbedWithImages(captor.capture()); + + assertEquals("big news", captor.getValue().getDescription()); + assertEquals("Announcement for Club 1", captor.getValue().getTitle()); + } + + @Test + void testSendAnnouncementDiscordMessageToAllClubsJdaThrowsReturnsClubName() { + DiscordClub mockClub = createMockDiscordClub("Broken Club", Tag.Rpi); + when(discordClubRepository.getAllActiveDiscordClubs()).thenReturn(Arrays.asList(mockClub)); + + doThrow(new RuntimeException()).when(jdaClient).sendEmbedWithImages(any(EmbeddedImagesMessageOptions.class)); + + List failed = discordClubManager.sendAnnouncementDiscordMessageToAllClubs("hello"); + + assertEquals(List.of("Broken Club"), failed); + assertTrue(logWatcher.list.stream().anyMatch(e -> e.getFormattedMessage() + .contains("Error in DiscordClubManager when sending announcement to club Broken Club"))); + } + + @Test + void testSendAnnouncementDiscordMessageToAllClubsMixedOnlyReturnsFailures() { + DiscordClub goodClub = createMockDiscordClub("Good Club", Tag.Rpi); + DiscordClub badClub = createMockDiscordClubWithoutMetadata("Bad Club", Tag.Baruch); + when(badClub.getId()).thenReturn("club-id-3"); + when(discordClubRepository.getAllActiveDiscordClubs()).thenReturn(Arrays.asList(goodClub, badClub)); + + List failed = discordClubManager.sendAnnouncementDiscordMessageToAllClubs("hello"); + + assertEquals(List.of("Bad Club"), failed); + verify(jdaClient, times(1)).sendEmbedWithImages(any(EmbeddedImagesMessageOptions.class)); + } + private DiscordClub createMockDiscordClub(final String name, final Tag tag) { DiscordClubMetadata metadata = mock(DiscordClubMetadata.class); when(metadata.getGuildId()).thenReturn(Optional.of("123456789")); From 293fc5f77431ac86b1af858ee3fee3f7b8736a66 Mon Sep 17 00:00:00 2001 From: Derek Date: Mon, 2 Nov 2026 15:29:35 -0500 Subject: [PATCH 3/3] DINO-1082: fix coderabbit nit --- js/src/__mock__/admin/index.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/js/src/__mock__/admin/index.ts b/js/src/__mock__/admin/index.ts index 7eb082127..fae7f0d19 100644 --- a/js/src/__mock__/admin/index.ts +++ b/js/src/__mock__/admin/index.ts @@ -121,10 +121,13 @@ export const createDiscordAnnouncementSuccessHandler = http.post( export const createDiscordAnnouncementPartialFailureHandler = http.post( createDiscordAnnouncement.url.toString(), () => { - return HttpResponse.json({ - success: false, - message: CREATE_DISCORD_ANNOUNCEMENT_FAILURE_MESSAGE, - }); + return HttpResponse.json( + { + success: false, + message: CREATE_DISCORD_ANNOUNCEMENT_FAILURE_MESSAGE, + }, + { status: 500 }, + ); }, );