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

Fix Adaptive Scheduler, Update email handlers, telegram notifications

Browse source
This commit is contained in:
Mo Tarbin 2024-07-07 03:02:21 -04:00
parent 17326a16a0
commit a3fa964c58
9 changed files with 193 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/thing/handler.go
View file

@ -261,6 +261,16 @@ func (h *Handler) DeleteThing(c *gin.Context) {
c.JSON(403, gin.H{"error": "Forbidden"})
return
}
// confirm there are no chores associated with the thing:
thingChores, err := h.tRepo.GetThingChoresByThingId(c, thing.ID)
if err != nil {
c.JSON(500, gin.H{"error": "Unable to find tasks linked to this thing"})
return
}
if len(thingChores) > 0 {
c.JSON(405, gin.H{"error": "Unable to delete thing with associated tasks"})
return
}
if err := h.tRepo.DeleteThing(c, thingID); err != nil {
c.JSON(500, gin.H{"error": err.Error()})
return

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

@ -70,6 +70,10 @@ 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) DissociateChoreWithThing(c context.Context, choreID int) error {
return r.db.WithContext(c).Where("chore_id = ?", choreID).Delete(&tModel.ThingChore{}).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(10).Find(&thingHistory).Error; err != nil {