upstream sync

domain/contract/repo.go

@@ -27,6 +27,8 @@ type UserRepo interface {
 	GetAddressByUUID(addressUUID string) (entity.Address, error)
 	GetContactType() (retVal []entity.ContactType, err error)
 	RemoveAddress(addressUUID string) error
+	SaveContact(contact entity.ContactInfo) (entity.ContactInfo, error)
+	RemoveContact(contact entity.ContactInfo) (entity.ContactInfo, error)
 }
 
 // RideRepo defines the data set for Rides

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"`
 }
 

domain/service/user.go

@@ -82,6 +82,26 @@ func (s *userService) SaveAddress(address entity.Address) (entity.Address, error
 	return s.svc.db.Users().SaveAddress(address)
 }
 
+func (s *userService) SaveContact(contact entity.ContactInfo) (entity.ContactInfo, error) {
+	user, err := s.svc.db.Users().GetByUUID(contact.User.UUID, "")
+	if err != nil {
+		return entity.ContactInfo{}, nil
+	}
+
+	contact.User = user
+	return s.svc.db.Users().SaveContact(contact)
+}
+
+func (s *userService) RemoveContact(contact entity.ContactInfo) (entity.ContactInfo, error) {
+	user, err := s.svc.db.Users().GetByUUID(contact.User.UUID, "")
+	if err != nil {
+		return entity.ContactInfo{}, nil
+	}
+
+	contact.User = user
+	return s.svc.db.Users().RemoveContact(contact)
+}
+
 // GetAddressByUUID returns a list of users by profile
 func (s *userService) GetAddressByUUID(addressUUID string) (entity.Address, error) {
 	return s.svc.db.Users().GetAddressByUUID(addressUUID)