vikunja/vikunja
7
43
Fork 73
Code Issues 149 Pull Requests 18 Packages Releases 32 Activity

Migration #120

Merged
konrad merged 27 commits from feature/migration into master 2020-01-19 16:52:17 +00:00
Conversation 0 Commits 27 Files Changed 19 +38 -17
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5acf3a6e82 - Show all commits

4
pkg/modules/migration/wunderlist/wunderlist.go
View File

@ -37,6 +37,8 @@ type task struct {
Revision int `json:"revision"` Revision int `json:"revision"`
Starred bool `json:"starred"` Starred bool `json:"starred"`
Title string `json:"title"` Title string `json:"title"`
Completed bool `json:"completed"`
CompletedAt time.Time `json:"completed_at"`
} }
type list struct { type list struct {
@ -127,6 +129,8 @@ func convertListForFolder(listID int, list *list, content *wunderlistContents) *
Text: t.Title, Text: t.Title,
DueDateUnix: t.DueDate.Unix(), DueDateUnix: t.DueDate.Unix(),
Created: t.CreatedAt.Unix(), Created: t.CreatedAt.Unix(),
Done: t.Completed,
DoneAtUnix: t.CompletedAt.Unix(),
} }
// Find related notes // Find related notes

51
pkg/modules/migration/wunderlist/wunderlist_test.go
View File

@ -37,14 +37,21 @@ func TestWunderlistParsing(t *testing.T) {
time4, err := time.Parse(time.RFC3339Nano, "2013-08-02T11:58:55Z") time4, err := time.Parse(time.RFC3339Nano, "2013-08-02T11:58:55Z")
assert.NoError(t, err) assert.NoError(t, err)
createTestTask := func(id, listID int) *task { createTestTask := func(id, listID int, done bool) *task {
completedAt, err := time.Parse(time.RFC3339Nano, "1970-01-01T00:00:00Z")
assert.NoError(t, err)
if done {
completedAt = time1
}
return &task{ return &task{
ID: id, ID: id,
AssigneeID: 123, AssigneeID: 123,
CreatedAt: time1, CreatedAt: time1,
DueDate: time3, DueDate: time3,
ListID: listID, ListID: listID,
Title: "Ipsum" + strconv.Itoa(id), Title: "Ipsum" + strconv.Itoa(id),
Completed: done,
CompletedAt: completedAt,
} }
} }
@ -96,16 +103,16 @@ func TestWunderlistParsing(t *testing.T) {
}, },
}, },
tasks: []*task{ tasks: []*task{
createTestTask(1, 1), createTestTask(1, 1, false),
createTestTask(2, 1), createTestTask(2, 1, false),
createTestTask(3, 2), createTestTask(3, 2, true),
createTestTask(4, 2), createTestTask(4, 2, false),
createTestTask(5, 3), createTestTask(5, 3, false),
createTestTask(6, 3), createTestTask(6, 3, true),
createTestTask(7, 3), createTestTask(7, 3, true),
createTestTask(8, 3), createTestTask(8, 3, false),
createTestTask(9, 4), createTestTask(9, 4, true),
createTestTask(10, 4), createTestTask(10, 4, true),
}, },
notes: []*note{ notes: []*note{
createTestNote(1, 1), createTestNote(1, 1),
@ -228,6 +235,8 @@ func TestWunderlistParsing(t *testing.T) {
Tasks: []*models.Task{ Tasks: []*models.Task{
{ {
Text: "Ipsum3", Text: "Ipsum3",
Done: true,
DoneAtUnix: time1.Unix(),
DueDateUnix: time3.Unix(), DueDateUnix: time3.Unix(),
Created: time1.Unix(), Created: time1.Unix(),
Description: "Lorem Ipsum dolor sit amet", Description: "Lorem Ipsum dolor sit amet",
@ -271,11 +280,15 @@ func TestWunderlistParsing(t *testing.T) {
Text: "Ipsum6", Text: "Ipsum6",
DueDateUnix: time3.Unix(), DueDateUnix: time3.Unix(),
Created: time1.Unix(), Created: time1.Unix(),
Done: true,
DoneAtUnix: time1.Unix(),
}, },
{ {
Text: "Ipsum7", Text: "Ipsum7",
DueDateUnix: time3.Unix(), DueDateUnix: time3.Unix(),
Created: time1.Unix(), Created: time1.Unix(),
Done: true,
DoneAtUnix: time1.Unix(),
}, },
{ {
Text: "Ipsum8", Text: "Ipsum8",
@ -292,11 +305,15 @@ func TestWunderlistParsing(t *testing.T) {
Text: "Ipsum9", Text: "Ipsum9",
DueDateUnix: time3.Unix(), DueDateUnix: time3.Unix(),
Created: time1.Unix(), Created: time1.Unix(),
Done: true,
DoneAtUnix: time1.Unix(),
}, },
{ {
Text: "Ipsum10", Text: "Ipsum10",
DueDateUnix: time3.Unix(), DueDateUnix: time3.Unix(),
Created: time1.Unix(), Created: time1.Unix(),
Done: true,
DoneAtUnix: time1.Unix(),
}, },
}, },
}, },