vikunja
/
vikunja
6
43
Fork 72
Code Issues 151 Pull Requests 19 Packages Releases 32 Activity

Return iso dates for everything date related from the api #130

Merged
konrad merged 15 commits from feature/datetime into master 2020-02-08 12:48:51 +00:00
Conversation 0 Commits 15 Files Changed 44 +25 -24
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aead2e9d7c - Show all commits

3
pkg/models/task_collection_test.go
View File

@ -19,6 +19,7 @@ package models
import (
"code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/files"
"code.vikunja.io/api/pkg/timeutil"
"code.vikunja.io/api/pkg/user"
"code.vikunja.io/web"
"gopkg.in/d4l3k/messagediff.v1"
@ -409,7 +410,7 @@ func TestTaskCollection_ReadAll(t *testing.T) {
Index: 12,
CreatedByID: 1,
CreatedBy: user1,
Reminders: []int64{1543626724, 1543626824},
Reminders: []timeutil.TimeStamp{1543626724, 1543626824},
ListID: 1,
RelatedTasks: map[RelationKind][]*Task{},
Created: 1543626724,

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

@ -20,6 +20,7 @@ import (
"code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/files"
"code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/timeutil"
"github.com/stretchr/testify/assert"
"gopkg.in/d4l3k/messagediff.v1"
"io/ioutil"
@ -192,18 +193,18 @@ func TestWunderlistParsing(t *testing.T) {
{
Namespace: models.Namespace{
Name: "Lorem Ipsum",
Created: time1.Unix(),
Updated: time2.Unix(),
Created: timeutil.FromTime(time1),
Updated: timeutil.FromTime(time2),
},
Lists: []*models.List{
{
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Title: "Lorem1",
Tasks: []*models.Task{
{
Text: "Ipsum1",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Description: "Lorem Ipsum dolor sit amet",
Attachments: []*models.TaskAttachment{
{
@ -215,15 +216,15 @@ func TestWunderlistParsing(t *testing.T) {
CreatedUnix: time2.Unix(),
FileContent: exampleFile,
},
Created: time2.Unix(),
Created: timeutil.FromTime(time2),
},
},
Reminders: []int64{time4.Unix()},
Reminders: []timeutil.TimeStamp{timeutil.FromTime(time4)},
},
{
Text: "Ipsum2",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Description: "Lorem Ipsum dolor sit amet",
RelatedTasks: map[models.RelationKind][]*models.Task{
models.RelationKindSubtask: {
@ -239,7 +240,7 @@ func TestWunderlistParsing(t *testing.T) {
},
},
{
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Title: "Lorem2",
Tasks: []*models.Task{
{
@ -247,7 +248,7 @@ func TestWunderlistParsing(t *testing.T) {
Done: true,
DoneAtUnix: time1.Unix(),
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Description: "Lorem Ipsum dolor sit amet",
Attachments: []*models.TaskAttachment{
{
@ -259,15 +260,15 @@ func TestWunderlistParsing(t *testing.T) {
CreatedUnix: time3.Unix(),
FileContent: exampleFile,
},
Created: time3.Unix(),
Created: timeutil.FromTime(time3),
},
},
},
{
Text: "Ipsum4",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Reminders: []int64{time3.Unix()},
Created: timeutil.FromTime(time1),
Reminders: []timeutil.TimeStamp{timeutil.FromTime(time3)},
RelatedTasks: map[models.RelationKind][]*models.Task{
models.RelationKindSubtask: {
{
@ -279,50 +280,50 @@ func TestWunderlistParsing(t *testing.T) {
},
},
{
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Title: "Lorem3",
Tasks: []*models.Task{
{
Text: "Ipsum5",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
},
{
Text: "Ipsum6",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Done: true,
DoneAtUnix: time1.Unix(),
},
{
Text: "Ipsum7",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Done: true,
DoneAtUnix: time1.Unix(),
},
{
Text: "Ipsum8",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
},
},
},
{
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Title: "Lorem4",
Tasks: []*models.Task{
{
Text: "Ipsum9",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Done: true,
DoneAtUnix: time1.Unix(),
},
{
Text: "Ipsum10",
DueDateUnix: 1378339200,
Created: time1.Unix(),
Created: timeutil.FromTime(time1),
Done: true,
DoneAtUnix: time1.Unix(),
},
@ -336,7 +337,7 @@ func TestWunderlistParsing(t *testing.T) {
},
Lists: []*models.List{
{
Created: time4.Unix(),
Created: timeutil.FromTime(time4),
Title: "List without a namespace",
},
},

3
pkg/timeutil/time.go
View File

@ -38,8 +38,7 @@ func FromTime(t time.Time) TimeStamp {
// MarshalJSON converts a TimeStamp to a json string
func (ts *TimeStamp) MarshalJSON() ([]byte, error) {
var s string
s = `"` + ts.ToTime().String() + `"`
s := `"` + ts.ToTime().String() + `"`
return []byte(s), nil
}