Merge pull request #5 from paywteam/vacant/apply-daynum

Vacant resource data format is changed.

src/app/helpers/EmptyClassroomChecker.ts

@@ -5,7 +5,7 @@ import { LectureDoc } from 'Database/schemas/lecture'
 import { ClassDoc } from 'Database/schemas/class'
 
 interface CurrentDate {
-  day: string
+  day: number
   time: string
 }
 
@@ -54,10 +54,7 @@ export default class EmptyClassroomChecker {
       new Date().toLocaleString('en-US', { timeZone: 'Asia/Seoul' })
     )
 
-    let day = local_date
-      .toString()
-      .split(' ')[0]
-      .toUpperCase()
+    let day = local_date.getDay()
     let hour = local_date
       .getHours()
       .toString()

src/app/helpers/LecturesComparator.ts

@@ -9,36 +9,13 @@ export default class LecturesComparator {
    */
   public static comparator(): Comparator {
     return (a, b) => {
-      let num_a = this.dayToNum(a.time.day)
-      let num_b = this.dayToNum(b.time.day)
-
-      return num_a < num_b
+      return a.time.day < b.time.day
         ? -1
-        : num_a > num_b
+        : a.time.day > b.time.day
         ? 1
         : a.time.start < b.time.start
         ? -1
         : 1
     }
   }
-
-  /**
-   * Convert day of week to number.
-   * ex) SUN - SAT => 0 - 6
-   *
-   * @param day
-   */
-  private static dayToNum(day: string): number {
-    const day_num: { [index: string]: number } = {
-      SUN: 0,
-      MON: 1,
-      TUE: 2,
-      WED: 3,
-      THU: 4,
-      FRI: 5,
-      SAT: 6
-    }
-
-    return day_num[day.toUpperCase()]
-  }
 }

src/app/http/controllers/vacant/ClassroomsController.ts

@@ -3,10 +3,10 @@ import Floor from 'Database/models/floor'
 import logger from 'Configs/log'
 import { FloorDoc } from 'Database/schemas/floor'
 import { ClassroomDoc } from 'Database/schemas/classroom'
-import { TimeDoc } from 'Database/schemas/time'
 import { LectureDoc } from 'Database/schemas/lecture'
 import { ClassDoc } from 'Database/schemas/class'
 import LecturesComparator from 'Helpers/LecturesComparator'
+import { TimeDoc } from 'Database/schemas/time'
 
 export interface LectureInfo {
   name: string

src/database/schemas/time.ts

@@ -8,13 +8,13 @@
 import mongoose, { Document } from 'mongoose'
 
 export interface TimeDoc extends Document {
-  day: string
+  day: number
   start: string
   end: string
 }
 
 const timeSchema = new mongoose.Schema({
-  day: { type: String, required: true }, // ex. MON
+  day: { type: Number, required: true }, // SUN - SAT => 0 - 6
   start: { type: String, required: true }, // ex. 3:30pm -> 1530
   end: { type: String, required: true }
 })