fe/src/types/chore.ts

@@ -5,12 +5,12 @@ export type ChoreType = 'personal' | 'group'
 
 export interface Chore {
   id: number
-  group_id?: number
+  group_id?: number | null
   name: string
-  description?: string
+  description?: string | null
   created_by_id: number
   frequency: ChoreFrequency
-  custom_interval_days?: number
+  custom_interval_days?: number | null
   next_due_date: string
   last_completed_at?: string
   created_at: string
@@ -22,36 +22,23 @@ export interface Chore {
     email: string
   }
   assignments?: ChoreAssignment[]
+  is_completed: boolean
+  completed_at: string | null
 }
 
-export interface ChoreCreate {
-  name: string
-  description?: string
-  frequency: ChoreFrequency
-  custom_interval_days?: number
-  next_due_date: string
-  type: ChoreType
-  group_id?: number
-}
+export interface ChoreCreate extends Omit<Chore, 'id'> { }
 
-export interface ChoreUpdate {
-  name?: string
-  description?: string
-  frequency?: ChoreFrequency
-  custom_interval_days?: number
-  next_due_date?: string
-  type?: ChoreType
-  group_id?: number
-}
+export interface ChoreUpdate extends Partial<ChoreCreate> { }
 
 // Chore Assignment Types
 export interface ChoreAssignment {
   id: number
   chore_id: number
-  assigned_to_user_id: number
+  assigned_to_id: number
+  assigned_by_id: number
   due_date: string
   is_complete: boolean
-  completed_at?: string
+  completed_at: string | null
   created_at: string
   updated_at: string
   chore?: Chore
@@ -60,11 +47,11 @@ export interface ChoreAssignment {
 
 export interface ChoreAssignmentCreate {
   chore_id: number
-  assigned_to_user_id: number
+  assigned_to_id: number
   due_date: string
 }
 
 export interface ChoreAssignmentUpdate {
-  is_complete?: boolean
   due_date?: string
+  is_complete?: boolean
 }