Merge pull request #128 from ZDK-UTsukuba/add-2025-kdb-data

2025年度のKdBリニューアルに対応したデータにした。

Author: 8128-33550336

src/components/ClassListItem.astro

@@ -30,8 +30,9 @@ const calcAve = (numOrObj: number | { sum: number; count: number }) => {
     : numOrObj.sum / numOrObj.count;
 };
 
-const colleges: string[] =
-  subject.type === "体育" ? [subject.subject_category] : [];
+const colleges: string[] = [
+  ...new Set(kdbs.map((v) => v.affiliation.name)),
+].flatMap((v) => (v ? [v] : []));
 const teachers: {
   name: string;
   image?: string;

src/content/subjectsSchema.ts

@@ -19,7 +19,11 @@ type Module =
   | "springVacation";
 type ModuleTimeTable = Record<Module, readonly TimeTable[]>;
 
-type Hierarchy = readonly { value: string | null; text: string }[];
+type Requisite = {
+  id: string;
+  name: string;
+  hasLower: boolean;
+} | null;
 
 type InstructionalType = {
   text: string;
@@ -33,56 +37,67 @@ type InstructionalType = {
 };
 
 type MergedSubject = {
-  code: string;
-  name: string;
+  code: string; // 科目番号
+  name: string; // 科目名
+  syllabusLatestLink: string | null; // シラバス最新リンク
   instructionalType: {
     value: InstructionalType | null;
     kdbRaw: string | null;
-  };
+  }; // 授業方法
   credits: {
     value:
       | {
-          type: "number";
+          type: "normal";
           value: number;
         }
       | {
           type: "none";
         }
+      | {
+          type: "unknown";
+        }
       | null;
     kdbRaw: string | null;
-  };
+  }; // 単位数
   year: {
-    value: number[];
+    value:
+      | {
+          type: "normal";
+          value: readonly number[];
+        }
+      | {
+          type: "unknown";
+        };
     kdbRaw: string | null;
     twinsRaw: string | null;
-  };
+  }; // 標準履修年次
   terms: {
-    term: Terms | null;
-    module: string | null;
-    weekdayAndPeriod: string | null;
-    moduleTimeTable: ModuleTimeTable | null;
+    term: Terms | null; // 学期
+    module: string | null; // 実施学期
+    weekdayAndPeriod: string | null; // 曜時限
+    moduleTimeTable: ModuleTimeTable | null; // モジュール時間割
 
     twinsRaw: {
       term: string;
       module: string;
     } | null;
   };
-  classroom: null;
+  classroom: null; // 教室
   instructor: {
     value: string[];
 
     kdbRaw: string | null;
     twinsRaw: string | null;
-  };
-  overview: string | null;
-  remarks: string | null;
-  auditor: string | null;
-  conditionsForAuditors: string | null;
+  }; // 担当教員
+  overview: string | null; // 授業概要
+  remarks: string | null; // 備考
+  auditor: string | null; // 科目等履修生申請可否
+  conditionsForAuditors: string | null; // 申請条件
   exchangeStudent: string | null;
-  conditionsForExchangeStudents: string | null;
-  JaEnCourseName: string | null;
-  parentNumber: string | null;
-  parentCourseName: string | null;
+  conditionsForExchangeStudents: string | null; // 申請条件
+  JaEnCourseName: string | null; // 英語(日本語)科目名
+  parentNumber: string | null; // 科目コード
+  parentCourseName: string | null; // 要件科目名
 
   affiliation: {
     name: string | null;
@@ -94,9 +109,7 @@ type MergedSubject = {
     } | null;
   };
 
-  kdbDataUpdateDate: string | null;
-
-  hierarchy: Hierarchy[];
+  requisite: Requisite[];
 };
 
 const TermsSchema = z.union([
@@ -139,9 +152,13 @@ const ModuleTimeTableSchema = z.object({
   fallC: z.array(TimeTableSchema),
   springVacation: z.array(TimeTableSchema),
 });
-const HierarchySchema = z.array(
-  z.object({ value: z.string().nullable(), text: z.string() }),
-);
+const RequisiteSchema = z
+  .object({
+    id: z.string(),
+    name: z.string(),
+    hasLower: z.boolean(),
+  })
+  .nullable();
 const InstructionalTypeSchema = z.object({
   text: z.string(),
   flags: z.object({
@@ -155,6 +172,7 @@ const InstructionalTypeSchema = z.object({
 const MergedSubjectSchema = z.object({
   code: z.string(),
   name: z.string(),
+  syllabusLatestLink: z.string().nullable(),
   instructionalType: z.object({
     value: InstructionalTypeSchema.nullable(),
     kdbRaw: z.string().nullable(),
@@ -163,16 +181,23 @@ const MergedSubjectSchema = z.object({
     value: z
       .union([
         z.object({
-          type: z.literal("number"),
+          type: z.literal("normal"),
           value: z.number(),
         }),
         z.object({ type: z.literal("none") }),
+        z.object({ type: z.literal("unknown") }),
       ])
       .nullable(),
     kdbRaw: z.string().nullable(),
   }),
   year: z.object({
-    value: z.array(z.number()),
+    value: z.union([
+      z.object({
+        type: z.literal("normal"),
+        value: z.array(z.number()),
+      }),
+      z.object({ type: z.literal("unknown") }),
+    ]),
     kdbRaw: z.string().nullable(),
     twinsRaw: z.string().nullable(),
   }),
@@ -220,7 +245,7 @@ const MergedSubjectSchema = z.object({
 
   kdbDataUpdateDate: z.string().nullable(),
 
-  hierarchy: z.array(HierarchySchema),
+  requisite: z.array(RequisiteSchema),
 });
 
 const SubjectsSchema = z.array(MergedSubjectSchema);
@@ -229,8 +254,8 @@ const parsedSubjects: readonly MergedSubject[] = (() => {
   try {
     return SubjectsSchema.parse(subjectsMergedJson);
   } catch (error) {
-    console.error("Failed to parse subjects:", JSON.stringify(error, null, 4));
-    throw new Error("Failed to parse subjects");
+    // console.error("Failed to parse subjects:", JSON.stringify(error, null, 4));
+    throw new Error("Failed to parse subjects", { cause: error });
   }
 })();
 

src/pages/details/[id].astro

@@ -119,8 +119,8 @@ const params =
   <div class={pageStyles.body}>
     <h1 class={pageStyles.title}>{subject.name}</h1>
     {
-      subject.type === "体育" && (
-        <span class={pageStyles.category}>{subject.subject_category}</span>
+      [...new Set(kdbs.map((v) => v.affiliation.name))].map(
+        (v) => v && <span class={pageStyles.category}>{v}</span>,
       )
     }
     {
@@ -507,17 +507,20 @@ const params =
               <div class={pageStyles.item}>
                 <div class={pageStyles.label}>単位</div>
                 <div class={pageStyles.content}>
-                  {kdbSubject.credits.value === null
+                  {kdbSubject.credits.value === null ||
+                  kdbSubject.credits.value.type === "unknown"
                     ? ""
-                    : kdbSubject.credits.value.type === "number"
-                      ? kdbSubject.credits.value?.value
-                      : "-"}
+                    : kdbSubject.credits.value.type === "none"
+                      ? "-"
+                      : kdbSubject.credits.value.value}
                 </div>
               </div>
               <div class={pageStyles.item}>
                 <div class={pageStyles.label}>標準履修年次</div>
                 <div class={pageStyles.content}>
-                  {kdbSubject.year.value.join(", ")}
+                  {kdbSubject.year.value.type === "unknown"
+                    ? "-"
+                    : kdbSubject.year.value.value.join(", ")}
                 </div>
               </div>
               <div class={pageStyles.item}>