diff --git a/README.md b/README.md new file mode 100644 index 0000000..8f2bb21 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# cake_crm + +Генерация контракта + +```shell +make generate +``` + +Запуск + +```shell +make run +``` diff --git a/cmd/cake_crm/main.go b/cmd/cake_crm/main.go index 8ffd614..3c26c5e 100644 --- a/cmd/cake_crm/main.go +++ b/cmd/cake_crm/main.go @@ -3,7 +3,7 @@ package main import ( "cake_crm/internal/app" "cake_crm/internal/models/storage/storage_file" - crm "cake_crm/proto" + proto "cake_crm/proto" "context" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" @@ -29,7 +29,7 @@ func main() { // Create a gRPC server object s := grpc.NewServer() // Attach the Greeter service to the server - crm.RegisterCRMServer(s, app.NewServer(storage)) + proto.RegisterCRMServer(s, app.NewServer(storage)) // Serve gRPC server log.Println("Serving gRPC on 0.0.0.0:8080") go func() { @@ -48,7 +48,7 @@ func main() { gwmux := runtime.NewServeMux() // Register Greeter - err = crm.RegisterCRMHandler(context.Background(), gwmux, conn) + err = proto.RegisterCRMHandler(context.Background(), gwmux, conn) if err != nil { log.Fatalln("Failed to register gateway:", err) } diff --git a/internal/app/server.go b/internal/app/server.go index cb2d94b..5c5b5ee 100644 --- a/internal/app/server.go +++ b/internal/app/server.go @@ -2,12 +2,12 @@ package app import ( "cake_crm/internal/models/storage" - crm "cake_crm/proto" + proto "cake_crm/proto" "context" ) type Server struct { - crm.UnimplementedCRMServer + proto.UnimplementedCRMServer storage storage.IStorage } @@ -17,34 +17,34 @@ func NewServer(storage storage.IStorage) *Server { } } -func (s *Server) GetCatalog(ctx context.Context, _ *crm.GetCatalogReq) (*crm.CatalogRsp, error) { +func (s *Server) GetCatalog(ctx context.Context, _ *proto.GetCatalogReq) (*proto.CatalogRsp, error) { categories, err := s.storage.GetCatalog(ctx) if err != nil { return nil, err } - return &crm.CatalogRsp{Categories: categories}, nil + return &proto.CatalogRsp{Categories: categories}, nil } -func (s *Server) GetPositions(ctx context.Context, req *crm.GetPositionsReq) (*crm.PositionsRsp, error) { +func (s *Server) GetPositions(ctx context.Context, req *proto.GetPositionsReq) (*proto.PositionsRsp, error) { products, err := s.storage.GetPositions(ctx, req.Id) if err != nil { return nil, err } - return &crm.PositionsRsp{Products: products}, nil + return &proto.PositionsRsp{Products: products}, nil } -func (s *Server) GetProduct(ctx context.Context, req *crm.GetProductReq) (*crm.ProductRsp, error) { +func (s *Server) GetProduct(ctx context.Context, req *proto.GetProductReq) (*proto.ProductRsp, error) { product, err := s.storage.GetProduct(ctx, req.Id) if err != nil { return nil, err } - return &crm.ProductRsp{Product: product}, nil + return &proto.ProductRsp{Product: product}, nil } -func (s *Server) GetBreadcrumbs(ctx context.Context, req *crm.GetBreadcrumbsReq) (*crm.BreadcrumbsRsp, error) { +func (s *Server) GetBreadcrumbs(ctx context.Context, req *proto.GetBreadcrumbsReq) (*proto.BreadcrumbsRsp, error) { breadcrumbs, err := s.storage.GetBreadcrumbs(ctx, req.Id) if err != nil { return nil, err } - return &crm.BreadcrumbsRsp{Categories: breadcrumbs}, nil + return &proto.BreadcrumbsRsp{Categories: breadcrumbs}, nil }