diff --git a/src/modules/record/interfaces/recordable.ts b/src/modules/record/interfaces/recordable.ts index 751f774..2fa05a1 100644 --- a/src/modules/record/interfaces/recordable.ts +++ b/src/modules/record/interfaces/recordable.ts @@ -1,14 +1,10 @@ import type { ISODate } from '@/shared/types/date' -import type { StepRecordable } from './step-recordable' +import type { TimeRange } from './time-range' export interface Recordable { taskId: string - /** - * @deprecated - * TODO: Compute this data from step records - */ start: ISODate end?: ISODate - stepRecords: Record + stepRecords: Record notes: string } diff --git a/src/modules/record/interfaces/step-recordable.ts b/src/modules/record/interfaces/time-range.ts similarity index 71% rename from src/modules/record/interfaces/step-recordable.ts rename to src/modules/record/interfaces/time-range.ts index 0ec4e3c..1d7ec92 100644 --- a/src/modules/record/interfaces/step-recordable.ts +++ b/src/modules/record/interfaces/time-range.ts @@ -1,6 +1,6 @@ import type { ISODate } from '@/shared/types/date' -export interface StepRecordable { +export interface TimeRange { start: ISODate end?: ISODate } diff --git a/src/modules/record/models/task-record.ts b/src/modules/record/models/task-record.ts index 10faef3..857e5bf 100644 --- a/src/modules/record/models/task-record.ts +++ b/src/modules/record/models/task-record.ts @@ -1,11 +1,11 @@ import { toISODate, type ISODate } from '@/shared/types/date' import type { Recordable } from '../interfaces/recordable' -import type { StepRecordable } from '../interfaces/step-recordable' +import type { TimeRange } from '../interfaces/time-range' export class TaskRecord implements Recordable { public start: ISODate = toISODate(new Date()) public end: ISODate | undefined = undefined - public stepRecords: Record = {} + public stepRecords: Record = {} public notes = '' public constructor(public readonly taskId: string) {} diff --git a/src/modules/record/stores/useTaskRecordStore.ts b/src/modules/record/stores/useTaskRecordStore.ts index 0b87a1f..1f5416e 100644 --- a/src/modules/record/stores/useTaskRecordStore.ts +++ b/src/modules/record/stores/useTaskRecordStore.ts @@ -1,7 +1,7 @@ import { toISODate, type ISODate } from '@/shared/types/date' import { defineStore } from 'pinia' import type { Recordable } from '../interfaces/recordable' -import type { StepRecordable } from '../interfaces/step-recordable' +import type { TimeRange } from '../interfaces/time-range' import { TaskRecord } from '../models/task-record' export interface TaskRecordStoreState { @@ -133,7 +133,7 @@ export const useTaskRecordStore = defineStore('task-record-store', { return (taskId: string): Recordable | null => this.records[taskId] ?? null }, getStepRecord() { - return (taskId: string, stepId: string): StepRecordable | null => + return (taskId: string, stepId: string): TimeRange | null => this.records[taskId]?.stepRecords[stepId] ?? null }, getRecordNotes() {