From 94f2924a1bd38f5669f3f578e99f5989575710e0 Mon Sep 17 00:00:00 2001 From: Hank-Choi Date: Tue, 11 Jul 2023 14:25:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=8B=A4=EC=A0=9C=20=EA=B0=95=EC=9D=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=8B=9C=20=EC=9E=90=EC=B2=B4=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EA=B2=80=EC=A6=9D=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/timetable/TimetableLectureService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/timetable/TimetableLectureService.ts b/src/core/timetable/TimetableLectureService.ts index 2834e631..3afeecbe 100644 --- a/src/core/timetable/TimetableLectureService.ts +++ b/src/core/timetable/TimetableLectureService.ts @@ -53,7 +53,6 @@ export async function addLecture(timetable: Timetable, lecture: UserLecture, isF } logger.info(lecture) - validateLectureTime(lecture); LectureColorService.validateLectureColor(lecture) @@ -90,6 +89,7 @@ export async function addCustomLecture(timetable: Timetable, lecture: UserLectur if (!lecture.color && !lecture.colorIndex) { lecture.colorIndex = getAvailableColorIndex(timetable); } + validateLectureTime(lecture); await addLecture(timetable, lecture, isForced); } @@ -254,7 +254,7 @@ function timesOverlap(time1: TimePlace, time2: TimePlace): boolean { return time1.day === time2.day && time1.startMinute < time2.endMinute && time1.endMinute > time2.startMinute } -function syncRealTimeWithPeriod(lecture: any): void { +function syncRealTimeWithPeriod(lecture: UserLecture): void { lecture.class_time_json.forEach(it => { if (it.start_time && it.end_time) { const startTime = Time.fromHourMinuteString(it.start_time) From 9d630db9aef38adde257c81744bcd5df88179569 Mon Sep 17 00:00:00 2001 From: Hank-Choi Date: Tue, 11 Jul 2023 14:27:40 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8B=A4=ED=8C=A8=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/integration/user_test.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/integration/user_test.ts b/test/integration/user_test.ts index ed8a4851..6390a658 100644 --- a/test/integration/user_test.ts +++ b/test/integration/user_test.ts @@ -124,17 +124,6 @@ export = function(request: supertest.SuperTest) { }); }); - it('fails when no old password', function(done) { - request.put('/user/password') - .set('x-access-token', token2) - .send({new_password:"abc1234*"}) - .expect(403) - .end(function(err, res){ - assert.equal(res.body.errcode, ErrorCode.WRONG_PASSWORD); - done(err); - }); - }); - it('fails when wrong old password', function(done) { request.put('/user/password') .set('x-access-token', token2) From 20da1ad64e4cbc57eb5f6cc61438904d76f705a1 Mon Sep 17 00:00:00 2001 From: Hankyeol Choi Date: Tue, 11 Jul 2023 14:28:25 +0900 Subject: [PATCH 3/3] Update TimetableLectureService.ts --- src/core/timetable/TimetableLectureService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/timetable/TimetableLectureService.ts b/src/core/timetable/TimetableLectureService.ts index 3afeecbe..4add72c7 100644 --- a/src/core/timetable/TimetableLectureService.ts +++ b/src/core/timetable/TimetableLectureService.ts @@ -254,7 +254,7 @@ function timesOverlap(time1: TimePlace, time2: TimePlace): boolean { return time1.day === time2.day && time1.startMinute < time2.endMinute && time1.endMinute > time2.startMinute } -function syncRealTimeWithPeriod(lecture: UserLecture): void { +function syncRealTimeWithPeriod(lecture: any): void { lecture.class_time_json.forEach(it => { if (it.start_time && it.end_time) { const startTime = Time.fromHourMinuteString(it.start_time)