upstream sync

application/applicationservice/user.go

@@ -149,3 +149,23 @@ func (s *userService) GetContactType() (retVal []viewmodel.ContactType, err erro
 
 	return s.mapEntity.User.ToContactTypeModelSlice(entity), nil
 }
+
+func (s *userService) SaveContact(contact viewmodel.Contact) (retVal viewmodel.Contact, err error) {
+	entity := s.mapEntity.User.ToContactEntity(contact)
+	entity, err = s.svc.Users.SaveContact(entity)
+	if err != nil {
+		return retVal, errors.Wrap(err)
+	}
+
+	return s.mapEntity.User.ToContactModel(entity), err
+}
+
+func (s *userService) RemoveContact(contact viewmodel.Contact) (retVal viewmodel.Contact, err error) {
+	entity := s.mapEntity.User.ToContactEntity(contact)
+	entity, err = s.svc.Users.RemoveContact(entity)
+	if err != nil {
+		return retVal, errors.Wrap(err)
+	}
+
+	return s.mapEntity.User.ToContactModel(entity), err
+}

application/entitymapping/user.go

@@ -158,8 +158,11 @@ func (mapping *userMapping) ToContactTypeModelSlice(list []entity.ContactType) (
 // ToContactModel maps a Contact entity to Contact view model
 func (mapping *userMapping) ToContactModel(item entity.ContactInfo) viewmodel.Contact {
 	return viewmodel.Contact{
-		Type:  mapping.ToContactTypeModel(item.Type),
-		Value: item.Value,
+		ID:     item.UUID,
+		User:   mapping.ToUserModel(item.User),
+		Author: mapping.ToUserModel(item.Author),
+		Type:   mapping.ToContactTypeModel(item.Type),
+		Value:  item.Value,
 	}
 }
 
@@ -177,8 +180,11 @@ func (mapping *userMapping) ToContactModelSlice(list []entity.ContactInfo) (retV
 // ToContactEntity maps a Contact entity to Contact view model
 func (mapping *userMapping) ToContactEntity(item viewmodel.Contact) entity.ContactInfo {
 	return entity.ContactInfo{
-		Type:  mapping.ToContactTypeEntity(item.Type),
-		Value: item.Value,
+		UUID:   item.ID,
+		User:   mapping.ToUserEntity(item.User),
+		Author: mapping.ToUserEntity(item.Author),
+		Type:   mapping.ToContactTypeEntity(item.Type),
+		Value:  item.Value,
 	}
 }
 

application/viewmodel/tnc.go

@@ -15,6 +15,7 @@ type WebhookResponse struct {
 //RideRequest has the data to dispatch a ride
 type RideRequest struct {
 	UserUUID             string      `json:"user_uuid,omitempty"`
+	UserConsent			 bool		 `json:"user_consent,omitempty"`
 	Status               string      `json:"status,omitempty"`
 	RideID               string      `json:"ride_id,omitempty"`
 	RideType             string      `json:"ride_type,omitempty"`
@@ -158,4 +159,4 @@ type RideRoute struct {
 	Duration    int64    `json:"duration,omitempty"`
 	ETA         int64    `json:"eta,omitempty"`
 	Bearing     int64    `json:"bearing,omitempty"`
-}
+}

application/viewmodel/user.go

@@ -26,8 +26,11 @@ type User struct {
 }
 
 type Contact struct {
-	Type  ContactType `json:"type,omitempty"`
-	Value string      `json:"contact,omitempty"`
+	ID     string      `json:"id,omitempty"`
+	User   User        `json:"-"`
+	Type   ContactType `json:"type,omitempty"`
+	Value  string      `json:"contact,omitempty"`
+	Author User        `json:"-"`
 }
 
 type ContactType struct {