upstream sync

2018-05-11 09:07:54 +02:00
parent 50a6362b67
commit 4852a5586c
23 changed files with 664 additions and 35 deletions
--- a/domain/entity/user.go
+++ b/domain/entity/user.go
@@ -34,8 +34,10 @@ type User struct {

 type ContactInfo struct {
 	ID     int64       `db:"contact_id" json:"contact_id"`
+	UUID   string      `db:"contact_uuid" json:"contact_uuid"`
 	Type   ContactType `db:"contact_type" json:"contact_type"`
-	UserID int64       `db:"user_id" json:"-"`
+	User   User        `db:"user" json:"-"`
+	Author User        `db:"author" json:"-"`
 	Value  string      `db:"value" json:"value"`
 }