ami/tl-vikunja
1
0
Fork 0
Code Activity

Refactor ListTask to Task (#92)

Browse Source
This commit is contained in:
konrad
2019-08-14 20:19:04 +00:00
committed by Gitea
parent be14634e1e
commit 66cdd79666
26 changed files with 206 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/routes/caldav/handler.go
View File

@ -100,7 +100,7 @@ func TaskHandler(c echo.Context) error {
storage := &VikunjaCaldavListStorage{
list: &models.List{ID: listID},
task: &models.ListTask{UID: taskUID},
task: &models.Task{UID: taskUID},
user: &u,
}

12
pkg/routes/caldav/listStorageProvider.go
View File

@ -37,7 +37,7 @@ type VikunjaCaldavListStorage struct {
// Used when handling a list
list *models.List
// Used when handling a single task, like updating
task *models.ListTask
task *models.Task
// The current user
user *models.User
isPrincipal bool
@ -176,7 +176,7 @@ func (vcls *VikunjaCaldavListStorage) GetResourcesByFilters(rpath string, filter
//return vcls.GetResources(rpath, false)
}
func getTaskURL(task *models.ListTask) string {
func getTaskURL(task *models.Task) string {
return ListBasePath + "/" + strconv.FormatInt(task.ListID, 10) + `/` + task.UID + `.ics`
}
@ -187,9 +187,9 @@ func (vcls *VikunjaCaldavListStorage) GetResource(rpath string) (*data.Resource,
if vcls.task != nil {
// save and override the updated unix date to not break any later etag checks
updated := vcls.task.Updated
task, err := models.GetTaskSimple(&models.ListTask{ID: vcls.task.ID, UID: vcls.task.UID})
task, err := models.GetTaskSimple(&models.Task{ID: vcls.task.ID, UID: vcls.task.UID})
if err != nil {
if models.IsErrListTaskDoesNotExist(err) {
if models.IsErrTaskDoesNotExist(err) {
return nil, false, errs.ResourceNotFoundError
}
return nil, false, err
@ -316,7 +316,7 @@ func (vcls *VikunjaCaldavListStorage) DeleteResource(rpath string) error {
// VikunjaListResourceAdapter holds the actual resource
type VikunjaListResourceAdapter struct {
list *models.List
task *models.ListTask
task *models.Task
isPrincipal bool
isCollection bool
@ -356,7 +356,7 @@ func (vlra *VikunjaListResourceAdapter) GetContent() string {
}
if vlra.task != nil {
list := models.List{Tasks: []*models.ListTask{vlra.task}}
list := models.List{Tasks: []*models.Task{vlra.task}}
return getCaldavTodosForTasks(&list)
}

4
pkg/routes/caldav/parsing.go
View File

@ -59,7 +59,7 @@ func getCaldavTodosForTasks(list *models.List) string {
return caldav.ParseTodos(caldavConfig, caldavtodos)
}
func parseTaskFromVTODO(content string) (vTask *models.ListTask, err error) {
func parseTaskFromVTODO(content string) (vTask *models.Task, err error) {
parsed, err := ical.ParseCalendar(content)
if err != nil {
return nil, err
@ -89,7 +89,7 @@ func parseTaskFromVTODO(content string) (vTask *models.ListTask, err error) {
// Parse the enddate
duration, _ := time.ParseDuration(task["DURATION"])
vTask = &models.ListTask{
vTask = &models.Task{
UID: task["UID"],
Text: task["SUMMARY"],
Description: task["DESCRIPTION"],