cel
/
donetick
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Update local.yaml to set is_done_tick_dot_com to false, add things history

This commit is contained in:
Mo Tarbin 2024-07-01 18:44:41 -04:00
parent a6871d4200
commit 17326a16a0
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/local.yaml
View File

@ -1,5 +1,5 @@
name: "local"
is_done_tick_dot_com: true
is_done_tick_dot_com: false
telegram:
token: ""
database:

6
internal/chore/handler.go
View File

@ -195,12 +195,6 @@ func (h *Handler) createChore(c *gin.Context) {
return
}
} else {
c.JSON(400, gin.H{
"error": "Due date is required",
})
return
}
freqencyMetadataBytes, err := json.Marshal(choreReq.FrequencyMetadata)

3
internal/thing/handler.go
View File

@ -227,7 +227,8 @@ func (h *Handler) GetThingHistory(c *gin.Context) {
c.JSON(400, gin.H{"error": "Invalid offset"})
return
}
history, err := h.tRepo.GetThingHistoryWithOffset(c, thingID, offset, 10)
history, err := h.tRepo.GetThingHistoryWithOffset(c, thingID, offset)
if err != nil {
c.JSON(500, gin.H{"error": err.Error()})
return

4
internal/thing/repo/repository.go
View File

@ -70,9 +70,9 @@ func (r *ThingRepository) DissociateThingWithChore(c context.Context, thingID in
return r.db.WithContext(c).Where("thing_id = ? AND chore_id = ?", thingID, choreID).Delete(&tModel.ThingChore{}).Error
}
func (r *ThingRepository) GetThingHistoryWithOffset(c context.Context, thingID int, offset int, limit int) ([]*tModel.ThingHistory, error) {
func (r *ThingRepository) GetThingHistoryWithOffset(c context.Context, thingID int, offset int) ([]*tModel.ThingHistory, error) {
var thingHistory []*tModel.ThingHistory
if err := r.db.WithContext(c).Model(&tModel.ThingHistory{}).Where("thing_id = ?", thingID).Order("created_at desc").Offset(offset).Limit(limit).Find(&thingHistory).Error; err != nil {
if err := r.db.WithContext(c).Model(&tModel.ThingHistory{}).Where("thing_id = ?", thingID).Order("created_at desc").Offset(offset).Limit(10).Find(&thingHistory).Error; err != nil {
return nil, err
}
return thingHistory, nil

2
internal/user/repo/repository.go
View File

@ -58,7 +58,7 @@ func (r *UserRepository) GetUserByUsername(c context.Context, username string) (
return nil, err
}
} else {
if err := r.db.WithContext(c).Where("username = ?", username).First(&user).Error; err != nil {
if err := r.db.WithContext(c).Table("users u").Select("u.*, 'active' as subscription, '2999-12-31' as expiration").Where("username = ?", username).First(&user).Error; err != nil {
return nil, err
}
}

8
main.go
View File

@ -109,8 +109,12 @@ func newServer(lc fx.Lifecycle, cfg *config.Config, db *gorm.DB, notifier *notif
WriteTimeout: cfg.Server.WriteTimeout,
}
config := cors.DefaultConfig()
config.AllowAllOrigins = !cfg.IsDoneTickDotCom
config.AllowOrigins = cfg.Server.CorsAllowOrigins
if cfg.IsDoneTickDotCom {
config.AllowOrigins = cfg.Server.CorsAllowOrigins
} else {
config.AllowAllOrigins = true
}
config.AllowCredentials = true
config.AddAllowHeaders("Authorization", "secretkey")
r.Use(cors.New(config))