resolved conflicts

enpit-super-koyomi · Jan 17, 2025 · 4e9857b · 4e9857b
2 parents 8fdab99 + 98463eb
commit 4e9857b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/app/adjust/WeekView.tsx b/src/app/adjust/WeekView.tsx
@@ -54,7 +54,6 @@ export function WeekView({
   const handlePreviousWeek = () => {
     setCurrentWeekIndex(prevIndex => Math.max(prevIndex - 1, 0))
   }
-  console.log("coursePeriods:", coursePeriods)
 
   /** @todo Reduce this TOO DEEP nest */
   return (

diff --git a/src/app/adjust/candidate.tsx b/src/app/adjust/candidate.tsx
@@ -38,26 +38,21 @@ export default function Candidate(props: Props) {
   }, [props.title])
 
   // 自分の授業とその時間の配列
-  const coursePeriods: CoursePeriod[] = props.courses.map(course => ({
-    course,
-    periods: courseToPeriods(new Date(), course),
-  }))
+  const coursePeriods: CoursePeriod[] = coursePeriodsThroughWeeks(props.courses, new Date())
 
   async function handleSchedule() {
     setIsButtonActive(false)
     try {
       // 招待相手ごとの授業とその時間の配列
-      const coursePeriodsOfGuests: CoursePeriod[][] = (
+      const coursesOfGuests: Course[][] = (
         await Promise.all(props.selectedUserIds.map(getUserCourseCodes))
       ).map(codes =>
         props.allCourses
           .filter(({ code }) => codes.includes(code))
-          .map(course => ({
-            course,
-            periods: courseToPeriods(new Date(), course),
-          })),
       )
 
+      const coursePeriodsOfGuests = coursesOfGuests.map(courses => coursePeriodsThroughWeeks(courses, new Date()))
+
       console.debug("自分の授業とその時間の配列", coursePeriods)
       console.debug("招待相手ごとの授業とその時間の配列", coursePeriodsOfGuests)
 
@@ -151,12 +146,11 @@ export default function Candidate(props: Props) {
           handlePeriodClick={handlePeriodClick}
           periods={freePeriods}
           isButtonActive={isButtonActive}
-          courses={props.courses}
+          coursePeriods={coursePeriods}
         />
       ) : (
         ""
       )}
-
     </div>
   )
 }