Merge pull request #45 from MitchTalmadge/develop

Hotfix accidental course channel category database wipeout

Author: MitchTalmadge

src/guild-context.ts

@@ -33,7 +33,7 @@ export class GuildContext {
    * The list of allowed courses that users can be assigned to.
    * May be empty if the list could not be populated automatically.
    */
-  public courses: { [majorPrefix: string]: Course[] };
+  public coursesByMajor: { [majorPrefix: string]: Course[] };
 
   public verificationRoleId: string;
 
@@ -51,7 +51,7 @@ export class GuildContext {
 
   private async init(): Promise<void> {
     this.guildLog("Initializing course lists...");
-    this.courses = await CourseService.fetchCourseList(this, new WebCatalogFactory().getWebCatalog(this.guildConfig.webCatalog))
+    this.coursesByMajor = await CourseService.fetchCourseList(this, new WebCatalogFactory().getWebCatalog(this.guildConfig.webCatalog))
       .catch(err => {
         this.guildError("Failed to get course lists from the web catalog:", err);
 

src/services/course.ts

@@ -36,7 +36,7 @@ export class CourseService {
    * @returns The course if it could be found in the cache, otherwise null.
    */
   public static findCourseByKey(guildContext: GuildContext, key: string): Course | null {
-    const allCourses = _.flatMap(guildContext.courses);
+    const allCourses = _.flatMap(guildContext.coursesByMajor);
     return allCourses.find(c => c.key == key);
   }
 
@@ -49,7 +49,7 @@ export class CourseService {
    * @returns The course if valid, undefined if not.
    */
   public static async getCourseFromNumber(guildContext: GuildContext, number: string, major: Major): Promise<Course> {
-    const majorCourses = guildContext.courses[major.prefix];
+    const majorCourses = guildContext.coursesByMajor[major.prefix];
     if (majorCourses.length === 0) {
       return {
         key: CourseUtils.getKey(number, major),

src/services/discord/role-assignment.ts

@@ -25,7 +25,7 @@ export class DiscordRoleAssignmentService {
 
     // Courses
     //TODO: Won't work for non-catalog majors
-    for(let courses of Object.values(guildContext.courses)) {
+    for(let courses of Object.values(guildContext.coursesByMajor)) {
       for(let course of courses) {
         const assignment = user.guilds.get(guildContext.guild.id).courses.find(courseAssignment => courseAssignment.courseKey === course.key);
         if(assignment) { // User is assigned to course.

src/services/implement/major/implement.ts

@@ -364,7 +364,9 @@ export class MajorImplementService {
         if(!guildContext.guild.channels.resolve(id)) {
           guildContext.guildLog(`Removed missing category ID ${id} from ${major.prefix} major implement`);
           update = true;
+          return false;
         }
+        return true;
       });
     }