This refactor eliminates duplicate task logic across the codebase by creating a centralized task package with three layers: - predicates/: Pure Go functions defining task state logic (IsCompleted, IsOverdue, IsDueSoon, IsUpcoming, IsActive, IsInProgress, EffectiveDate) - scopes/: GORM scope functions mirroring predicates for database queries - categorization/: Chain of Responsibility pattern for kanban column assignment Key fixes: - Fixed PostgreSQL DATE vs TIMESTAMP comparison bug in scopes (added explicit ::timestamp casts) that caused summary/kanban count mismatches - Fixed models/task.go IsOverdue() and IsDueSoon() to use EffectiveDate (NextDueDate ?? DueDate) instead of only DueDate - Removed duplicate isTaskCompleted() helpers from task_repo.go and task_button_types.go Files refactored to use consolidated logic: - task_repo.go: Uses scopes for statistics, predicates for filtering - task_button_types.go: Uses predicates instead of inline logic - responses/task.go: Delegates to categorization package - dashboard_handler.go: Uses scopes for task statistics - residence_service.go: Uses predicates for report generation - worker/jobs/handler.go: Documented SQL with predicate references Added comprehensive tests: - predicates_test.go: Unit tests for all predicate functions - scopes_test.go: Integration tests verifying scopes match predicates - consistency_test.go: Three-layer consistency tests ensuring predicates, scopes, and categorization all return identical results 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
226 lines
9.2 KiB
Go
226 lines
9.2 KiB
Go
package models
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/shopspring/decimal"
|
|
)
|
|
|
|
// TaskCategory represents the task_taskcategory table
|
|
type TaskCategory struct {
|
|
BaseModel
|
|
Name string `gorm:"column:name;size:50;not null" json:"name"`
|
|
Description string `gorm:"column:description;type:text" json:"description"`
|
|
Icon string `gorm:"column:icon;size:50" json:"icon"`
|
|
Color string `gorm:"column:color;size:7" json:"color"` // Hex color
|
|
DisplayOrder int `gorm:"column:display_order;default:0" json:"display_order"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (TaskCategory) TableName() string {
|
|
return "task_taskcategory"
|
|
}
|
|
|
|
// TaskPriority represents the task_taskpriority table
|
|
type TaskPriority struct {
|
|
BaseModel
|
|
Name string `gorm:"column:name;size:20;not null" json:"name"`
|
|
Level int `gorm:"column:level;not null" json:"level"` // 1=low, 2=medium, 3=high, 4=urgent
|
|
Color string `gorm:"column:color;size:7" json:"color"`
|
|
DisplayOrder int `gorm:"column:display_order;default:0" json:"display_order"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (TaskPriority) TableName() string {
|
|
return "task_taskpriority"
|
|
}
|
|
|
|
// TaskStatus represents the task_taskstatus table
|
|
type TaskStatus struct {
|
|
BaseModel
|
|
Name string `gorm:"column:name;size:20;not null" json:"name"`
|
|
Description string `gorm:"column:description;type:text" json:"description"`
|
|
Color string `gorm:"column:color;size:7" json:"color"`
|
|
DisplayOrder int `gorm:"column:display_order;default:0" json:"display_order"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (TaskStatus) TableName() string {
|
|
return "task_taskstatus"
|
|
}
|
|
|
|
// TaskFrequency represents the task_taskfrequency table
|
|
type TaskFrequency struct {
|
|
BaseModel
|
|
Name string `gorm:"column:name;size:20;not null" json:"name"`
|
|
Days *int `gorm:"column:days" json:"days"` // Number of days between occurrences (nil = one-time)
|
|
DisplayOrder int `gorm:"column:display_order;default:0" json:"display_order"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (TaskFrequency) TableName() string {
|
|
return "task_taskfrequency"
|
|
}
|
|
|
|
// Task represents the task_task table
|
|
type Task struct {
|
|
BaseModel
|
|
ResidenceID uint `gorm:"column:residence_id;index;not null" json:"residence_id"`
|
|
Residence Residence `gorm:"foreignKey:ResidenceID" json:"residence,omitempty"`
|
|
CreatedByID uint `gorm:"column:created_by_id;index;not null" json:"created_by_id"`
|
|
CreatedBy User `gorm:"foreignKey:CreatedByID" json:"created_by,omitempty"`
|
|
AssignedToID *uint `gorm:"column:assigned_to_id;index" json:"assigned_to_id"`
|
|
AssignedTo *User `gorm:"foreignKey:AssignedToID" json:"assigned_to,omitempty"`
|
|
|
|
Title string `gorm:"column:title;size:200;not null" json:"title"`
|
|
Description string `gorm:"column:description;type:text" json:"description"`
|
|
|
|
CategoryID *uint `gorm:"column:category_id;index" json:"category_id"`
|
|
Category *TaskCategory `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
|
|
PriorityID *uint `gorm:"column:priority_id;index" json:"priority_id"`
|
|
Priority *TaskPriority `gorm:"foreignKey:PriorityID" json:"priority,omitempty"`
|
|
StatusID *uint `gorm:"column:status_id;index" json:"status_id"`
|
|
Status *TaskStatus `gorm:"foreignKey:StatusID" json:"status,omitempty"`
|
|
FrequencyID *uint `gorm:"column:frequency_id;index" json:"frequency_id"`
|
|
Frequency *TaskFrequency `gorm:"foreignKey:FrequencyID" json:"frequency,omitempty"`
|
|
|
|
DueDate *time.Time `gorm:"column:due_date;type:date;index" json:"due_date"`
|
|
NextDueDate *time.Time `gorm:"column:next_due_date;type:date;index" json:"next_due_date"` // For recurring tasks, updated after each completion
|
|
EstimatedCost *decimal.Decimal `gorm:"column:estimated_cost;type:decimal(10,2)" json:"estimated_cost"`
|
|
ActualCost *decimal.Decimal `gorm:"column:actual_cost;type:decimal(10,2)" json:"actual_cost"`
|
|
|
|
// Contractor association
|
|
ContractorID *uint `gorm:"column:contractor_id;index" json:"contractor_id"`
|
|
// Contractor *Contractor `gorm:"foreignKey:ContractorID" json:"contractor,omitempty"`
|
|
|
|
// State flags
|
|
IsCancelled bool `gorm:"column:is_cancelled;default:false;index" json:"is_cancelled"`
|
|
IsArchived bool `gorm:"column:is_archived;default:false;index" json:"is_archived"`
|
|
|
|
// Parent task for recurring tasks
|
|
ParentTaskID *uint `gorm:"column:parent_task_id;index" json:"parent_task_id"`
|
|
ParentTask *Task `gorm:"foreignKey:ParentTaskID" json:"parent_task,omitempty"`
|
|
|
|
// Completions
|
|
Completions []TaskCompletion `gorm:"foreignKey:TaskID" json:"completions,omitempty"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (Task) TableName() string {
|
|
return "task_task"
|
|
}
|
|
|
|
// IsOverdue returns true if the task is past its due date and not completed.
|
|
//
|
|
// IMPORTANT: This method delegates to the predicates package which is the
|
|
// single source of truth for task logic. It uses EffectiveDate (NextDueDate ?? DueDate)
|
|
// rather than just DueDate, ensuring consistency with kanban categorization.
|
|
//
|
|
// Deprecated: Prefer using task.IsOverdue(t, time.Now().UTC()) directly for explicit time control.
|
|
func (t *Task) IsOverdue() bool {
|
|
// Delegate to predicates package - single source of truth
|
|
// Import is avoided here to prevent circular dependency.
|
|
// Logic must match predicates.IsOverdue exactly:
|
|
// - Check active (not cancelled, not archived)
|
|
// - Check not completed (NextDueDate != nil || no completions)
|
|
// - Check effective date < now
|
|
if t.IsCancelled || t.IsArchived {
|
|
return false
|
|
}
|
|
// Completed check: NextDueDate == nil AND has completions
|
|
if t.NextDueDate == nil && len(t.Completions) > 0 {
|
|
return false
|
|
}
|
|
// Effective date: NextDueDate ?? DueDate
|
|
effectiveDate := t.NextDueDate
|
|
if effectiveDate == nil {
|
|
effectiveDate = t.DueDate
|
|
}
|
|
if effectiveDate == nil {
|
|
return false
|
|
}
|
|
return effectiveDate.Before(time.Now().UTC())
|
|
}
|
|
|
|
// IsDueSoon returns true if the task is due within the specified days.
|
|
//
|
|
// IMPORTANT: This method uses EffectiveDate (NextDueDate ?? DueDate)
|
|
// rather than just DueDate, ensuring consistency with kanban categorization.
|
|
//
|
|
// Deprecated: Prefer using task.IsDueSoon(t, time.Now().UTC(), days) directly for explicit time control.
|
|
func (t *Task) IsDueSoon(days int) bool {
|
|
// Delegate to predicates package logic - single source of truth
|
|
// Logic must match predicates.IsDueSoon exactly
|
|
if t.IsCancelled || t.IsArchived {
|
|
return false
|
|
}
|
|
// Completed check: NextDueDate == nil AND has completions
|
|
if t.NextDueDate == nil && len(t.Completions) > 0 {
|
|
return false
|
|
}
|
|
// Effective date: NextDueDate ?? DueDate
|
|
effectiveDate := t.NextDueDate
|
|
if effectiveDate == nil {
|
|
effectiveDate = t.DueDate
|
|
}
|
|
if effectiveDate == nil {
|
|
return false
|
|
}
|
|
now := time.Now().UTC()
|
|
threshold := now.AddDate(0, 0, days)
|
|
// Due soon = not overdue AND before threshold
|
|
return !effectiveDate.Before(now) && effectiveDate.Before(threshold)
|
|
}
|
|
|
|
// TaskCompletion represents the task_taskcompletion table
|
|
type TaskCompletion struct {
|
|
BaseModel
|
|
TaskID uint `gorm:"column:task_id;index;not null" json:"task_id"`
|
|
Task Task `gorm:"foreignKey:TaskID" json:"-"`
|
|
CompletedByID uint `gorm:"column:completed_by_id;index;not null" json:"completed_by_id"`
|
|
CompletedBy User `gorm:"foreignKey:CompletedByID" json:"completed_by,omitempty"`
|
|
CompletedAt time.Time `gorm:"column:completed_at;not null" json:"completed_at"`
|
|
Notes string `gorm:"column:notes;type:text" json:"notes"`
|
|
ActualCost *decimal.Decimal `gorm:"column:actual_cost;type:decimal(10,2)" json:"actual_cost"`
|
|
Rating *int `gorm:"column:rating" json:"rating"` // 1-5 star rating
|
|
|
|
// Multiple images support
|
|
Images []TaskCompletionImage `gorm:"foreignKey:CompletionID" json:"images,omitempty"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (TaskCompletion) TableName() string {
|
|
return "task_taskcompletion"
|
|
}
|
|
|
|
// TaskCompletionImage represents the task_taskcompletionimage table
|
|
type TaskCompletionImage struct {
|
|
BaseModel
|
|
CompletionID uint `gorm:"column:completion_id;index;not null" json:"completion_id"`
|
|
ImageURL string `gorm:"column:image_url;size:500;not null" json:"image_url"`
|
|
Caption string `gorm:"column:caption;size:255" json:"caption"`
|
|
}
|
|
|
|
// TableName returns the table name for GORM
|
|
func (TaskCompletionImage) TableName() string {
|
|
return "task_taskcompletionimage"
|
|
}
|
|
|
|
// KanbanColumn represents a column in the kanban board
|
|
type KanbanColumn struct {
|
|
Name string `json:"name"`
|
|
DisplayName string `json:"display_name"`
|
|
ButtonTypes []string `json:"button_types"`
|
|
Icons map[string]string `json:"icons"`
|
|
Color string `json:"color"`
|
|
Tasks []Task `json:"tasks"`
|
|
Count int `json:"count"`
|
|
}
|
|
|
|
// KanbanBoard represents the full kanban board response
|
|
type KanbanBoard struct {
|
|
Columns []KanbanColumn `json:"columns"`
|
|
DaysThreshold int `json:"days_threshold"`
|
|
ResidenceID string `json:"residence_id"`
|
|
}
|