upstream sync

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 {