updated api and store

Author: roboncode

api/client.go api/connector.go

@@ -3,10 +3,10 @@ package main
 import (
 	"example/generated"
 	"example/internal/connectors"
-	"example/internal/grpc"
-	"example/internal/healthcheck"
-	"example/internal/http"
-	"example/internal/service"
+	"example/internal/servers/grpc"
+	"example/internal/servers/healthcheck"
+	"example/internal/servers/http"
+	"example/internal/services"
 	"example/internal/store"
 	"github.com/sirupsen/logrus"
 	googleGrpc "google.golang.org/grpc"
@@ -22,15 +22,13 @@ func connectToMongo() connectors.MongoConnector {
 	return mongoConnection
 }
 
-func setupStores(conn connectors.MongoConnector) store.Store {
-	s := store.NewStore()
-	s.Set(store.PersonStoreName, store.NewPersonStore(conn.GetDatabase()))
-	return s
+func setupStores(conn connectors.MongoConnector) {
+	store.Instance().Person = store.NewPersonStore(conn.GetDatabase())
 }
 
-func startGrpcServer(shutdown <-chan bool, stores store.Store) grpc.Server {
-	var personService = service.NewPersonService(stores)
-	var httpService = service.NewHttpService(personService)
+func startGrpcServer(shutdown <-chan bool) grpc.Server {
+	var personService = services.NewPersonService()
+	var httpService = services.NewHttpService(personService)
 
 	var opts = grpc.Options{
 		ServiceRegistration: func(s *googleGrpc.Server) {
@@ -75,8 +73,8 @@ func main() {
 	shutdown := make(chan bool)
 
 	conn := connectToMongo()
-	stores := setupStores(conn)
-	grpcServer := startGrpcServer(shutdown, stores)
+	setupStores(conn)
+	grpcServer := startGrpcServer(shutdown)
 	startHealthCheckServer(shutdown, grpcServer)
 	startHttpServer(shutdown)
 

cmd/example/main.go

@@ -0,0 +1,15 @@
+package models
+
+import (
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"time"
+)
+
+type Person struct {
+	Id        *primitive.ObjectID `bson:"_id,omitempty"`
+	Name      string              `bson:"name"`
+	Email     string              `bson:"email"`
+	Status    int32               `bson:"status"`
+	CreatedAt *time.Time          `bson:"created_at,omitempty"`
+	UpdatedAt *time.Time          `bson:"updated_at,omitempty"`
+}

generated/mocks/HttpServiceClient.go

@@ -3,7 +3,7 @@ package grpc
 import (
 	"errors"
 	"example/api"
-	"example/internal/grpc/interceptors"
+	"example/internal/servers/grpc/interceptors"
 	"example/util/check"
 	"fmt"
 	"github.com/grpc-ecosystem/go-grpc-prometheus"

generated/mocks/HttpServiceServer.go

@@ -1,7 +1,7 @@
 package prometheus
 
 import (
-	"example/internal/grpc"
+	"example/internal/servers/grpc"
 	"fmt"
 	"github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/prometheus/client_golang/prometheus"

generated/mocks/PersonServiceClient.go

@@ -1,4 +1,4 @@
-package service
+package services
 
 import (
 	"context"

generated/mocks/PersonServiceServer.go

@@ -1,8 +1,9 @@
-package service
+package services
 
 import (
 	"context"
 	"example/generated"
+	"example/internal/models"
 	"example/internal/store"
 	"example/util/transform"
 	"github.com/golang/protobuf/ptypes/empty"
@@ -15,23 +16,18 @@ type personService struct {
 	Store store.Store
 }
 
-func NewPersonService(store store.Store) example.PersonServiceServer {
-	return &personService{
-		Store: store,
-	}
-}
-
-func (p *personService) PersonStore() store.PersonStore {
-	return p.Store.Get(store.PersonStoreName).(store.PersonStore)
+func NewPersonService() example.PersonServiceServer {
+	return &personService{}
 }
 
 func (p *personService) CreatePerson(_ context.Context, req *example.CreatePersonRequest) (*example.Person, error) {
-	var person = store.Person{
+	var personStore = store.Instance().Person
+	var person = models.Person{
 		Status: int32(req.Status),
 		Name:   req.Name,
 		Email:  req.Email,
 	}
-	err := p.PersonStore().CreatePerson(&person)
+	err := personStore.CreatePerson(&person)
 	if err != nil {
 		return nil, err
 	}
@@ -47,7 +43,8 @@ func (p *personService) CreatePerson(_ context.Context, req *example.CreatePerso
 }
 
 func (p *personService) GetPerson(_ context.Context, req *example.GetPersonRequest) (*example.Person, error) {
-	person, err := p.PersonStore().GetPerson(req.Id)
+	var personStore = store.Instance().Person
+	person, err := personStore.GetPerson(req.Id)
 	if err != nil {
 		return nil, status.Errorf(codes.NotFound, "Could not find Person with Object Id %s: %v", req.Id, err)
 	}
@@ -62,13 +59,14 @@ func (p *personService) GetPerson(_ context.Context, req *example.GetPersonReque
 }
 
 func (p *personService) GetPersons(_ context.Context, req *example.GetPersonsRequest) (*example.Persons, error) {
+	var personStore = store.Instance().Person
 	var filters = store.PersonFilters{
 		Status: int32(req.Status),
 		Skip:   req.Skip,
 		Limit:  req.Limit,
 	}
 
-	persons, err := p.PersonStore().GetPersons(&filters)
+	persons, err := personStore.GetPersons(&filters)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "Error retrieving persons: %s", err)
 	}
@@ -89,20 +87,22 @@ func (p *personService) GetPersons(_ context.Context, req *example.GetPersonsReq
 }
 
 func (p *personService) UpdatePerson(_ context.Context, req *example.UpdatePersonRequest) (*empty.Empty, error) {
-	var person = store.Person{
+	var personStore = store.Instance().Person
+	var person = models.Person{
 		Status: int32(req.Status),
 		Name:   req.Name,
 		Email:  req.Email,
 	}
-	var err = p.PersonStore().UpdatePerson(req.Id, &person)
+	var err = personStore.UpdatePerson(req.Id, &person)
 	if err != nil {
 		return nil, status.Errorf(codes.NotFound, "Error updated person with id {%s}: %v", req.Id, err)
 	}
 	return &empty.Empty{}, nil
 }
 
 func (p *personService) DeletePerson(_ context.Context, req *example.DeletePersonRequest) (*empty.Empty, error) {
-	var err = p.PersonStore().DeleteRequest(req.Id)
+	var personStore = store.Instance().Person
+	var err = personStore.DeleteRequest(req.Id)
 	if err != nil {
 		return nil, status.Errorf(codes.NotFound, "Error deleting person with id {%s}: %v", req.Id, err)
 	}

internal/models/person.go

@@ -1,8 +1,9 @@
-package service
+package services
 
 import (
 	"context"
 	"example/generated"
+	"example/internal/models"
 	"example/internal/store"
 	"example/internal/store/mocks"
 	"example/util/transform"
@@ -14,7 +15,7 @@ import (
 )
 
 var now = time.Now()
-var personItem = store.Person{
+var personItem = models.Person{
 	Id:        transform.ToObjectId("5f35832b7913cffd5a329af7"),
 	Status:    int32(example.Status_ACTIVE),
 	Name:      "John Smith",
@@ -26,7 +27,7 @@ var personItem = store.Person{
 func newPersonStore() store.PersonStore {
 	var mockStore = mocks.PersonStore{}
 	//CreatePerson(person *Person) error
-	mockStore.On("CreatePerson", mock.Anything).Return(func(person *store.Person) error {
+	mockStore.On("CreatePerson", mock.Anything).Return(func(person *models.Person) error {
 		person.Id = personItem.Id
 		person.CreatedAt = personItem.CreatedAt
 		person.UpdatedAt = personItem.UpdatedAt
@@ -35,8 +36,8 @@ func newPersonStore() store.PersonStore {
 	//GetPerson(id string) (*Person, error)
 	mockStore.On("GetPerson", mock.Anything).Return(&personItem, nil)
 	//GetPersons(filters *PersonFilters) ([]Person, error)
-	mockStore.On("GetPersons", mock.Anything).Return(func(filters *store.PersonFilters) []store.Person {
-		var persons = make([]store.Person, 0)
+	mockStore.On("GetPersons", mock.Anything).Return(func(filters *store.PersonFilters) []models.Person {
+		var persons = make([]models.Person, 0)
 		persons = append(persons, personItem)
 		return persons
 	}, nil)
@@ -53,9 +54,8 @@ type TestServiceSuite struct {
 }
 
 func (p *TestServiceSuite) SetupTest() {
-	var personStore = store.NewStore()
-	personStore.Set(store.PersonStoreName, newPersonStore())
-	p.server = NewPersonService(personStore)
+	store.Instance().Person = newPersonStore()
+	p.server = NewPersonService()
 }
 
 func (p *TestServiceSuite) TestCreatePerson() {

internal/grpc/interceptors/validator.go internal/servers/grpc/interceptors/validator.go

@@ -1,4 +1,4 @@
-package service
+package services
 
 //import "example/generated"
 //