refactor: use only raw requests in http

star0202 · Jun 22, 2023 · 53a19b5 · 53a19b5
1 parent 7efe04f
commit 53a19b5
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 28 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -63,42 +63,50 @@ export class Neis extends NeisRequest {
 
   /** elsTimetable */
   async getElsTimetable(params: ElsTimetableParam) {
-    return this.elsTimetableRaw(params, isLegacyTimetable(params))
+    return isLegacyTimetable(params)
+      ? this.elsTimetablebgsRaw(params)
+      : this.elsTimetableRaw(params)
   }
 
   /** elsTimetable */
   async getElsTimetableOne(params: ElsTimetableParam) {
-    return firstOf(this.elsTimetableRaw(params, isLegacyTimetable(params)))
+    return firstOf(this.getElsTimetable(params))
   }
 
   /** misTimetable */
   async getMisTimetable(params: MisTimetableParam) {
-    return this.misTimetableRaw(params, isLegacyTimetable(params))
+    return isLegacyTimetable(params)
+      ? this.misTimetablebgsRaw(params)
+      : this.misTimetableRaw(params)
   }
 
   /** misTimetable */
   async getMisTimetableOne(params: MisTimetableParam) {
-    return firstOf(this.misTimetableRaw(params, isLegacyTimetable(params)))
+    return firstOf(this.getMisTimetable(params))
   }
 
   /** hisTimetable */
   async getHisTimetable(params: HisTimetableParam) {
-    return this.hisTimetableRaw(params, isLegacyTimetable(params))
+    return isLegacyTimetable(params)
+      ? this.hisTimetablebgsRaw(params)
+      : this.hisTimetableRaw(params)
   }
 
   /** hisTimetable */
   async getHisTimetableOne(params: HisTimetableParam) {
-    return firstOf(this.hisTimetableRaw(params, isLegacyTimetable(params)))
+    return firstOf(this.getHisTimetable(params))
   }
 
   /** spsTimetable */
   async getSpsTimetable(params: SpsTimetableParam) {
-    return this.spsTimetableRaw(params, isLegacyTimetable(params))
+    return isLegacyTimetable(params)
+      ? this.spsTimetablebgsRaw(params)
+      : this.spsTimetableRaw(params)
   }
 
   /** spsTimetable */
   async getSpsTimetableOne(params: SpsTimetableParam) {
-    return firstOf(this.spsTimetableRaw(params, isLegacyTimetable(params)))
+    return firstOf(this.getSpsTimetable(params))
   }
 
   /** classInfo */

diff --git a/src/http.ts b/src/http.ts
@@ -96,32 +96,36 @@ export class NeisRequest {
     return this.get<AcaInsTiInfoResponse>('acaInsTiInfo', params)
   }
 
-  protected async elsTimetableRaw(params: ElsTimetableParam, legacy: boolean) {
-    return this.get<ElsTimetableResponse>(
-      `elsTimetable${legacy ? 'bgs' : ''}`,
-      params
-    )
+  protected async elsTimetableRaw(params: ElsTimetableParam) {
+    return this.get<ElsTimetableResponse>('elsTimetable', params)
   }
 
-  protected async misTimetableRaw(params: MisTimetableParam, legacy: boolean) {
-    return this.get<MisTimetableResponse>(
-      `misTimetable${legacy ? 'bgs' : ''}`,
-      params
-    )
+  protected async elsTimetablebgsRaw(params: ElsTimetableParam) {
+    return this.get<ElsTimetableResponse>('elsTimetablebgs', params)
   }
 
-  protected async hisTimetableRaw(params: HisTimetableParam, legacy: boolean) {
-    return this.get<HisTimetableResponse>(
-      `hisTimetable${legacy ? 'bgs' : ''}`,
-      params
-    )
+  protected async misTimetableRaw(params: MisTimetableParam) {
+    return this.get<MisTimetableResponse>('misTimetable', params)
   }
 
-  protected async spsTimetableRaw(params: SpsTimetableParam, legacy: boolean) {
-    return this.get<SpsTimetableResponse>(
-      `spsTimetable${legacy ? 'bgs' : ''}`,
-      params
-    )
+  protected async misTimetablebgsRaw(params: MisTimetableParam) {
+    return this.get<MisTimetableResponse>('misTimetablebgs', params)
+  }
+
+  protected async hisTimetableRaw(params: HisTimetableParam) {
+    return this.get<HisTimetableResponse>('hisTimetable', params)
+  }
+
+  protected async hisTimetablebgsRaw(params: HisTimetableParam) {
+    return this.get<HisTimetableResponse>('hisTimetablebgs', params)
+  }
+
+  protected async spsTimetableRaw(params: SpsTimetableParam) {
+    return this.get<SpsTimetableResponse>('spsTimetable', params)
+  }
+
+  protected async spsTimetablebgsRaw(params: SpsTimetableParam) {
+    return this.get<SpsTimetableResponse>('spsTimetablebgs', params)
   }
 
   protected async classInfoRaw(params: ClassInfoParam) {