Upstream sync

application/applicationservice/visit.go

@@ -21,6 +21,38 @@ func newVisitService(svc *service.Service, mapper *entitymapping.Mapper) *visitS
 	}
 }
 
+func (s *visitService) Save(visit viewmodel.Visit) (viewmodel.Visit, error) {
+	entity := s.mapEntity.Visit.ToVisitEntity(visit)
+	for _, a := range visit.User.Addresses {
+		if a.AddressType == "home" {
+			address, err := s.svc.Users.GetAddressByUUID(a.UUID)
+			if err != nil {
+				return viewmodel.Visit{}, err
+			}
+
+			entity.PickupAddressID = address.ID
+			entity.Pickup.Address = address.Address
+			entity.Pickup.ID = address.UUID
+			entity.Pickup.Latitude = address.Latitude
+			entity.Pickup.Longitude = address.Longitude
+			entity.Pickup.Name = address.Name
+		}
+	}
+
+	provider, err := s.svc.Provider.GetByUUID(entity.Provider.ProviderUUID, entity.CreatedUser)
+	if err != nil {
+		return viewmodel.Visit{}, errors.Wrap(err)
+	}
+	entity.Provider = provider
+
+	retVal, err := s.svc.Visits.Create(entity)
+	if err != nil {
+		return viewmodel.Visit{}, errors.Wrap(err)
+	}
+
+	return s.mapEntity.Visit.ToVisitModel(retVal), err
+}
+
 // Save a new ride
 func (s *visitService) Create(visit viewmodel.Visit) (viewmodel.Visit, error) {
 	entity := s.mapEntity.Visit.ToVisitEntity(visit)
@@ -51,5 +83,17 @@ func (s *visitService) GetByUUID(visitUUID string, user viewmodel.User) (viewmod
 		return viewmodel.Visit{}, errors.Wrap(err)
 	}
 
+	visitUser, err := s.svc.Users.GetByUUID(retVal.User.UUID, "US")
+	if err != nil {
+		return viewmodel.Visit{}, errors.Wrap(err)
+	}
+	retVal.User = visitUser
+
+	provider, err := s.svc.Provider.GetByUUID(retVal.Provider.ProviderUUID, eUser)
+	if err != nil {
+		return viewmodel.Visit{}, errors.Wrap(err)
+	}
+	retVal.Provider = provider
+
 	return s.mapEntity.Visit.ToVisitModel(retVal), err
 }