Feature/nathen418/populate db from api

__tests__/utils/channels.tests.ts

@@ -2,12 +2,12 @@ import {
   cleanChannelString,
   concatCategoryName,
   moveChannel,
-  getCourseName,
   getTopic,
 } from "../../src/utils/channels";
 import { expect, describe, it, beforeEach } from "@jest/globals";
 import { Guild, GuildChannel } from "discord.js";
 import { IClass } from "../../src/models/classModel";
+import { getCourseName } from "../../src/utils/course_cleaning";
 
 //cleanChannelString
 describe("cleanChannelString", () => {

package.json

@@ -8,8 +8,7 @@
   "main": "index.ts",
   "scripts": {
     "run": "ts-node src/index.ts",
-    "format": "prettier --write .",
-    "test": "jest"
+    "format": "prettier --write ."
   },
   "repository": {
     "type": "git",
@@ -35,7 +34,6 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.3.1",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3"
+    "jest": "^29.3.1"
   }
-}
+}

src/commands/owner/csClassPoll.ts

@@ -9,7 +9,7 @@ import { ICommand } from "wokcommands";
 import { classModel, IClass } from "../../models/classModel";
 import { checkForRoles, cleanRoleString } from "../../utils/roles";
 import { sleep } from "../../utils/sleep";
-import { getCourseName } from "../../utils/channels";
+import { getCourseName } from "../../utils/course_cleaning";
 
 // Splits any size list into lists of at most `max_list_len`
 /**

src/commands/owner/csCreateChannels.ts

@@ -8,10 +8,11 @@ import {
   getCategory,
   moveChannel,
   concatCategoryName,
+  getTopic,
 } from "../../utils/channels";
 import { create_default_embed } from "../../utils/embeds";
 import { cleanRoleString } from "../../utils/roles";
-import { getCourseName, getTopic } from "../../utils/channels";
+import { getCourseName } from "../../utils/course_cleaning";
 
 export default {
   name: "csCreateChannels",

src/commands/owner/migrateDB.ts

@@ -3,20 +3,15 @@ import { ICommand } from "wokcommands";
 import { classModel, IClass } from "../../models/classModel";
 import { create_default_embed } from "../../utils/embeds";
 import { Schema, Types, Document } from "mongoose";
+import { cleanChannelString, getTopic } from "../../utils/channels";
+import { cleanRoleString } from "../../utils/roles";
 import {
   getCourseName,
-  cleanChannelString,
-  getTopic,
-} from "../../utils/channels";
-import { cleanRoleString } from "../../utils/roles";
+  cleanCompSciTitle,
+  cleanCourseCode,
+} from "../../utils/course_cleaning";
 import Bottleneck from "bottleneck";
 
-function cleanCompSciString(s: string): string {
-  return s.toLowerCase().replace("compsci ", "cs").trim();
-}
-function cleanCompSciTitle(s: string): string {
-  return s.replace(/(?:advanced )?topics in computer science:/gim, "").trim();
-}
 function isDupe(name: string): number {
   return name.search(/\(\d\)/);
 }
@@ -76,7 +71,7 @@ export default {
           // Remove the number
           new_name = new_name.slice(0, is_dupe);
         }
-        new_name = cleanCompSciString(new_name);
+        new_name = cleanCourseCode(new_name);
         course.set("NAME", new_name);
         // Remove UUID
         console.log(chalk.yellow(`${code}\t${new_name}`));