Merge pull request #38 from rmagur1203/develop

edit schedule loader
Sunrinlifeteam · Mar 30, 2022 · 0dc5255 · 0dc5255
2 parents 58a53cf + c9d888c
commit 0dc5255
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/src/entities/User.ts b/src/entities/User.ts
@@ -52,6 +52,9 @@ export class UserEntity {
     @Column({ type: 'int', default: 0, nullable: false })
     accountType: number;
 
+    @Column({ type: 'bigint', default: 0, nullable: false })
+    role: number;
+
     @Column({ length: 200, nullable: true, select: false })
     refreshToken: string;
 

diff --git a/src/modules/neis/SchoolSchedule.ts b/src/modules/neis/SchoolSchedule.ts
@@ -143,6 +143,30 @@ export class SchoolSchedule {
         reqParams.AA_TO_YMD = end.toFormat('yyyyMM');
         return await this.fetchJSON(defParams, reqParams);
     }
+    async fetchByMonthFullRange(
+        defParams: DefaultParameter,
+        reqParams: SchoolScheduleParameter,
+        start: DateTime | Date,
+        end: DateTime | Date
+    ) {
+        if (start instanceof Date) start = DateTime.fromJSDate(start);
+        if (end instanceof Date) end = DateTime.fromJSDate(end);
+        reqParams.AA_FROM_YMD = start.startOf('month').toFormat('yyyyMMdd');
+        reqParams.AA_TO_YMD = end.endOf('month').toFormat('yyyyMMdd');
+        return await this.fetchJSON(defParams, reqParams);
+    }
+    async fetchByRange(
+        defParams: DefaultParameter,
+        reqParams: SchoolScheduleParameter,
+        start: DateTime | Date,
+        end: DateTime | Date
+    ) {
+        if (start instanceof Date) start = DateTime.fromJSDate(start);
+        if (end instanceof Date) end = DateTime.fromJSDate(end);
+        reqParams.AA_FROM_YMD = start.toFormat('yyyyMMdd');
+        reqParams.AA_TO_YMD = end.toFormat('yyyyMMdd');
+        return await this.fetchJSON(defParams, reqParams);
+    }
     /**
      * 학사일정
      * @param defParams 기본 인자

diff --git a/src/modules/synchronizer.ts b/src/modules/synchronizer.ts
@@ -14,7 +14,7 @@ export class NeisOpenAPI {
     static async SchoolSchedule(start: DateTime, end: DateTime) {
         const scheduleRepository =
             Container.get<Repository<ScheduleEntity>>(ScheduleEntity);
-        const result = await this.parser.fetchByMonthRange(
+        const result = await this.parser.fetchByRange(
             DefaultParameterPreset,
             {
                 SD_SCHUL_CODE: '',