Fix dayjs imports and emit full names

Author: broad-well

src/umich/catalog.ts

@@ -1,7 +1,7 @@
 import assert from 'assert'
 import dayjs from 'dayjs'
 import customParseFormat from 'dayjs/plugin/customParseFormat.js'
-import timezone from 'dayjs/plugin/timezone'
+import timezone from 'dayjs/plugin/timezone.js'
 import type { CourseCatalog } from '../catalog'
 import { CourseInfo, CourseSchedule, EnrollmentStats, Meeting, Section } from '../entities'
 import { ClassInstructor, Instructor, AllSectionsSectionJson, SectionQuerySectionJson, FullMeetingElement, BaseSectionJson, ClassQuerySectionJson, FullInstructor } from './api_types'
@@ -334,7 +334,7 @@ function parseClassInstructor (instr: ClassInstructor): Section['instructors'][n
   }
   return {
     id: instr.InstrUniqname.toLowerCase(),
-    name: tokens.groups.last
+    name: tokens.groups.first + ' ' + tokens.groups.last
   }
 }
 
@@ -345,7 +345,7 @@ function parseFullInstructor (instr: FullInstructor): Section['instructors'][num
   }
   return {
     id: instr.Uniqname.toLowerCase(),
-    name: instr.LastName
+    name: instr.FirstName + ' ' + instr.LastName
   }
 }
 

src/umich/local_db.ts

@@ -1,7 +1,7 @@
 import Database from 'better-sqlite3'
 import { join } from 'path'
-import utc from 'dayjs/plugin/utc'
-import timezone from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc.js'
+import timezone from 'dayjs/plugin/timezone.js'
 import dayjs from 'dayjs'
 
 dayjs.extend(utc)

test/umich/catalog.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import dayjs from 'dayjs'
-import utc from 'dayjs/plugin/utc'
-import timezone from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc.js'
+import timezone from 'dayjs/plugin/timezone.js'
 import { DayOfWeek, EnrollmentStats, Section } from '../../src/entities'
 import { UMichCatalog } from '../../src/umich/catalog'
 import * as dotenv from 'dotenv'
@@ -41,7 +41,7 @@ describe("test catalog", () => {
       seatsOpen: 2,
       classNumber: 21181,
       component: 'LAB',
-      instructors: [{id: 'mipeng', name: 'Peng'}],
+      instructors: [{id: 'mipeng', name: 'Michael Peng'}],
       meetings: [{
         days: new Set([DayOfWeek.Wednesday]),
         startDate: dayjs.utc('2023-01-04').tz('America/New_York').toDate(),
@@ -80,7 +80,7 @@ describe("test catalog", () => {
     expect(section005.meetings[0].location).toStrictEqual({code: 'REMOTE', lat: undefined, lon: undefined})
     expect(section005.instructors).toStrictEqual([{
       id: 'mburak',
-      name: 'Burak'
+      name: 'Mariana Burak'
     }])
   })
 

test/umich/parse_csv.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import dayjs from 'dayjs'
-import utc from 'dayjs/plugin/utc'
-import timezone from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc.js'
+import timezone from 'dayjs/plugin/timezone.js'
 import { CsvCatalogStore, parseCsvRow } from '../../src/umich/local_db'
 
 dayjs.extend(utc)