opensoma 0.5.1 → 0.7.0

package/src/commands/mentoring.ts

@@ -11,7 +11,7 @@ import {
   buildDeleteMentoringPayload,
   buildMentoringPayload,
   buildUpdateMentoringPayload,
-  toMentoringType,
+  type ReceiptType,
 } from '../shared/utils/swmaestro'
 import { getHttpOrExit } from './helpers'
 
@@ -32,7 +32,10 @@ type CreateOptions = {
   venue: string
   maxAttendees?: string
   regStart?: string
+  regStartTime?: string
   regEnd?: string
+  regEndTime?: string
+  receiptType?: string
   content?: string
   pretty?: boolean
 }
@@ -45,7 +48,10 @@ type UpdateOptions = {
   venue?: string
   maxAttendees?: string
   regStart?: string
+  regStartTime?: string
   regEnd?: string
+  regEndTime?: string
+  receiptType?: string
   content?: string
   pretty?: boolean
 }
@@ -67,11 +73,12 @@ async function listAction(options: ListOptions): Promise<void> {
         user,
       }),
     )
+    const items = formatters.parseMentoringList(html)
     console.log(
       formatOutput(
         {
-          items: formatters.parseMentoringList(html),
-          pagination: formatters.parsePagination(html),
+          items,
+          pagination: formatters.parsePagination(html, { itemCount: items.length }),
         },
         options.pretty,
       ),
@@ -108,7 +115,10 @@ async function createAction(options: CreateOptions): Promise<void> {
         venue: options.venue,
         maxAttendees: options.maxAttendees ? Number.parseInt(options.maxAttendees, 10) : undefined,
         regStart: options.regStart,
+        regStartTime: options.regStartTime,
         regEnd: options.regEnd,
+        regEndTime: options.regEndTime,
+        receiptType: parseReceiptType(options.receiptType),
         content: options.content,
       }),
     )
@@ -118,29 +128,43 @@ async function createAction(options: CreateOptions): Promise<void> {
   }
 }
 
+function parseReceiptType(value: string | undefined): ReceiptType | undefined {
+  if (!value) return undefined
+  const normalized = value.toLowerCase()
+  if (normalized === 'direct') return 'DIRECT'
+  if (normalized === 'lecture' || normalized === 'until-lecture' || normalized === 'until_lecture')
+    return 'UNTIL_LECTURE'
+  throw new Error(`Invalid receipt type: ${value}. Expected "lecture" or "direct".`)
+}
+
 async function updateAction(id: string, options: UpdateOptions): Promise<void> {
   try {
     const http = await getHttpOrExit()
     const numId = Number.parseInt(id, 10)
-    const html = await http.get('/mypage/mentoLec/view.do', {
-      menuNo: MENU_NO.MENTORING,
-      qustnrSn: id,
-    })
-    const existing = formatters.parseMentoringDetail(html, numId)
+
+    const [editHtml, viewHtml] = await Promise.all([
+      http.get('/mypage/mentoLec/forUpdate.do', { menuNo: MENU_NO.MENTORING, qustnrSn: id }),
+      http.get('/mypage/mentoLec/view.do', { menuNo: MENU_NO.MENTORING, qustnrSn: id }),
+    ])
+    const existing = formatters.parseMentoringEditForm(editHtml, numId)
+    const existingContent = formatters.parseMentoringDetail(viewHtml, numId).content
 
     await http.postForm(
       '/mypage/mentoLec/update.do',
       buildUpdateMentoringPayload(numId, {
         title: options.title ?? existing.title,
-        type: options.type ?? toMentoringType(existing.type),
-        date: options.date ?? existing.sessionDate,
-        startTime: options.start ?? existing.sessionTime.start,
-        endTime: options.end ?? existing.sessionTime.end,
-        venue: options.venue ?? existing.venue,
-        maxAttendees: options.maxAttendees ? Number.parseInt(options.maxAttendees, 10) : existing.attendees.max,
-        regStart: options.regStart ?? existing.registrationPeriod.start,
-        regEnd: options.regEnd ?? existing.registrationPeriod.end,
-        content: options.content ?? existing.content,
+        type: options.type ?? (existing.reportCd === 'MRC020' ? 'lecture' : 'public'),
+        date: options.date ?? existing.eventDt,
+        startTime: options.start ?? existing.eventStime,
+        endTime: options.end ?? existing.eventEtime,
+        venue: options.venue ?? existing.place,
+        maxAttendees: options.maxAttendees ? Number.parseInt(options.maxAttendees, 10) : existing.applyCnt,
+        receiptType: parseReceiptType(options.receiptType) ?? existing.receiptType,
+        regStart: options.regStart ?? existing.bgndeDate,
+        regStartTime: options.regStartTime ?? existing.bgndeTime,
+        regEnd: options.regEnd ?? existing.enddeDate,
+        regEndTime: options.regEndTime ?? existing.enddeTime,
+        content: options.content ?? existingContent,
       }),
     )
     console.log(formatOutput({ ok: true }, options.pretty))
@@ -192,11 +216,12 @@ async function historyAction(options: HistoryOptions): Promise<void> {
       menuNo: MENU_NO.APPLICATION_HISTORY,
       ...(options.page ? { pageIndex: options.page } : {}),
     })
+    const items = formatters.parseApplicationHistory(html)
     console.log(
       formatOutput(
         {
-          items: formatters.parseApplicationHistory(html),
-          pagination: formatters.parsePagination(html),
+          items,
+          pagination: formatters.parsePagination(html, { itemCount: items.length }),
         },
         options.pretty,
       ),
@@ -231,12 +256,15 @@ export const mentoringCommand = new Command('mentoring')
       .requiredOption('--title <title>', 'Title')
       .requiredOption('--type <type>', 'Mentoring type (public|lecture)')
       .requiredOption('--date <date>', 'Session date')
-      .requiredOption('--start <time>', 'Start time')
-      .requiredOption('--end <time>', 'End time')
+      .requiredOption('--start <time>', 'Start time (HH:MM)')
+      .requiredOption('--end <time>', 'End time (HH:MM)')
       .requiredOption('--venue <venue>', 'Venue')
-      .option('--max-attendees <count>', 'Maximum attendees')
-      .option('--reg-start <date>', 'Registration start date')
-      .option('--reg-end <date>', 'Registration end date')
+      .option('--max-attendees <count>', 'Maximum attendees (public: 2-5, lecture: 6+)')
+      .option('--receipt-type <type>', 'Registration period type (lecture|direct, default: lecture)')
+      .option('--reg-start <date>', 'Registration start date (YYYY-MM-DD, default: session date)')
+      .option('--reg-start-time <time>', 'Registration start time (HH:MM, default: 00:00)')
+      .option('--reg-end <date>', 'Registration end date (YYYY-MM-DD, required when --receipt-type=direct)')
+      .option('--reg-end-time <time>', 'Registration end time (HH:MM, required when --receipt-type=direct)')
       .option('--content <html>', 'HTML content')
       .option('--pretty', 'Pretty print JSON output')
       .action(createAction),
@@ -248,12 +276,15 @@ export const mentoringCommand = new Command('mentoring')
       .option('--title <title>', 'Title')
       .option('--type <type>', 'Mentoring type (public|lecture)')
       .option('--date <date>', 'Session date')
-      .option('--start <time>', 'Start time')
-      .option('--end <time>', 'End time')
+      .option('--start <time>', 'Start time (HH:MM)')
+      .option('--end <time>', 'End time (HH:MM)')
       .option('--venue <venue>', 'Venue')
-      .option('--max-attendees <count>', 'Maximum attendees')
-      .option('--reg-start <date>', 'Registration start date')
-      .option('--reg-end <date>', 'Registration end date')
+      .option('--max-attendees <count>', 'Maximum attendees (public: 2-5, lecture: 6+)')
+      .option('--receipt-type <type>', 'Registration period type (lecture|direct)')
+      .option('--reg-start <date>', 'Registration start date (YYYY-MM-DD)')
+      .option('--reg-start-time <time>', 'Registration start time (HH:MM)')
+      .option('--reg-end <date>', 'Registration end date (YYYY-MM-DD)')
+      .option('--reg-end-time <time>', 'Registration end time (HH:MM)')
       .option('--content <html>', 'HTML content')
       .option('--pretty', 'Pretty print JSON output')
       .action(updateAction),

package/src/commands/notice.ts

@@ -16,9 +16,10 @@ async function listAction(options: ListOptions): Promise<void> {
       menuNo: MENU_NO.NOTICE,
       ...(options.page ? { pageIndex: options.page } : {}),
     })
+    const items = formatters.parseNoticeList(html)
     console.log(
       formatOutput(
-        { items: formatters.parseNoticeList(html), pagination: formatters.parsePagination(html) },
+        { items, pagination: formatters.parsePagination(html, { itemCount: items.length }) },
         options.pretty,
       ),
     )

package/src/commands/report.ts

@@ -79,9 +79,10 @@ async function listAction(options: ListOptions): Promise<void> {
       ...(options.search ? { searchWrd: options.search } : {}),
     })
 
+    const items = formatters.parseReportList(html)
     console.log(
       formatOutput(
-        { items: formatters.parseReportList(html), pagination: formatters.parsePagination(html) },
+        { items, pagination: formatters.parsePagination(html, { itemCount: items.length }) },
         options.pretty,
       ),
     )
@@ -114,9 +115,10 @@ async function approvalAction(options: ApprovalOptions): Promise<void> {
       ...(options.type ? { searchReport: options.type } : {}),
     })
 
+    const items = formatters.parseApprovalList(html)
     console.log(
       formatOutput(
-        { items: formatters.parseApprovalList(html), pagination: formatters.parsePagination(html) },
+        { items, pagination: formatters.parsePagination(html, { itemCount: items.length }) },
         options.pretty,
       ),
     )

package/src/commands/room.ts

@@ -1,9 +1,15 @@
 import { Command } from 'commander'
 
+import { MENU_NO } from '../constants'
 import * as formatters from '../formatters'
 import { handleError } from '../shared/utils/error-handler'
 import { formatOutput } from '../shared/utils/output'
-import { buildRoomReservationPayload, resolveRoomId } from '../shared/utils/swmaestro'
+import {
+  buildRoomCancelPayload,
+  buildRoomReservationPayload,
+  buildRoomUpdatePayload,
+  resolveRoomId,
+} from '../shared/utils/swmaestro'
 import { getHttpOrExit } from './helpers'
 
 type ListOptions = { date?: string; room?: string; reservations?: boolean; pretty?: boolean }
@@ -17,6 +23,26 @@ type ReserveOptions = {
   notes?: string
   pretty?: boolean
 }
+type GetOptions = { pretty?: boolean }
+type UpdateOptions = {
+  title?: string
+  room?: string
+  date?: string
+  slots?: string
+  attendees?: string
+  notes?: string
+  pretty?: boolean
+}
+type CancelOptions = { pretty?: boolean }
+type ReservationsOptions = {
+  status?: string
+  startDate?: string
+  endDate?: string
+  page?: string
+  pretty?: boolean
+}
+
+const ROOM_UPDATE_SUCCESS_PATTERN = /정상적으로|수정하였습니다|수정되었습니다|저장되었습니다|취소되었습니다/
 
 async function listAction(options: ListOptions): Promise<void> {
   try {
@@ -59,6 +85,35 @@ async function listAction(options: ListOptions): Promise<void> {
   }
 }
 
+async function reservationsAction(options: ReservationsOptions): Promise<void> {
+  try {
+    const status = options.status ?? 'confirmed'
+    if (status !== 'confirmed' && status !== 'cancelled' && status !== 'all') {
+      throw new Error(`Invalid --status value: ${status}. Use 'confirmed', 'cancelled', or 'all'.`)
+    }
+
+    const http = await getHttpOrExit()
+    const params: Record<string, string> = {
+      menuNo: MENU_NO.ROOM,
+      pageIndex: options.page ?? '1',
+    }
+    if (options.startDate) params.sdate = options.startDate
+    if (options.endDate) params.edate = options.endDate
+    if (status === 'confirmed') params.searchStat = 'RS001'
+    if (status === 'cancelled') params.searchStat = 'RS002'
+
+    const html = await http.get('/mypage/itemRent/list.do', params)
+    const items = formatters.parseRoomReservationList(html)
+    const result = {
+      items,
+      pagination: formatters.parsePagination(html, { itemCount: items.length }),
+    }
+    console.log(formatOutput(result, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
 async function availableAction(roomId: string, options: AvailableOptions): Promise<void> {
   try {
     const http = await getHttpOrExit()
@@ -96,6 +151,73 @@ async function reserveAction(options: ReserveOptions): Promise<void> {
   }
 }
 
+async function fetchReservationDetail(http: Awaited<ReturnType<typeof getHttpOrExit>>, rentId: number) {
+  return formatters.parseRoomReservationDetail(
+    await http.get('/mypage/itemRent/view.do', { menuNo: MENU_NO.ROOM, rentId: String(rentId) }),
+  )
+}
+
+async function postRoomMutation(
+  http: Awaited<ReturnType<typeof getHttpOrExit>>,
+  payload: Record<string, string>,
+): Promise<void> {
+  try {
+    await http.post('/mypage/itemRent/update.do', payload)
+  } catch (error) {
+    if (error instanceof Error && ROOM_UPDATE_SUCCESS_PATTERN.test(error.message)) {
+      return
+    }
+    throw error
+  }
+}
+
+async function getAction(rentIdArg: string, options: GetOptions): Promise<void> {
+  try {
+    const http = await getHttpOrExit()
+    const rentId = Number.parseInt(rentIdArg, 10)
+    const detail = await fetchReservationDetail(http, rentId)
+    console.log(formatOutput(detail, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function updateAction(rentIdArg: string, options: UpdateOptions): Promise<void> {
+  try {
+    const http = await getHttpOrExit()
+    const rentId = Number.parseInt(rentIdArg, 10)
+    const existing = await fetchReservationDetail(http, rentId)
+    const slots = options.slots
+      ?.split(',')
+      .map((slot) => slot.trim())
+      .filter(Boolean)
+    const payload = buildRoomUpdatePayload(existing, {
+      title: options.title,
+      roomId: options.room ? resolveRoomId(options.room) : undefined,
+      date: options.date,
+      slots: slots?.length ? slots : undefined,
+      attendees: options.attendees ? Number.parseInt(options.attendees, 10) : undefined,
+      notes: options.notes,
+    })
+    await postRoomMutation(http, payload)
+    console.log(formatOutput({ ok: true, rentId }, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function cancelAction(rentIdArg: string, options: CancelOptions): Promise<void> {
+  try {
+    const http = await getHttpOrExit()
+    const rentId = Number.parseInt(rentIdArg, 10)
+    const existing = await fetchReservationDetail(http, rentId)
+    await postRoomMutation(http, buildRoomCancelPayload(existing))
+    console.log(formatOutput({ ok: true, rentId }, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
 export const roomCommand = new Command('room')
   .description('Manage room reservations')
   .addCommand(
@@ -127,3 +249,40 @@ export const roomCommand = new Command('room')
       .option('--pretty', 'Pretty print JSON output')
       .action(reserveAction),
   )
+  .addCommand(
+    new Command('get')
+      .description('Show a single reservation by rentId')
+      .argument('<rentId>', 'Reservation ID returned from view.do')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(getAction),
+  )
+  .addCommand(
+    new Command('update')
+      .description('Update an existing reservation (any subset of fields)')
+      .argument('<rentId>', 'Reservation ID returned from view.do')
+      .option('--title <title>', 'New title')
+      .option('--room <room>', 'New room ID or short name')
+      .option('--date <date>', 'New reservation date (YYYY-MM-DD)')
+      .option('--slots <slots>', 'New comma-separated HH:MM values')
+      .option('--attendees <count>', 'New number of attendees')
+      .option('--notes <notes>', 'New notes')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(updateAction),
+  )
+  .addCommand(
+    new Command('cancel')
+      .description('Cancel an existing reservation')
+      .argument('<rentId>', 'Reservation ID returned from view.do')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(cancelAction),
+  )
+  .addCommand(
+    new Command('reservations')
+      .description("List the user's room reservations")
+      .option('--status <status>', "Filter by status: 'confirmed' (default), 'cancelled', or 'all'")
+      .option('--start-date <date>', 'Earliest reservation date (YYYY-MM-DD)')
+      .option('--end-date <date>', 'Latest reservation date (YYYY-MM-DD)')
+      .option('--page <page>', 'Page number', '1')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(reservationsAction),
+  )

package/src/commands/schedule.ts

@@ -0,0 +1,32 @@
+import { Command } from 'commander'
+
+import { MENU_NO } from '../constants'
+import * as formatters from '../formatters'
+import { handleError } from '../shared/utils/error-handler'
+import { formatOutput } from '../shared/utils/output'
+import { getHttpOrExit } from './helpers'
+
+type ListOptions = { page?: string; pretty?: boolean }
+
+async function listAction(options: ListOptions): Promise<void> {
+  try {
+    const http = await getHttpOrExit()
+    const html = await http.get('/mypage/schedule/list.do', {
+      menuNo: MENU_NO.SCHEDULE,
+      ...(options.page ? { pageIndex: options.page } : {}),
+    })
+    console.log(formatOutput(formatters.parseScheduleList(html), options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+export const scheduleCommand = new Command('schedule')
+  .description('Browse monthly schedules')
+  .addCommand(
+    new Command('list')
+      .description('List monthly schedules')
+      .option('--page <n>', 'Page number')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(listAction),
+  )

package/src/commands/team.ts

@@ -1,25 +1,93 @@
 import { Command } from 'commander'
 
-import { MENU_NO } from '../constants'
 import * as formatters from '../formatters'
 import { handleError } from '../shared/utils/error-handler'
 import { formatOutput } from '../shared/utils/output'
+import { buildTeamActionPayload } from '../shared/utils/team-action-params'
+import { buildTeamListParams, parseTeamSearchQuery } from '../shared/utils/team-params'
 import { getHttpOrExit } from './helpers'
 
-type ShowOptions = { pretty?: boolean }
+type ListOptions = { search?: string; pretty?: boolean }
+type ActionOptions = { pretty?: boolean }
 
-async function showAction(options: ShowOptions): Promise<void> {
+async function listAction(options: ListOptions): Promise<void> {
   try {
     const http = await getHttpOrExit()
-    const html = await http.get('/mypage/myTeam/team.do', { menuNo: MENU_NO.TEAM })
+    const search = options.search ? parseTeamSearchQuery(options.search) : undefined
+    const user = search?.me ? ((await http.checkLogin()) ?? undefined) : undefined
+    const html = await http.get('/mypage/myTeam/team.do', buildTeamListParams({ search, user }))
     console.log(formatOutput(formatters.parseTeamInfo(html), options.pretty))
   } catch (error) {
     handleError(error)
   }
 }
 
+async function joinAction(teamId: string, options: ActionOptions): Promise<void> {
+  await runTeamAction({
+    teamId,
+    path: '/mypage/myTeam/updateUserTeamIn.json',
+    failureMessage: '팀 참여에 실패했습니다.',
+    pretty: options.pretty,
+  })
+}
+
+async function leaveAction(teamId: string, options: ActionOptions): Promise<void> {
+  await runTeamAction({
+    teamId,
+    path: '/mypage/myTeam/updateUserTeamOut.json',
+    failureMessage: '팀 탈퇴에 실패했습니다.',
+    pretty: options.pretty,
+  })
+}
+
+async function runTeamAction(params: {
+  teamId: string
+  path: string
+  failureMessage: string
+  pretty?: boolean
+}): Promise<void> {
+  try {
+    const http = await getHttpOrExit()
+    const user = await http.checkLogin()
+    if (!user) throw new Error('Not logged in. Run: opensoma auth login or opensoma auth extract')
+    if (!user.userNo) throw new Error('현재 사용자의 userNo를 확인할 수 없습니다.')
+
+    const response = await http.postJson<{ resultCode?: string }>(
+      params.path,
+      buildTeamActionPayload(params.teamId, user),
+    )
+    if (response.resultCode !== 'success') {
+      throw new Error(params.failureMessage)
+    }
+    console.log(formatOutput({ ok: true }, params.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
 export const teamCommand = new Command('team')
   .description('Show team information')
   .addCommand(
-    new Command('show').description('Show team').option('--pretty', 'Pretty print JSON output').action(showAction),
+    new Command('list')
+      .description('List teams')
+      .option(
+        '--search <query>',
+        'Search (e.g. "keyword", "team:오픈소마", "mentor:@me", "member:@me", "project:Previzion")',
+      )
+      .option('--pretty', 'Pretty print JSON output')
+      .action(listAction),
+  )
+  .addCommand(
+    new Command('join')
+      .description('Join a team')
+      .argument('<teamId>')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(joinAction),
+  )
+  .addCommand(
+    new Command('leave')
+      .description('Leave a team')
+      .argument('<teamId>')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(leaveAction),
   )

package/src/commands/toz.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, it } from 'bun:test'
+
+import { resolveTozIdentity, resolveTozPin } from './toz'
+
+describe('resolveTozIdentity', () => {
+  it('uses flag values before stored identity', async () => {
+    const identity = await resolveTozIdentity('Mentor One', '010-1111-2222', {
+      promptPhone: async () => '010-3333-4444',
+      store: {
+        getTozIdentity: async () => ({ name: 'Mentor Two', phone: '010-5555-6666' }),
+      },
+    })
+
+    expect(identity).toEqual({ name: 'Mentor One', phone: '010-1111-2222' })
+  })
+
+  it('prompts for phone when name is available but phone is missing', async () => {
+    const identity = await resolveTozIdentity('Mentor One', undefined, {
+      promptPhone: async () => '010-3333-4444',
+      store: {
+        getTozIdentity: async () => null,
+      },
+    })
+
+    expect(identity).toEqual({ name: 'Mentor One', phone: '010-3333-4444' })
+  })
+
+  it('keeps non-interactive callers failing when phone is missing', async () => {
+    await expect(
+      resolveTozIdentity('Mentor One', undefined, {
+        store: {
+          getTozIdentity: async () => null,
+        },
+      }),
+    ).rejects.toThrow(/Toz identity not set/)
+  })
+})
+
+describe('resolveTozPin', () => {
+  it('uses the flag value before prompting', async () => {
+    const pin = await resolveTozPin('123456', async () => '654321')
+
+    expect(pin).toBe('123456')
+  })
+
+  it('prompts when the flag value is missing', async () => {
+    const pin = await resolveTozPin(undefined, async () => '654321')
+
+    expect(pin).toBe('654321')
+  })
+})