From 3913995dd0fa841f1852a936d5ff901826365e45 Mon Sep 17 00:00:00 2001 From: sauls8t Date: Mon, 12 Nov 2018 20:24:59 +0000 Subject: [PATCH] Use timestamp type for comments backup/restore --- domain/backup/backup.go | 14 +++++++------- domain/backup/restore.go | 34 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/domain/backup/backup.go b/domain/backup/backup.go index 1a31b310..a384c40c 100644 --- a/domain/backup/backup.go +++ b/domain/backup/backup.go @@ -716,13 +716,13 @@ func (b backerHandler) dmzDocument(files *[]backupItem) (err error) { // Comment type comment struct { - RefID string `json:"feedbackId"` - OrgID string `json:"orgId"` - DocumentID string `json:"documentId"` - UserID string `json:"userId"` - Email string `json:"email"` - Feedback string `json:"feedback"` - Created string `json:"created"` + RefID string `json:"feedbackId"` + OrgID string `json:"orgId"` + DocumentID string `json:"documentId"` + UserID string `json:"userId"` + Email string `json:"email"` + Feedback string `json:"feedback"` + Created time.Time `json:"created"` } cm := []comment{} diff --git a/domain/backup/restore.go b/domain/backup/restore.go index 12eda6e8..a41efcc3 100644 --- a/domain/backup/restore.go +++ b/domain/backup/restore.go @@ -21,16 +21,6 @@ import ( "database/sql" "encoding/json" "fmt" - "github.com/documize/community/model/account" - "github.com/documize/community/model/activity" - "github.com/documize/community/model/attachment" - "github.com/documize/community/model/block" - "github.com/documize/community/model/doc" - "github.com/documize/community/model/group" - "github.com/documize/community/model/link" - "github.com/documize/community/model/page" - "github.com/documize/community/model/permission" - "github.com/documize/community/model/pin" "io/ioutil" "strings" "time" @@ -38,11 +28,21 @@ import ( "github.com/documize/community/core/env" "github.com/documize/community/domain" "github.com/documize/community/domain/store" + "github.com/documize/community/model/account" "github.com/documize/community/model/action" + "github.com/documize/community/model/activity" + "github.com/documize/community/model/attachment" "github.com/documize/community/model/audit" m "github.com/documize/community/model/backup" + "github.com/documize/community/model/block" "github.com/documize/community/model/category" + "github.com/documize/community/model/doc" + "github.com/documize/community/model/group" + "github.com/documize/community/model/link" "github.com/documize/community/model/org" + "github.com/documize/community/model/page" + "github.com/documize/community/model/permission" + "github.com/documize/community/model/pin" "github.com/documize/community/model/space" "github.com/pkg/errors" ) @@ -1473,13 +1473,13 @@ func (r *restoreHandler) dmzDocComment() (err error) { filename := "dmz_doc_comment.json" type comment struct { - RefID string `json:"feedbackId"` - OrgID string `json:"orgId"` - DocumentID string `json:"documentId"` - UserID string `json:"userId"` - Email string `json:"email"` - Feedback string `json:"feedback"` - Created string `json:"created"` + RefID string `json:"feedbackId"` + OrgID string `json:"orgId"` + DocumentID string `json:"documentId"` + UserID string `json:"userId"` + Email string `json:"email"` + Feedback string `json:"feedback"` + Created time.Time `json:"created"` } cm := []comment{} err = r.fileJSON(filename, &cm)