Merge branch 'v13' of github.com:Ohtuproju2021syksy/Discord-Bot-better into v13

Author: tire95

__tests__/jest/slashCommands/slash_instructors.test.js

@@ -11,6 +11,18 @@ const {
 const roleString = "test";
 const initialResponse = "Fetching instructors...";
 
+const Course = {
+  create: jest.fn(),
+  findOne: jest
+    .fn(() => true)
+    .mockImplementationOnce(() => false),
+  destroy: jest.fn(),
+};
+
+const models = {
+  Course,
+};
+
 afterEach(() => {
   jest.clearAllMocks();
 });
@@ -19,7 +31,7 @@ describe("slash instructors command", () => {
   test("instructors command used outside course channels", async () => {
     const client = studentInteractionWithoutOptions.client;
     const response = "Use the command in a course channel.";
-    await execute(studentInteractionWithoutOptions, client);
+    await execute(studentInteractionWithoutOptions, client, models);
     expect(sendEphemeral).toHaveBeenCalledTimes(1);
     expect(sendEphemeral).toHaveBeenCalledWith(studentInteractionWithoutOptions, initialResponse);
     expect(editErrorEphemeral).toHaveBeenCalledTimes(1);
@@ -32,7 +44,7 @@ describe("slash instructors command", () => {
     client.guild.roles.create({ id: 5, name: `${roleString} ${courseAdminRole}`, members: [{ displayName: "teacher", user: { id: 1 } }] });
     client.guild.roles.create({ id: 1, name: "faculty", members: [{ displayName: "teacher", user: { id: 1 } }] });
     const response = `No instructors for ${roleString}`;
-    await execute(studentInteractionWithoutOptions, client);
+    await execute(studentInteractionWithoutOptions, client, models);
     expect(sendEphemeral).toHaveBeenCalledTimes(1);
     expect(sendEphemeral).toHaveBeenCalledWith(studentInteractionWithoutOptions, initialResponse);
     expect(editErrorEphemeral).toHaveBeenCalledTimes(1);
@@ -44,7 +56,7 @@ describe("slash instructors command", () => {
     client.guild.roles.create({ id: 5, name: `${roleString} ${courseAdminRole}`, members: [{ displayName: "teacher", user: { id: 1 } }] });
     client.guild.roles.create({ id: 1, name: "faculty", members: [{ displayName: "teacher", user: { id: 1 } }] });
     const response = `No instructors for ${roleString}`;
-    await execute(defaultStudentInteraction, client);
+    await execute(defaultStudentInteraction, client, models);
     expect(sendEphemeral).toHaveBeenCalledTimes(1);
     expect(sendEphemeral).toHaveBeenCalledWith(defaultStudentInteraction, initialResponse);
     expect(editErrorEphemeral).toHaveBeenCalledTimes(1);

src/discordBot/commands/student/instructors.js

@@ -2,22 +2,24 @@ const { SlashCommandBuilder } = require("@discordjs/builders");
 const { getCourseNameFromCategory, listCourseInstructors } = require("../../services/service");
 const { editEphemeral, editErrorEphemeral, sendEphemeral } = require("../../services/message");
 const { courseAdminRole, facultyRole } = require("../../../../config.json");
+const { findCourseFromDb } = require("../../../db/services/courseService");
 
-const execute = async (interaction, client) => {
+const execute = async (interaction, client, models) => {
   await sendEphemeral(interaction, "Fetching instructors...");
   const guild = client.guild;
 
   const category = guild.channels.cache.get(interaction.channelId).parent;
-  if (!category) {
+  const courseName = category?.name ? getCourseNameFromCategory(category.name) : null;
+  const course = await findCourseFromDb(courseName, models.Course);
+  if (!category || !course) {
     return await editErrorEphemeral(interaction, "Use the command in a course channel.");
   }
-  const roleString = getCourseNameFromCategory(category.name);
 
-  const adminsString = await listCourseInstructors(guild, roleString, courseAdminRole, facultyRole);
+  const adminsString = await listCourseInstructors(guild, courseName, courseAdminRole, facultyRole);
 
-  if (adminsString === "") return await editErrorEphemeral(interaction, `No instructors for ${roleString}`);
+  if (adminsString === "") return await editErrorEphemeral(interaction, `No instructors for ${courseName}`);
 
-  await editEphemeral(interaction, `Here are the instructors for ${roleString}: ${adminsString}`);
+  await editEphemeral(interaction, `Here are the instructors for ${courseName}: ${adminsString}`);
 };
 
 module.exports = {