senaduka/old-svijetlastrana
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Upstream sync

Browse Source
This commit is contained in:
Senad Uka
2018-05-30 08:45:32 +02:00
parent 756d84359d
commit f1ac874276
15 changed files with 306 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/applicationservice/ride.go
View File

@@ -1,6 +1,7 @@
package applicationservice
import (
"fmt"
"time"
"bitbucket.org/nemt/nemt-portal-api/application/entitymapping"
@@ -183,6 +184,7 @@ func (s *rideService) Save(ride viewmodel.RideRequest) (viewmodel.Ride, error) {
address, _ := s.svc.Users.GetAddressByUUID(rideEntity.Route.Destination.ID)
createdUser, err := s.svc.Users.GetByUUID(ride.CreateUserUUID, "")
if err != nil {
fmt.Println("Ride Application.Save: Error to get User: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}
@@ -190,12 +192,14 @@ func (s *rideService) Save(ride viewmodel.RideRequest) (viewmodel.Ride, error) {
visit.DestinationAddressID = address.ID
provider, err := s.svc.Provider.GetByMukID(address.InternalID, createdUser)
if err != nil {
fmt.Println("Ride Application.Save: Error to get Provider: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}
visit.Provider = provider
} else {
provider, err := s.svc.Provider.GetByMukID(rideEntity.Route.Destination.ID, createdUser)
if err != nil {
fmt.Println("Ride Application.Save: Error to get Provider by Route: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}
visit.Provider = provider
@@ -203,17 +207,20 @@ func (s *rideService) Save(ride viewmodel.RideRequest) (viewmodel.Ride, error) {
visit, err = s.svc.Visits.Create(visit)
if err != nil {
fmt.Println("Ride Application.Save: Error creating visit: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}
rideEntity.Visit = visit
} else {
user, err := s.svc.Users.GetByUUID(ride.CreateUserUUID, "")
if err != nil {
fmt.Println("Ride Application.Save: Error getting User: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}
visit, err := s.svc.Visits.GetByUUID(ride.Visit.UUID, user)
if err != nil {
fmt.Println("Ride Application.Save: Error getting Visit: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}
rideEntity.Visit = visit
@@ -221,6 +228,7 @@ func (s *rideService) Save(ride viewmodel.RideRequest) (viewmodel.Ride, error) {
retVal, err := s.svc.Rides.Save(rideEntity)
if err != nil {
fmt.Println("Ride Application.Save: Error saving ride: ", err.Error())
return viewmodel.Ride{}, errors.Wrap(err)
}