add: isAnnual

__tests__/usecase/updateCourseDatabase.test.ts

@@ -74,7 +74,7 @@ test('強制更新', async () => {
         compareCourseWithoutId(d!, c)
       })
   )
-})
+}, 10000)
 
 test('不正データ', async () => {
   const brokenData = [...initialData]

protos/CourseService.proto

@@ -83,6 +83,7 @@ message Course {
   repeated CourseMethod methods = 11;
   repeated CourseSchedule schedules = 12;
   bool hasParseError = 13; // パースエラーが発生した場合（情報の信憑性が薄い場合）trueになる
+  bool isAnnual = 14; // 通年フラグ
 }
 
 message GetCoursesRequest {

src/database/model/course.ts

@@ -75,6 +75,13 @@ export class Course {
   })
   hasParseError!: boolean
 
+  @Column({
+    name: 'is_annual',
+    type: 'bool',
+    default: false,
+  })
+  isAnnual!: boolean
+
   @OneToMany(() => CourseRecommendedGrade, (r) => r.courseId, {
     cascade: true,
     onDelete: 'CASCADE',

src/grpc/converter.ts

@@ -79,7 +79,30 @@ export function createDBCourse(c: PCourse, year: number, id: string): Course {
     mm.method = m
     return mm
   })
-  target.schedules = c.schedules.map((s) => {
+
+  // 通年かどうか
+  target.isAnnual = !!c.schedules.find((s) => s.module === PModule.Annual)
+
+  // 通年のスケジュールを春ABC秋ABCに変換
+  const schedules = c.schedules
+    .map((s) =>
+      s.module === PModule.Annual
+        ? [
+            PModule.SpringA,
+            PModule.SpringB,
+            PModule.SpringC,
+            PModule.FallA,
+            PModule.FallB,
+            PModule.FallC,
+          ].map((m) => ({
+            ...s,
+            module: m,
+          }))
+        : s
+    )
+    .flat()
+
+  target.schedules = schedules.map((s) => {
     const r = new CourseSchedule()
     r.module = createDBModule(s.module)
     r.day = createDBDay(s.day)