amy/donetick
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update FrequencyType to use enum in Chore and ChoreReq struct

Browse source
This commit is contained in:
Mo Tarbin 2024-08-10 00:24:15 -04:00
parent a65da84f08
commit ce3ee9e9dc
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/chore/handler.go
View file

@ -33,7 +33,7 @@ type ThingTrigger struct {
type ChoreReq struct { type ChoreReq struct {
Name string `json:"name" binding:"required"` Name string `json:"name" binding:"required"`
FrequencyType string `json:"frequencyType"` FrequencyType chModel.FrequencyType `json:"frequencyType"`
ID int `json:"id"` ID int `json:"id"`
DueDate string `json:"dueDate"` DueDate string `json:"dueDate"`
Assignees []chModel.ChoreAssignees `json:"assignees"` Assignees []chModel.ChoreAssignees `json:"assignees"`

18
internal/chore/model/model.go
View file

@ -6,10 +6,26 @@ import (
tModel "donetick.com/core/internal/thing/model" tModel "donetick.com/core/internal/thing/model"
) )
type FrequencyType string
const (
FrequancyTypeOnce FrequencyType = "once"
FrequancyTypeDaily FrequencyType = "daily"
FrequancyTypeWeekly FrequencyType = "weekly"
FrequancyTypeMonthly FrequencyType = "monthly"
FrequancyTypeYearly FrequencyType = "yearly"
FrequancyTypeAdaptive FrequencyType = "adaptive"
FrequancyTypeIntervel FrequencyType = "interval"
FrequancyTypeDayOfTheWeek FrequencyType = "days_of_the_week"
FrequancyTypeDayOfTheMonth FrequencyType = "day_of_the_month"
FrequancyTypeTrigger FrequencyType = "trigger"
FrequancyTypeNoRepeat FrequencyType = "no_repeat"
)
type Chore struct { type Chore struct {
ID int `json:"id" gorm:"primary_key"` ID int `json:"id" gorm:"primary_key"`
Name string `json:"name" gorm:"column:name"` // Chore description Name string `json:"name" gorm:"column:name"` // Chore description
FrequencyType string `json:"frequencyType" gorm:"column:frequency_type"` // "daily", "weekly", "monthly", "yearly", "adaptive",or "custom" FrequencyType FrequencyType `json:"frequencyType" gorm:"column:frequency_type"` // "daily", "weekly", "monthly", "yearly", "adaptive",or "custom"
Frequency int `json:"frequency" gorm:"column:frequency"` // Number of days, weeks, months, or years between chores Frequency int `json:"frequency" gorm:"column:frequency"` // Number of days, weeks, months, or years between chores
FrequencyMetadata *string `json:"frequencyMetadata" gorm:"column:frequency_meta"` // Additional frequency information FrequencyMetadata *string `json:"frequencyMetadata" gorm:"column:frequency_meta"` // Additional frequency information
NextDueDate *time.Time `json:"nextDueDate" gorm:"column:next_due_date;index"` // When the chore is due NextDueDate *time.Time `json:"nextDueDate" gorm:"column:next_due_date;index"` // When the chore is due