Merge branch 'dev'

This commit is contained in:
Mo Tarbin 2024-07-09 18:31:25 -04:00
commit a6ace0db33
3 changed files with 20 additions and 1 deletions

View File

@ -47,6 +47,7 @@ type FrequencyMetadata struct {
Days []*string `json:"days,omitempty"` Days []*string `json:"days,omitempty"`
Months []*string `json:"months,omitempty"` Months []*string `json:"months,omitempty"`
Unit *string `json:"unit,omitempty"` Unit *string `json:"unit,omitempty"`
Time string `json:"time,omitempty"`
} }
type NotificationMetadata struct { type NotificationMetadata struct {

View File

@ -22,6 +22,7 @@ func scheduleNextDueDate(chore *chModel.Chore, completedDate time.Time) (*time.T
if chore.FrequencyType == "once" { if chore.FrequencyType == "once" {
return nil, nil return nil, nil
} }
if chore.NextDueDate != nil { if chore.NextDueDate != nil {
// no due date set, use the current date // no due date set, use the current date
@ -29,6 +30,17 @@ func scheduleNextDueDate(chore *chModel.Chore, completedDate time.Time) (*time.T
} else { } else {
baseDate = completedDate.UTC() baseDate = completedDate.UTC()
} }
if chore.FrequencyType == "day_of_the_month" || chore.FrequencyType == "days_of_the_week" || chore.FrequencyType == "interval" {
// time in frequency metadata stored as RFC3339 format like `2024-07-07T13:27:00-04:00`
// parse it to time.Time:
t, err := time.Parse(time.RFC3339, frequencyMetadata.Time)
if err != nil {
return nil, fmt.Errorf("error parsing time in frequency metadata")
}
// set the time to the time in the frequency metadata:
baseDate = time.Date(baseDate.Year(), baseDate.Month(), baseDate.Day(), t.Hour(), t.Minute(), 0, 0, t.Location())
}
if chore.IsRolling && chore.NextDueDate.Before(completedDate) { if chore.IsRolling && chore.NextDueDate.Before(completedDate) {
// we need to check if chore due date is before the completed date to handle this senario: // we need to check if chore due date is before the completed date to handle this senario:
// if user trying to complete chore due in future (multiple time for insance) due date will be calculated // if user trying to complete chore due in future (multiple time for insance) due date will be calculated

View File

@ -2,6 +2,7 @@ package database
import ( import (
"fmt" "fmt"
"os"
"time" "time"
"gorm.io/driver/postgres" "gorm.io/driver/postgres"
@ -33,7 +34,12 @@ func NewDatabase(cfg *config.Config) (*gorm.DB, error) {
default: default:
path := os.Getenv("DT_SQLITE_PATH")
if path == "" {
db, err = gorm.Open(sqlite.Open("donetick.db"), &gorm.Config{}) db, err = gorm.Open(sqlite.Open("donetick.db"), &gorm.Config{})
} else {
db, err = gorm.Open(sqlite.Open(path), &gorm.Config{})
}
} }