Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions js/src/__mock__/admin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,55 @@ 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<Empty>);
},
);

// 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,
},
{ status: 500 },
);
},
);

export const createDiscordAnnouncementServerErrorHandler = http.post(
createDiscordAnnouncement.url.toString(),
() => {
return HttpResponse.json(
{
success: false,
message: CREATE_DISCORD_ANNOUNCEMENT_SERVER_ERROR_MESSAGE,
},
{ status: 500 },
);
},
);
4 changes: 4 additions & 0 deletions js/src/app/admin/_components/AdminIndex.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -19,6 +20,9 @@ export default function AdminIndex() {
<Flex w={"100%"} direction={"row"} justify={"center"}>
<DeleteAnnouncementButton />
</Flex>
<Flex w={"100%"} direction={"row"} justify={"center"}>
<NewDiscordAnnouncementModal />
</Flex>
<Flex w={"100%"} direction={"row"} justify={"center"}>
<RefreshLeetcodeTokenModal />
</Flex>
Expand Down
Original file line number Diff line number Diff line change
@@ -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<typeof userEvent.setup>) => {
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?.(<NewDiscordAnnouncementModal />);
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?.(<NewDiscordAnnouncementModal />);
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?.(<NewDiscordAnnouncementModal />);
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?.(<NewDiscordAnnouncementModal />);
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?.(<NewDiscordAnnouncementModal />);
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();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
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 = () => {
form.clearErrors();
setModalOpen((prev) => !prev);
};

const onSubmit = (data: z.infer<typeof newDiscordAnnouncementSchema>) => {
mutate(
{ ...data, message: data.message.trim() },
{
onSuccess: async (data) => {

Check warning on line 29 in js/src/app/admin/_components/announcements/NewDiscordAnnouncementModal.tsx

View check run for this annotation

SonarQubeCloud / [codebloom_frontend] SonarCloud Code Analysis

Async method 'onSuccess' has no 'await' expression.

See more on https://sonarcloud.io/project/issues?id=Patina-Network_codebloom_frontend&issues=AaGaVRG6S_nD4WvEJNKL&open=AaGaVRG6S_nD4WvEJNKL&pullRequest=1060
notifications.show({
message: data.message,
color: data.success ? undefined : "red",
});
if (data.success) {
form.reset();
setModalOpen(false);
}
},
onError: (error) => {
notifications.show({
message: error.message,
color: "red",
});
},
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
);
};

return (
<>
<Button onClick={toggleModal} top={12}>
New Discord Announcement
</Button>
<Modal
opened={isModalOpen}
onClose={toggleModal}
title="Create new discord announcement"
>
<form onSubmit={form.onSubmit(onSubmit)}>
<TextInput
{...form.getInputProps("message")}
label="Announcement message"
error={form.errors.message}
withAsterisk
mb={"sm"}
/>
<Button
type="submit"
size="xs"
mt="sm"
variant="outline"
disabled={status === "pending"}
>
Submit
</Button>
</form>
</Modal>
</>
);
}
35 changes: 35 additions & 0 deletions js/src/lib/api/queries/admin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,41 @@
return res(await response.json());
}

/**
* Creates Discord announcement
*/

export const useCreateDiscordAnnouncementMutation = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: createDiscordAnnouncement,
onSuccess: async (data) => {

Check warning on line 265 in js/src/lib/api/queries/admin/index.ts

View check run for this annotation

SonarQubeCloud / [codebloom_frontend] SonarCloud Code Analysis

Async method 'onSuccess' has no 'await' expression.

See more on https://sonarcloud.io/project/issues?id=Patina-Network_codebloom_frontend&issues=AaGaVRKqS_nD4WvEJNKM&open=AaGaVRKqS_nD4WvEJNKM&pullRequest=1060
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.
*/
Expand Down
4 changes: 4 additions & 0 deletions js/src/lib/api/schema/admin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
});
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -322,6 +323,27 @@ public ResponseEntity<ApiResponder<Empty>> 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<ApiResponder<Empty>> sendDiscordAnnouncement(
@Valid @RequestBody final CreateDiscordAnnouncementBody createDiscordAnnouncementBody,
@Protected(admin = true) final AuthenticationObject authenticationObject) {

List<String> failedClubs =
discordClubManager.sendAnnouncementDiscordMessageToAllClubs(createDiscordAnnouncementBody.getMessage());

if (!failedClubs.isEmpty()) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.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()));
}

@Operation(
summary = "Refresh LeetCode auth token",
description =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.patinanetwork.codebloom.api.admin.body.jda;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

@Getter
@Setter
@Builder
@AllArgsConstructor
public class CreateDiscordAnnouncementBody {

@NotBlank
@Size(min = 1, max = 4096)
private String message;
Comment thread
Pendoof marked this conversation as resolved.
Resolved
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
}
Loading
Loading