Merge pull request #327 from MathSoc/319-replacing-redundant-waterloo-api-logic-in-relation-to-converttermcodetotermname

319 replacing redundant waterloo api logic in relation to converttermcodetotermname

Author: sai3000pro

server/api/controllers/exam-bank-controller.ts

@@ -138,8 +138,6 @@ export class ExamBankController {
    * Gets an array of every exam currently in the exam list folder
    */
   private static async generateExamsList(): Promise<Exam[]> {
-    await this.validateTerms();
-
     const examFiles: Dirent[] = readdirSync("public/exams", {
       withFileTypes: true,
     });
@@ -214,26 +212,4 @@ export class ExamBankController {
       }
     }
   }
-
-  private static async validateTerms() {
-    const examFiles: Dirent[] = readdirSync("public/exams", {
-      withFileTypes: true,
-    });
-
-    let valid = true;
-    for (const exam of examFiles) {
-      const parts = exam.name.split("-");
-      const term = parts[2].padStart(4, "0");
-
-      const isValidTerm = TermNameController.validateTerm(term);
-      if (!isValidTerm) {
-        valid = false;
-        break;
-      }
-    }
-
-    if (!valid) {
-      await TermNameController.overwriteTermsFile();
-    }
-  }
 }

server/api/controllers/term-name-controller.ts

@@ -8,27 +8,6 @@ export class TermNameController {
   static logger = new Logger("Term Name Controller");
   static termCache = new Map<string, string>(); // cache of termCodes
 
-  static async getTermNames(): Promise<Term[]> {
-    const url = `${tokens.WATERLOO_OPEN_API_BASE_URL}/Terms`;
-    const response = await fetch(new URL(url), {
-      method: "GET",
-      headers: {
-        "X-API-KEY": tokens.WATERLOO_OPEN_API_KEY as string,
-        "Content-Type": "application/json",
-      },
-    });
-
-    const terms: Term[] = await response.json();
-    return terms;
-  }
-
-  static validateTerm(term: string): boolean {
-    const terms = this.getTermsFile();
-    const termCodes = terms.map((item) => item.termCode);
-
-    return termCodes.includes(term);
-  }
-
   static getTermsFile(): Term[] {
     try {
       const terms = fs.readFileSync("server/data/_hidden/term-list.json");
@@ -38,7 +17,7 @@ export class TermNameController {
     }
   }
 
-  static convertTermCodeToTermName(termCode: string) {
+  static getTermNameFromTermCode(termCode: string) {
     if (this.termCache.has(termCode)) {
       return this.termCache.get(termCode); // Return from cache
     }
@@ -68,24 +47,4 @@ export class TermNameController {
 
     return termName;
   }
-
-  static getTermNameFromTermCode(termCode: string) {
-    const terms = this.getTermsFile();
-    const target = terms.find((item) => item.termCode === termCode);
-    return target?.name ?? this.convertTermCodeToTermName(termCode);
-  }
-
-  static async overwriteTermsFile() {
-    try {
-      const terms = await this.getTermNames();
-      const url = "_hidden/term-list";
-      const fullPath = `server/data/${url}.json`;
-
-      fs.writeFileSync(fullPath, JSON.stringify(terms));
-      this.logger.info("Terms file rewritten");
-    } catch (err) {
-      this.logger.error("Could not rewrite terms file.");
-      this.logger.error(err);
-    }
-  }
 }