Upstream sync

domain/service/plan.go

@@ -0,0 +1,31 @@
+package service
+
+import (
+	"bitbucket.org/nemt/nemt-portal-api/domain/entity"
+)
+
+type planService struct {
+	svc *Service
+}
+
+func newPlanService(svc *Service) *planService {
+	return &planService{
+		svc: svc,
+	}
+}
+
+func (s *planService) GetByAlphaPrefix(alphaPrefix string) (entity.Plan, error) {
+	return s.svc.db.Plans().GetByAlphaPrefix(alphaPrefix)
+}
+
+func (s *planService) GetByUUID(planUUID string) ([]entity.Plan, error) {
+	return s.svc.db.Plans().GetByUUID(planUUID)
+}
+
+func (s *planService) GetByID(planID int64) ([]entity.Plan, error) {
+	return s.svc.db.Plans().GetByID(planID)
+}
+
+func (s *planService) GetByPrefixUUID(prefixUUID string) (entity.Plan, error) {
+	return s.svc.db.Plans().GetByPrefixUUID(prefixUUID)
+}

domain/service/provider.go

@@ -1,6 +1,8 @@
 package service
 
 import (
+	"errors"
+
 	"bitbucket.org/nemt/nemt-portal-api/domain/entity"
 )
 
@@ -85,3 +87,21 @@ func (s *providerService) GetByNPI(NPI string, user entity.User) (entity.Provide
 	provider.Organization = organization
 	return provider, nil
 }
+
+func (s *providerService) GetByOrganization(organizationUUID string, user entity.User) (entity.Provider, error) {
+	organization, err := s.svc.db.Organization().GetByUUID(organizationUUID, user)
+	if err != nil {
+		return entity.Provider{}, err
+	}
+
+	if organization.Type.Key != "provider" {
+		return entity.Provider{}, errors.New("invalid organization")
+	}
+
+	provider, err := s.svc.db.Provider().GetByID(organization.ReferenceID, user)
+	if err != nil {
+		return entity.Provider{}, err
+	}
+
+	return provider, nil
+}

domain/service/ride.go

@@ -56,7 +56,12 @@ func (s *rideService) GetByID(id int64, user entity.User) (entity.Ride, error) {
 
 // GetByUUID return a specific ride
 func (s *rideService) GetByUUID(uuid string, user entity.User) (entity.Ride, error) {
-	return s.svc.db.Rides().GetByUUID(uuid, user)
+	ride, err := s.svc.db.Rides().GetByUUID(uuid, user)
+	if err != nil {
+		return entity.Ride{}, err
+	}
+
+	return ride, nil
 }
 
 // GetByUUID return a specific ride

domain/service/service.go

@@ -25,7 +25,8 @@ type Service struct {
 	Notification *notificationService
 	Profile      *profileService
 	Organization *organizationService
-	Zipcodes	 *zipcodeService
+	Zipcodes     *zipcodeService
+	Plans        *planService
 }
 
 // New returns a new domain Service instance
@@ -41,6 +42,7 @@ func New(db contract.DataManager, cache contract.CacheManager, cfg *config.Confi
 		instance.Profile = newProfileService(instance)
 		instance.Organization = newOrganizationService(instance)
 		instance.Zipcodes = newZipcodeService(instance)
+		instance.Plans = newPlanService(instance)
 	})
 
 	return instance, nil

domain/service/user.go

@@ -33,6 +33,10 @@ func (s *userService) GetByUUID(uuid string, profile string) (entity.User, error
 	return s.svc.db.Users().GetByUUID(uuid, profile)
 }
 
+func (s *userService) GetByMemberID(memberID string) (entity.User, error) {
+	return s.svc.db.Users().GetByMemberID(memberID)
+}
+
 // Login returns a specific user by email and pass
 func (s *userService) Login(email string, pass string) (entity.User, error) {
 	return s.svc.db.Users().Login(email, pass)
@@ -68,6 +72,10 @@ func (s *userService) CreateBulk(users []entity.User) ([]entity.User, error) {
 	return users, nil
 }
 
+func (s *userService) UpdateLogin(user entity.User) error  {
+	return s.svc.db.Users().UpdateLogin(user)
+}
+
 // GetUsersByProfile returns a list of users by profile
 func (s *userService) GetUsersByProfile(profile string) ([]entity.User, error) {
 	return s.svc.db.Users().GetUsersByProfile(profile)

domain/service/visit.go

@@ -29,10 +29,10 @@ func (s *visitService) GetAll(user entity.User) ([]entity.Visit, error) {
 		return nil, err
 	}
 
-	rides, err := s.svc.db.Rides().GetAll(user)
-	if err != nil {
-		return nil, err
-	}
+	rides, _ := s.svc.db.Rides().GetAll(user)
+	// if err != nil {
+	// 	return nil, err
+	// }
 
 	ridesByVisit := make(map[int64][]entity.Ride)
 	for _, r := range rides {
@@ -55,10 +55,10 @@ func (s *visitService) GetByUUID(visitUUID string, user entity.User) (entity.Vis
 		return entity.Visit{}, errors.Wrap(err)
 	}
 
-	rides, err := s.svc.db.Rides().GetByVisitUUID(visitUUID, user)
-	if err != nil {
-		return entity.Visit{}, errors.Wrap(err)
-	}
+	rides, _ := s.svc.db.Rides().GetByVisitUUID(visitUUID, user)
+	// if err != nil {
+	// 	return entity.Visit{}, errors.Wrap(err)
+	// }
 	visit.Rides = rides
 
 	return visit, nil
@@ -71,10 +71,10 @@ func (s *visitService) GetByID(visitID int64, user entity.User) (entity.Visit, e
 		return entity.Visit{}, errors.Wrap(err)
 	}
 
-	rides, err := s.svc.db.Rides().GetByVisitUUID(visit.UUID, user)
-	if err != nil {
-		return entity.Visit{}, errors.Wrap(err)
-	}
+	rides, _ := s.svc.db.Rides().GetByVisitUUID(visit.UUID, user)
+	// if err != nil {
+	// 	return entity.Visit{}, errors.Wrap(err)
+	// }
 	visit.Rides = rides
 
 	return visit, nil