.drone.yml

@@ -37,9 +37,6 @@ steps:
         - deploys/cake_crm
       source:
         - resources
-        - resources/images
-        - telegram_order_chat_id.txt
-        - order_bot_token.txt
         - cake_crm
         - docker-compose.yml
         - Dockerfile
@@ -59,8 +56,6 @@ steps:
       command_timeout: 10s
       script:
         - cd deploys/cake_crm
-        - mv order_bot_token.txt resources
-        - mv telegram_order_chat_id.txt resources
         - docker-compose up -d --build --force-recreate
 
 trigger:

.gitignore

@@ -1,6 +1,4 @@
 .idea
-.vscode
-.DS_Store
 
 bin
 

README.md

@@ -1,7 +1,5 @@
 # cake_crm
 
-Маленький магазин
-
 Генерация контракта
 
 ```shell

api/main.proto

@@ -3,7 +3,6 @@ syntax = "proto3";
 package crabs.crm;
 
 import "google/api/annotations.proto";
-import "google/api/httpbody.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 
 option go_package = "pkg/proto";
@@ -28,7 +27,7 @@ service CRM {
   }
   rpc GetBreadcrumbs(GetBreadcrumbsReq) returns (BreadcrumbsRsp) {
     option (google.api.http) = {
-      get: "/products/{id}/breadcrumbs"
+      get: "/breadcrumbs/{id}"
     };
   }
   rpc Order(OrderReq) returns (OrderRsp) {
@@ -37,22 +36,12 @@ service CRM {
       body: "order"
     };
   }
-  rpc GetCart(CartReq) returns (CartRsp) {
+  rpc GetCard(CardReq) returns (CardRsp) {
     option (google.api.http) = {
-      post: "/cart"
+      post: "/card"
       body: "items"
     };
   }
-  rpc GetImage(GetImageReq) returns (google.api.HttpBody) {
-    option (google.api.http) = {
-      get: "/images/{name}"
-    };
-  }
-  rpc Search(SearchReq) returns (PositionsRsp) {
-    option (google.api.http) = {
-      get: "/search"
-    };
-  }
 }
 
 message GetCatalogReq {}
@@ -89,7 +78,6 @@ message Product {
   repeated Variant variants = 10;
   repeated Characteristic characteristics = 11;
   int64 category = 12;
-  repeated Label labels = 13;
 }
 
 message GroupedProduct {
@@ -101,7 +89,6 @@ message GroupedProduct {
 message Variant {
   int64 price = 1;
   repeated Property properties = 2;
-  bool active = 3;
 }
 
 message Property {
@@ -114,10 +101,6 @@ message Characteristic {
   string value = 2;
 }
 
-message Label {
-  string name = 1;
-}
-
 message GetProductReq {
   int64 id = 1;
 }
@@ -136,13 +119,13 @@ message BreadcrumbsRsp {
 
 message OrderReq {
   Order order = 1;
+  string name = 2;
+  string phone = 3;
 }
 
 message OrderRsp {}
 
 message Order {
-  string name = 2;
-  string phone = 3;
   repeated OrderItem items = 1;
 }
 
@@ -151,7 +134,7 @@ message OrderItem {
   int64 count = 2;
 }
 
-message CartItem {
+message CardItem {
   int64 id = 1;
   string article = 2;
   string name = 3;
@@ -161,27 +144,12 @@ message CartItem {
   double inventory = 9;
   int64 count = 10;
   int64 amount = 11;
-  int64 amountOld = 12;
-  int64 discount = 13;
-  repeated Variant variants = 14;
-  repeated Label labels = 15;
 }
 
-message CartReq {
+message CardReq {
   repeated OrderItem items = 1;
 }
 
-message CartRsp {
+message CardRsp {
-  repeated CartItem items = 1;
+  repeated CardItem items = 1;
-  int64 amount = 2;
-  int64 amountOld = 3;
-  int64 discount = 4;
-}
-
-message GetImageReq {
-  string name = 1;
-}
-
-message SearchReq {
-  string text = 1;
 }

api/request.http

@@ -1,56 +0,0 @@
-GET http://localhost:8090/catalog
-User-Agent: crabs/1.0.0
-
-###
-
-# prod
-GET http://cake-api.3crabs.ru/catalog
-User-Agent: crabs/1.0.0
-
-###
-
-GET http://localhost:8090/products/1
-User-Agent: crabs/1.0.0
-
-###
-
-POST http://localhost:8090/cart
-User-Agent: crabs/1.0.0
-Content-Type: application/json
-
-[
-  {
-    "product_id": 1,
-    "count": 7
-  },
-  {
-    "product_id": 20,
-    "count": 15
-  }
-]
-
-###
-
-POST http://localhost:8090/orders
-User-Agent: crabs/1.0.0
-Content-Type: application/json
-
-{
-  "name": "Иванов Иван",
-  "phone": "+7-000-000-00-00",
-  "items": [
-    {
-      "product_id": 1,
-      "count": 7
-    },
-    {
-      "product_id": 20,
-      "count": 15
-    }
-  ]
-}
-
-###
-
-GET http://localhost:8090/search?text=Лимон
-User-Agent: crabs/1.0.0

cmd/cake_crm/main.go

@@ -1,52 +1,40 @@
 package main
 
 import (
+	"cake_crm/internal/app"
+	"cake_crm/internal/modules/messenger/telegram"
+	"cake_crm/internal/modules/storage/storage_file"
+	"cake_crm/internal/services/card"
+	proto "cake_crm/proto"
 	"context"
+	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"log"
 	"net"
 	"net/http"
 	"os"
 	"strconv"
-	"strings"
-
-	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"cake_crm/internal/app"
-	"cake_crm/internal/modules/messenger/telegram"
-	"cake_crm/internal/modules/storage/storage_file"
-	"cake_crm/internal/services/cart"
-	"cake_crm/internal/services/order"
-	proto "cake_crm/proto"
 )
 
 func main() {
 	storage := storage_file.NewStorageFile()
 
-	cartService := cart.NewService(storage)
+	cardService := card.NewService(storage)
-
-	orderService := order.NewService()
 
 	tokenData, err := os.ReadFile("resources/order_bot_token.txt")
 	if err != nil {
 		panic(err)
 	}
-	token := strings.TrimSpace(string(tokenData))
+	token := string(tokenData)
 
 	chatIdData, err := os.ReadFile("resources/telegram_order_chat_id.txt")
 	if err != nil {
 		panic(err)
 	}
-	chatID, err := strconv.ParseInt(strings.TrimSpace(string(chatIdData)), 10, 64)
+	chatID, err := strconv.ParseInt(string(chatIdData), 10, 64)
-	if err != nil {
-		panic(err)
-	}
 
 	messenger, err := telegram.NewMessenger(chatID, token)
-	if err != nil {
-		panic(err)
-	}
 
 	// Create a listener on TCP port
 	lis, err := net.Listen("tcp", ":8080")
@@ -57,7 +45,7 @@ func main() {
 	// Create a gRPC server object
 	s := grpc.NewServer()
 	// Attach the Greeter service to the server
-	proto.RegisterCRMServer(s, app.NewServer(storage, messenger, cartService, orderService))
+	proto.RegisterCRMServer(s, app.NewServer(storage, messenger, cardService))
 	// Serve gRPC server
 	log.Println("Serving gRPC on 0.0.0.0:8080")
 	go func() {
@@ -104,12 +92,6 @@ func main() {
 
 func cors(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// ua := r.Header.Get("User-Agent")
-		// if !strings.HasPrefix(ua, "crabs") {
-		// 	w.WriteHeader(403)
-		// 	return
-		// }
-
 		w.Header().Set("Access-Control-Allow-Origin", "*")
 		w.Header().Set("Access-Control-Allow-Methods", "GET, POST, PATCH, DELETE")
 		w.Header().Set("Access-Control-Allow-Headers", "Accept, Content-Type, Content-Length, Accept-Encoding, Authorization, ResponseType")

go.mod

@@ -5,7 +5,6 @@ go 1.22
 require (
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
-	github.com/patrickmn/go-cache v2.1.0+incompatible
 	google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8
 	google.golang.org/grpc v1.64.0
 	google.golang.org/protobuf v1.34.1

go.sum

@@ -4,8 +4,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=

internal/app/server.go

@@ -1,36 +1,28 @@
 package app
 
 import (
+	"bytes"
 	"cake_crm/internal/modules/messenger"
 	"cake_crm/internal/modules/storage"
-	"cake_crm/internal/services/cart"
+	"cake_crm/internal/services/card"
-	"cake_crm/internal/services/order"
 	proto "cake_crm/proto"
 	"context"
+	"errors"
 	"fmt"
-	"google.golang.org/genproto/googleapis/api/httpbody"
-	"os"
 )
 
 type Server struct {
 	proto.UnsafeCRMServer
 	storage     storage.IStorage
 	messenger   messenger.IMessenger
-	cartService  *cart.Service
+	cardService *card.Service
-	orderService *order.Service
 }
 
-func NewServer(
+func NewServer(storage storage.IStorage, messenger messenger.IMessenger, cardService *card.Service) proto.CRMServer {
-	storage storage.IStorage,
-	messenger messenger.IMessenger,
-	cartService *cart.Service,
-	orderService *order.Service,
-) proto.CRMServer {
 	return &Server{
 		storage:     storage,
 		messenger:   messenger,
-		cartService:  cartService,
+		cardService: cardService,
-		orderService: orderService,
 	}
 }
 
@@ -67,40 +59,53 @@ func (s *Server) GetBreadcrumbs(ctx context.Context, req *proto.GetBreadcrumbsRe
 }
 
 func (s *Server) Order(ctx context.Context, req *proto.OrderReq) (*proto.OrderRsp, error) {
-	enrichItems, err := s.cartService.GetCart(ctx, req.Order.Items)
+	enrichItems, err := s.cardService.GetCard(ctx, req.Order.Items)
 	if err != nil {
 		return nil, err
 	}
-	text, err := s.orderService.CreateOrderText(req, enrichItems)
+	text, err := createOrderText(req, enrichItems)
 	if err != nil {
 		return nil, err
 	}
 	return &proto.OrderRsp{}, s.messenger.SendMessage(text)
 }
 
-func (s *Server) GetCart(ctx context.Context, req *proto.CartReq) (*proto.CartRsp, error) {
+func createOrderText(req *proto.OrderReq, items []*proto.CardItem) (string, error) {
-	resp, err := s.cartService.GetCart(ctx, req.Items)
+	buffer := bytes.Buffer{}
+	var orderAmount int64
+	buffer.WriteString(fmt.Sprintf("Заказ от:\n%s\n%s\n", req.Name, req.Phone))
+	buffer.WriteString("\n")
+	for _, item := range items {
+		buffer.WriteString(item.Name)
+		buffer.WriteString("\n")
+		unit, err := unitToText(item.Unit)
 		if err != nil {
-		return nil, err
+			return "", err
 		}
-	return resp, nil
+		buffer.WriteString(fmt.Sprintf("Количество: %d%s\n", item.Count, unit))
+		orderAmount += item.Amount
+		buffer.WriteString(fmt.Sprintf("Сумма: %.00fр\n", float64(item.Amount)/100))
+		buffer.WriteString("\n")
+	}
+	buffer.WriteString("\n")
+	buffer.WriteString(fmt.Sprintf("ИТОГО: %.00fр\n", float64(orderAmount)/100))
+	return buffer.String(), nil
 }
 
-func (s *Server) GetImage(_ context.Context, req *proto.GetImageReq) (*httpbody.HttpBody, error) {
+func unitToText(unit string) (string, error) {
-	data, err := os.ReadFile(fmt.Sprintf("resources/images/%s", req.Name))
+	switch unit {
-	if err != nil {
+	case "kg":
-		return nil, err
+		return "кг", nil
+	case "piece":
+		return "шт", nil
 	}
-	return &httpbody.HttpBody{
+	return "", errors.New("unit not found")
-		ContentType: "image/jpeg",
-		Data:        data,
-	}, nil
 }
 
-func (s *Server) Search(ctx context.Context, req *proto.SearchReq) (*proto.PositionsRsp, error) {
+func (s *Server) GetCard(ctx context.Context, req *proto.CardReq) (*proto.CardRsp, error) {
-	products, err := s.storage.GetPositionsByText(ctx, req.Text)
+	enrichItems, err := s.cardService.GetCard(ctx, req.Items)
 	if err != nil {
 		return nil, err
 	}
-	return &proto.PositionsRsp{Products: products}, nil
+	return &proto.CardRsp{Items: enrichItems}, nil
 }

internal/modules/storage/interface.go

@@ -10,5 +10,4 @@ type IStorage interface {
 	GetPositions(ctx context.Context, id int64) ([]*crm.Product, error)
 	GetProduct(ctx context.Context, id int64) (*crm.Product, error)
 	GetBreadcrumbs(ctx context.Context, id int64) ([]*crm.Category, error)
-	GetPositionsByText(ctx context.Context, text string) ([]*crm.Product, error)
 }

internal/modules/storage/storage_file/storage.go

@@ -6,45 +6,21 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
-	"github.com/patrickmn/go-cache"
 	"os"
-	"strings"
-	"time"
 )
 
-type Product struct {
-	Id              int64                 `json:"id"`
-	Article         string                `json:"article"`
-	Name            string                `json:"name"`
-	Uri             string                `json:"uri"`
-	Images          []string              `json:"images"`
-	Description     string                `json:"description"`
-	Group           int64                 `json:"group"`
-	Unit            string                `json:"unit"`
-	Inventory       float64               `json:"inventory"`
-	Variants        []*crm.Variant        `json:"variants"`
-	Characteristics []*crm.Characteristic `json:"characteristics"`
-	Category        int64                 `json:"category"`
-	Labels          []*crm.Label          `json:"labels"`
-}
-
 var (
 	ErrProductNotFound = errors.New("product not found")
 )
 
-type storageFile struct {
+type storageFile struct{}
-	cache *cache.Cache
-}
 
 func NewStorageFile() storage.IStorage {
-	return &storageFile{
+	return &storageFile{}
-		cache: cache.New(24*time.Hour, time.Hour),
-	}
 }
 
 func (s *storageFile) GetCatalog(_ context.Context) ([]*crm.Category, error) {
-	data, err := s.readFile("catalog")
+	data, err := os.ReadFile("resources/catalog.json")
 	if err != nil {
 		return nil, err
 	}
@@ -56,7 +32,7 @@ func (s *storageFile) GetCatalog(_ context.Context) ([]*crm.Category, error) {
 }
 
 func (s *storageFile) GetPositions(_ context.Context, id int64) ([]*crm.Product, error) {
-	data, err := s.readFile("products")
+	data, err := os.ReadFile("resources/products.json")
 	if err != nil {
 		return nil, err
 	}
@@ -67,7 +43,6 @@ func (s *storageFile) GetPositions(_ context.Context, id int64) ([]*crm.Product,
 	res := make([]*crm.Product, 0, len(products))
 	for _, product := range products {
 		if id == 0 || product.Category == id {
-			s.enrichedProduct(product)
 			res = append(res, product)
 		}
 	}
@@ -75,62 +50,24 @@ func (s *storageFile) GetPositions(_ context.Context, id int64) ([]*crm.Product,
 }
 
 func (s *storageFile) GetProduct(_ context.Context, id int64) (*crm.Product, error) {
-	data, err := s.readFile("products")
+	data, err := os.ReadFile("resources/products.json")
 	if err != nil {
 		return nil, err
 	}
-	var products []*Product
+	var products []*crm.Product
 	if err := json.Unmarshal(data, &products); err != nil {
 		return nil, err
 	}
-	var product *Product
+	for _, product := range products {
-	for _, p := range products {
+		if product.Id == id {
-		if p.Id == id {
+			return product, nil
-			product = p
-			break
 		}
 	}
-	if product == nil {
 	return nil, ErrProductNotFound
 }
-	res := &crm.Product{
-		Id:              product.Id,
-		Article:         product.Article,
-		Name:            product.Name,
-		Uri:             product.Uri,
-		Images:          product.Images,
-		Description:     product.Description,
-		GroupedProducts: nil,
-		Unit:            product.Unit,
-		Inventory:       product.Inventory,
-		Variants:        product.Variants,
-		Characteristics: product.Characteristics,
-		Category:        product.Category,
-		Labels:          product.Labels,
-	}
-	s.enrichedProduct(res)
-	for _, p := range products {
-		if p.Group == product.Group {
-			image := ""
-			if len(product.Images) > 0 {
-				image = p.Images[0]
-			}
-			res.GroupedProducts = append(res.GroupedProducts, &crm.GroupedProduct{
-				Name:  p.Name,
-				Uri:   p.Uri,
-				Image: image,
-			})
-		}
-	}
-	return res, nil
-}
 
-func (s *storageFile) GetBreadcrumbs(ctx context.Context, id int64) ([]*crm.Category, error) {
+func (s *storageFile) GetBreadcrumbs(_ context.Context, id int64) ([]*crm.Category, error) {
-	product, err := s.GetProduct(ctx, id)
+	data, err := os.ReadFile("resources/catalog.json")
-	if err != nil {
-		return nil, err
-	}
-	data, err := s.readFile("catalog")
 	if err != nil {
 		return nil, err
 	}
@@ -138,17 +75,7 @@ func (s *storageFile) GetBreadcrumbs(ctx context.Context, id int64) ([]*crm.Cate
 	if err := json.Unmarshal(data, &categories); err != nil {
 		return nil, err
 	}
-	breadcrumbs := getBreadcrumbs(categories, product.Id)
+	return getBreadcrumbs(categories, id), nil
-	breadcrumbs = append(breadcrumbs, &crm.Category{
-		Name: product.Name,
-	})
-	return breadcrumbs, nil
-}
-
-func (s *storageFile) enrichedProduct(product *crm.Product) {
-	if len(product.Variants) > 1 {
-		product.Labels = append(product.Labels, &crm.Label{Name: "Оптом дешевле"})
-	}
 }
 
 func getBreadcrumbs(categories []*crm.Category, id int64) []*crm.Category {
@@ -168,37 +95,3 @@ func getBreadcrumbs(categories []*crm.Category, id int64) []*crm.Category {
 	}
 	return nil
 }
-
-func (s *storageFile) GetPositionsByText(_ context.Context, text string) ([]*crm.Product, error) {
-	data, err := s.readFile("products")
-	if err != nil {
-		return nil, err
-	}
-	var products []*crm.Product
-	if err := json.Unmarshal(data, &products); err != nil {
-		return nil, err
-	}
-	res := make([]*crm.Product, 0, len(products))
-	searchText := strings.TrimSpace(strings.ToLower(text))
-	for _, product := range products {
-		name := strings.ToLower(product.Name)
-		if strings.Contains(name, searchText) {
-			s.enrichedProduct(product)
-			res = append(res, product)
-		}
-	}
-	return res, nil
-}
-
-func (s *storageFile) readFile(name string) ([]byte, error) {
-	cacheData, found := s.cache.Get(name)
-	if found {
-		return cacheData.([]byte), nil
-	}
-	data, err := os.ReadFile(fmt.Sprintf("resources/%s.json", name))
-	if err != nil {
-		return nil, err
-	}
-	s.cache.Set(name, data, cache.DefaultExpiration)
-	return data, nil
-}

internal/services/card/card.go

@@ -1,12 +1,11 @@
-package cart
+package card
 
 import (
+	"cake_crm/internal/modules/storage"
+	"cake_crm/proto"
 	"context"
 	"errors"
 	"strconv"
-
-	"cake_crm/internal/modules/storage"
-	"cake_crm/proto"
 )
 
 type ProductAndCount struct {
@@ -24,16 +23,14 @@ func NewService(storage storage.IStorage) *Service {
 	}
 }
 
-func (s *Service) GetCart(ctx context.Context, items []*proto.OrderItem) (*proto.CartRsp, error) {
+func (s *Service) GetCard(ctx context.Context, items []*proto.OrderItem) ([]*proto.CardItem, error) {
-	var cartAmount int64
+	res := make([]*proto.CardItem, 0, len(items))
-	var cartAmountOld int64
-	res := make([]*proto.CartItem, 0, len(items))
 	for _, item := range items {
 		product, err := s.storage.GetProduct(ctx, item.ProductId)
 		if err != nil {
 			return nil, err
 		}
-		amount, amountOld, err := calcItemAmount(
+		amount, err := calcItemAmount(
 			&ProductAndCount{
 				product: product,
 				count:   item.Count,
@@ -44,7 +41,7 @@ func (s *Service) GetCart(ctx context.Context, items []*proto.OrderItem) (*proto
 		}
 		res = append(
 			res,
-			&proto.CartItem{
+			&proto.CardItem{
 				Id:        product.Id,
 				Article:   product.Article,
 				Name:      product.Name,
@@ -54,25 +51,13 @@ func (s *Service) GetCart(ctx context.Context, items []*proto.OrderItem) (*proto
 				Inventory: product.Inventory,
 				Count:     item.Count,
 				Amount:    amount,
-				AmountOld: amountOld,
-				Discount:  amountOld - amount,
-				Variants:  product.Variants,
-				Labels:    product.Labels,
 			},
 		)
-		cartAmount += amount
-		cartAmountOld += amountOld
 	}
-	return &proto.CartRsp{
+	return res, nil
-		Items:     res,
-		Amount:    cartAmount,
-		AmountOld: cartAmountOld,
-		Discount:  cartAmountOld - cartAmount,
-	}, nil
 }
 
-func calcItemAmount(item *ProductAndCount) (int64, int64, error) {
+func calcItemAmount(item *ProductAndCount) (int64, error) {
-	variantOld := item.product.Variants[0]
 	var variant *proto.Variant
 	for _, v := range item.product.Variants {
 		check := true
@@ -80,7 +65,7 @@ func calcItemAmount(item *ProductAndCount) (int64, int64, error) {
 			if property.Name == "min" {
 				minBorder, err := strconv.ParseInt(property.Value, 10, 64)
 				if err != nil {
-					return 0, 0, err
+					return 0, err
 				}
 				if item.count < minBorder {
 					check = false
@@ -89,7 +74,7 @@ func calcItemAmount(item *ProductAndCount) (int64, int64, error) {
 			if property.Name == "max" {
 				maxBorder, err := strconv.ParseInt(property.Value, 10, 64)
 				if err != nil {
-					return 0, 0, err
+					return 0, err
 				}
 				if item.count > maxBorder {
 					check = false
@@ -101,9 +86,8 @@ func calcItemAmount(item *ProductAndCount) (int64, int64, error) {
 			}
 		}
 	}
-	variant.Active = true
 	if variant == nil {
-		return 0, 0, errors.New("variant not found")
+		return 0, errors.New("variant not found")
 	}
-	return variant.Price * item.count, variantOld.Price * item.count, nil
+	return variant.Price * item.count, nil
 }

internal/services/order/order.go

@@ -1,44 +0,0 @@
-package order
-
-import (
-	"bytes"
-	"cake_crm/proto"
-	"errors"
-	"fmt"
-)
-
-type Service struct{}
-
-func NewService() *Service {
-	return &Service{}
-}
-
-func (s *Service) CreateOrderText(req *proto.OrderReq, cart *proto.CartRsp) (string, error) {
-	buffer := bytes.Buffer{}
-	buffer.WriteString(fmt.Sprintf("Заказ от:\n%s\n%s\n", req.Order.Name, req.Order.Phone))
-	buffer.WriteString("\n")
-	for _, item := range cart.Items {
-		buffer.WriteString(item.Name)
-		buffer.WriteString("\n")
-		unit, err := unitToText(item.Unit)
-		if err != nil {
-			return "", err
-		}
-		buffer.WriteString(fmt.Sprintf("Количество: %d%s\n", item.Count, unit))
-		buffer.WriteString(fmt.Sprintf("Сумма: %.00fр\n", float64(item.Amount)/100))
-		buffer.WriteString("\n")
-	}
-	buffer.WriteString("\n")
-	buffer.WriteString(fmt.Sprintf("ИТОГО: %.00fр\n", float64(cart.Amount)/100))
-	return buffer.String(), nil
-}
-
-func unitToText(unit string) (string, error) {
-	switch unit {
-	case "kg":
-		return "кг", nil
-	case "piece":
-		return "шт", nil
-	}
-	return "", errors.New("unit not found")
-}

proto/main.pb.gw.go

@@ -205,6 +205,10 @@ func local_request_CRM_GetBreadcrumbs_0(ctx context.Context, marshaler runtime.M
 
 }
 
+var (
+	filter_CRM_Order_0 = &utilities.DoubleArray{Encoding: map[string]int{"order": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+)
+
 func request_CRM_Order_0(ctx context.Context, marshaler runtime.Marshaler, client CRMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq OrderReq
 	var metadata runtime.ServerMetadata
@@ -213,6 +217,13 @@ func request_CRM_Order_0(ctx context.Context, marshaler runtime.Marshaler, clien
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CRM_Order_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := client.Order(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -226,121 +237,40 @@ func local_request_CRM_Order_0(ctx context.Context, marshaler runtime.Marshaler,
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CRM_Order_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
 	msg, err := server.Order(ctx, &protoReq)
 	return msg, metadata, err
 
 }
 
-func request_CRM_GetCart_0(ctx context.Context, marshaler runtime.Marshaler, client CRMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_CRM_GetCard_0(ctx context.Context, marshaler runtime.Marshaler, client CRMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq CartReq
+	var protoReq CardReq
 	var metadata runtime.ServerMetadata
 
 	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Items); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := client.GetCart(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	msg, err := client.GetCard(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
 }
 
-func local_request_CRM_GetCart_0(ctx context.Context, marshaler runtime.Marshaler, server CRMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func local_request_CRM_GetCard_0(ctx context.Context, marshaler runtime.Marshaler, server CRMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq CartReq
+	var protoReq CardReq
 	var metadata runtime.ServerMetadata
 
 	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Items); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := server.GetCart(ctx, &protoReq)
+	msg, err := server.GetCard(ctx, &protoReq)
-	return msg, metadata, err
-
-}
-
-func request_CRM_GetImage_0(ctx context.Context, marshaler runtime.Marshaler, client CRMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetImageReq
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["name"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
-	}
-
-	protoReq.Name, err = runtime.String(val)
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
-	}
-
-	msg, err := client.GetImage(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-func local_request_CRM_GetImage_0(ctx context.Context, marshaler runtime.Marshaler, server CRMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GetImageReq
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["name"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
-	}
-
-	protoReq.Name, err = runtime.String(val)
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
-	}
-
-	msg, err := server.GetImage(ctx, &protoReq)
-	return msg, metadata, err
-
-}
-
-var (
-	filter_CRM_Search_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
-)
-
-func request_CRM_Search_0(ctx context.Context, marshaler runtime.Marshaler, client CRMClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SearchReq
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CRM_Search_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.Search(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-func local_request_CRM_Search_0(ctx context.Context, marshaler runtime.Marshaler, server CRMServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SearchReq
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_CRM_Search_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := server.Search(ctx, &protoReq)
 	return msg, metadata, err
 
 }
@@ -434,7 +364,7 @@ func RegisterCRMHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.crm.CRM/GetBreadcrumbs", runtime.WithHTTPPathPattern("/products/{id}/breadcrumbs"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.crm.CRM/GetBreadcrumbs", runtime.WithHTTPPathPattern("/breadcrumbs/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -476,7 +406,7 @@ func RegisterCRMHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 
 	})
 
-	mux.Handle("POST", pattern_CRM_GetCart_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_CRM_GetCard_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
@@ -484,12 +414,12 @@ func RegisterCRMHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.crm.CRM/GetCart", runtime.WithHTTPPathPattern("/cart"))
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.crm.CRM/GetCard", runtime.WithHTTPPathPattern("/card"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := local_request_CRM_GetCart_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+		resp, md, err := local_request_CRM_GetCard_0(annotatedContext, inboundMarshaler, server, req, pathParams)
 		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
 		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
 		if err != nil {
@@ -497,57 +427,7 @@ func RegisterCRMHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 			return
 		}
 
-		forward_CRM_GetCart_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_CRM_GetCard_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
-	mux.Handle("GET", pattern_CRM_GetImage_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		var stream runtime.ServerTransportStream
-		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.crm.CRM/GetImage", runtime.WithHTTPPathPattern("/images/{name}"))
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := local_request_CRM_GetImage_0(annotatedContext, inboundMarshaler, server, req, pathParams)
-		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
-		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
-		if err != nil {
-			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_CRM_GetImage_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
-	mux.Handle("GET", pattern_CRM_Search_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		var stream runtime.ServerTransportStream
-		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.crm.CRM/Search", runtime.WithHTTPPathPattern("/search"))
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := local_request_CRM_Search_0(annotatedContext, inboundMarshaler, server, req, pathParams)
-		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
-		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
-		if err != nil {
-			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_CRM_Search_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -664,7 +544,7 @@ func RegisterCRMHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/crabs.crm.CRM/GetBreadcrumbs", runtime.WithHTTPPathPattern("/products/{id}/breadcrumbs"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/crabs.crm.CRM/GetBreadcrumbs", runtime.WithHTTPPathPattern("/breadcrumbs/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -702,69 +582,25 @@ func RegisterCRMHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 
 	})
 
-	mux.Handle("POST", pattern_CRM_GetCart_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle("POST", pattern_CRM_GetCard_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		var err error
 		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/crabs.crm.CRM/GetCart", runtime.WithHTTPPathPattern("/cart"))
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/crabs.crm.CRM/GetCard", runtime.WithHTTPPathPattern("/card"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
 		}
-		resp, md, err := request_CRM_GetCart_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		resp, md, err := request_CRM_GetCard_0(annotatedContext, inboundMarshaler, client, req, pathParams)
 		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
 		if err != nil {
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
 
-		forward_CRM_GetCart_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_CRM_GetCard_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
-	mux.Handle("GET", pattern_CRM_GetImage_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/crabs.crm.CRM/GetImage", runtime.WithHTTPPathPattern("/images/{name}"))
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_CRM_GetImage_0(annotatedContext, inboundMarshaler, client, req, pathParams)
-		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
-		if err != nil {
-			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_CRM_GetImage_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
-	mux.Handle("GET", pattern_CRM_Search_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/crabs.crm.CRM/Search", runtime.WithHTTPPathPattern("/search"))
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_CRM_Search_0(annotatedContext, inboundMarshaler, client, req, pathParams)
-		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
-		if err != nil {
-			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_CRM_Search_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -778,15 +614,11 @@ var (
 
 	pattern_CRM_GetProduct_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1}, []string{"products", "id"}, ""))
 
-	pattern_CRM_GetBreadcrumbs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"products", "id", "breadcrumbs"}, ""))
+	pattern_CRM_GetBreadcrumbs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1}, []string{"breadcrumbs", "id"}, ""))
 
 	pattern_CRM_Order_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"orders"}, ""))
 
-	pattern_CRM_GetCart_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"cart"}, ""))
+	pattern_CRM_GetCard_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"card"}, ""))
-
-	pattern_CRM_GetImage_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 1, 0, 4, 1, 5, 1}, []string{"images", "name"}, ""))
-
-	pattern_CRM_Search_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"search"}, ""))
 )
 
 var (
@@ -800,9 +632,5 @@ var (
 
 	forward_CRM_Order_0 = runtime.ForwardResponseMessage
 
-	forward_CRM_GetCart_0 = runtime.ForwardResponseMessage
+	forward_CRM_GetCard_0 = runtime.ForwardResponseMessage
-
-	forward_CRM_GetImage_0 = runtime.ForwardResponseMessage
-
-	forward_CRM_Search_0 = runtime.ForwardResponseMessage
 )

proto/main_grpc.pb.go

@@ -8,7 +8,6 @@ package proto
 
 import (
 	context "context"
-	httpbody "google.golang.org/genproto/googleapis/api/httpbody"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -25,9 +24,7 @@ const (
 	CRM_GetProduct_FullMethodName     = "/crabs.crm.CRM/GetProduct"
 	CRM_GetBreadcrumbs_FullMethodName = "/crabs.crm.CRM/GetBreadcrumbs"
 	CRM_Order_FullMethodName          = "/crabs.crm.CRM/Order"
-	CRM_GetCart_FullMethodName        = "/crabs.crm.CRM/GetCart"
+	CRM_GetCard_FullMethodName        = "/crabs.crm.CRM/GetCard"
-	CRM_GetImage_FullMethodName       = "/crabs.crm.CRM/GetImage"
-	CRM_Search_FullMethodName         = "/crabs.crm.CRM/Search"
 )
 
 // CRMClient is the client API for CRM service.
@@ -39,9 +36,7 @@ type CRMClient interface {
 	GetProduct(ctx context.Context, in *GetProductReq, opts ...grpc.CallOption) (*ProductRsp, error)
 	GetBreadcrumbs(ctx context.Context, in *GetBreadcrumbsReq, opts ...grpc.CallOption) (*BreadcrumbsRsp, error)
 	Order(ctx context.Context, in *OrderReq, opts ...grpc.CallOption) (*OrderRsp, error)
-	GetCart(ctx context.Context, in *CartReq, opts ...grpc.CallOption) (*CartRsp, error)
+	GetCard(ctx context.Context, in *CardReq, opts ...grpc.CallOption) (*CardRsp, error)
-	GetImage(ctx context.Context, in *GetImageReq, opts ...grpc.CallOption) (*httpbody.HttpBody, error)
-	Search(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*PositionsRsp, error)
 }
 
 type cRMClient struct {
@@ -97,27 +92,9 @@ func (c *cRMClient) Order(ctx context.Context, in *OrderReq, opts ...grpc.CallOp
 	return out, nil
 }
 
-func (c *cRMClient) GetCart(ctx context.Context, in *CartReq, opts ...grpc.CallOption) (*CartRsp, error) {
+func (c *cRMClient) GetCard(ctx context.Context, in *CardReq, opts ...grpc.CallOption) (*CardRsp, error) {
-	out := new(CartRsp)
+	out := new(CardRsp)
-	err := c.cc.Invoke(ctx, CRM_GetCart_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, CRM_GetCard_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *cRMClient) GetImage(ctx context.Context, in *GetImageReq, opts ...grpc.CallOption) (*httpbody.HttpBody, error) {
-	out := new(httpbody.HttpBody)
-	err := c.cc.Invoke(ctx, CRM_GetImage_FullMethodName, in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *cRMClient) Search(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*PositionsRsp, error) {
-	out := new(PositionsRsp)
-	err := c.cc.Invoke(ctx, CRM_Search_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -133,9 +110,7 @@ type CRMServer interface {
 	GetProduct(context.Context, *GetProductReq) (*ProductRsp, error)
 	GetBreadcrumbs(context.Context, *GetBreadcrumbsReq) (*BreadcrumbsRsp, error)
 	Order(context.Context, *OrderReq) (*OrderRsp, error)
-	GetCart(context.Context, *CartReq) (*CartRsp, error)
+	GetCard(context.Context, *CardReq) (*CardRsp, error)
-	GetImage(context.Context, *GetImageReq) (*httpbody.HttpBody, error)
-	Search(context.Context, *SearchReq) (*PositionsRsp, error)
 	mustEmbedUnimplementedCRMServer()
 }
 
@@ -158,14 +133,8 @@ func (UnimplementedCRMServer) GetBreadcrumbs(context.Context, *GetBreadcrumbsReq
 func (UnimplementedCRMServer) Order(context.Context, *OrderReq) (*OrderRsp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Order not implemented")
 }
-func (UnimplementedCRMServer) GetCart(context.Context, *CartReq) (*CartRsp, error) {
+func (UnimplementedCRMServer) GetCard(context.Context, *CardReq) (*CardRsp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetCart not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method GetCard not implemented")
-}
-func (UnimplementedCRMServer) GetImage(context.Context, *GetImageReq) (*httpbody.HttpBody, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetImage not implemented")
-}
-func (UnimplementedCRMServer) Search(context.Context, *SearchReq) (*PositionsRsp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Search not implemented")
 }
 func (UnimplementedCRMServer) mustEmbedUnimplementedCRMServer() {}
 
@@ -270,56 +239,20 @@ func _CRM_Order_Handler(srv interface{}, ctx context.Context, dec func(interface
 	return interceptor(ctx, in, info, handler)
 }
 
-func _CRM_GetCart_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _CRM_GetCard_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CartReq)
+	in := new(CardReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(CRMServer).GetCart(ctx, in)
+		return srv.(CRMServer).GetCard(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: CRM_GetCart_FullMethodName,
+		FullMethod: CRM_GetCard_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(CRMServer).GetCart(ctx, req.(*CartReq))
+		return srv.(CRMServer).GetCard(ctx, req.(*CardReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _CRM_GetImage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GetImageReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(CRMServer).GetImage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: CRM_GetImage_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(CRMServer).GetImage(ctx, req.(*GetImageReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _CRM_Search_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SearchReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(CRMServer).Search(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: CRM_Search_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(CRMServer).Search(ctx, req.(*SearchReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -352,16 +285,8 @@ var CRM_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _CRM_Order_Handler,
 		},
 		{
-			MethodName: "GetCart",
+			MethodName: "GetCard",
-			Handler:    _CRM_GetCart_Handler,
+			Handler:    _CRM_GetCard_Handler,
-		},
-		{
-			MethodName: "GetImage",
-			Handler:    _CRM_GetImage_Handler,
-		},
-		{
-			MethodName: "Search",
-			Handler:    _CRM_Search_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},

resources/catalog.json

@@ -2,30 +2,18 @@
   {
     "id": 0,
     "name": "Главная",
-    "uri": "/positions/0",
+    "uri": "/categories/0",
     "children": [
       {
         "id": 1,
         "name": "Пряники",
-        "uri": "/positions/1",
+        "uri": "/categories/1",
         "children": []
       },
       {
         "id": 2,
-        "name": "Печенье бисквитное",
+        "name": "Пахлава",
-        "uri": "/positions/2",
+        "uri": "/categories/2",
-        "children": []
-      },
-      {
-        "id": 3,
-        "name": "Печенье песочное",
-        "uri": "/positions/3",
-        "children": []
-      },
-      {
-        "id": 4,
-        "name": "Восточные сладости",
-        "uri": "/positions/4",
         "children": []
       }
     ]

resources/main.swagger.json

@@ -16,14 +16,45 @@
     "application/json"
   ],
   "paths": {
-    "/cart": {
+    "/breadcrumbs/{id}": {
-      "post": {
+      "get": {
-        "operationId": "CRM_GetCart",
+        "operationId": "CRM_GetBreadcrumbs",
         "responses": {
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/crmCartRsp"
+              "$ref": "#/definitions/crmBreadcrumbsRsp"
+            }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "#/definitions/rpcStatus"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "format": "int64"
+          }
+        ],
+        "tags": [
+          "CRM"
+        ]
+      }
+    },
+    "/card": {
+      "post": {
+        "operationId": "CRM_GetCard",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/crmCardRsp"
             }
           },
           "default": {
@@ -74,36 +105,6 @@
         ]
       }
     },
-    "/images/{name}": {
-      "get": {
-        "operationId": "CRM_GetImage",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/apiHttpBody"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "name",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "CRM"
-        ]
-      }
-    },
     "/orders": {
       "post": {
         "operationId": "CRM_Order",
@@ -129,6 +130,18 @@
             "schema": {
               "$ref": "#/definitions/crabscrmOrder"
             }
+          },
+          {
+            "name": "name",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "phone",
+            "in": "query",
+            "required": false,
+            "type": "string"
           }
         ],
         "tags": [
@@ -197,110 +210,12 @@
           "CRM"
         ]
       }
-    },
-    "/products/{id}/breadcrumbs": {
-      "get": {
-        "operationId": "CRM_GetBreadcrumbs",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/crmBreadcrumbsRsp"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "required": true,
-            "type": "string",
-            "format": "int64"
-          }
-        ],
-        "tags": [
-          "CRM"
-        ]
-      }
-    },
-    "/search": {
-      "get": {
-        "operationId": "CRM_Search",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/crmPositionsRsp"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "text",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "CRM"
-        ]
-      }
     }
   },
   "definitions": {
-    "apiHttpBody": {
-      "type": "object",
-      "properties": {
-        "contentType": {
-          "type": "string",
-          "description": "The HTTP Content-Type header value specifying the content type of the body."
-        },
-        "data": {
-          "type": "string",
-          "format": "byte",
-          "description": "The HTTP request/response body as raw binary."
-        },
-        "extensions": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Application specific response metadata. Must be set in the first response\nfor streaming APIs."
-        }
-      },
-      "description": "Message that represents an arbitrary HTTP body. It should only be used for\npayload formats that can't be represented as JSON, such as raw binary or\nan HTML page.\n\n\nThis message can be used both in streaming and non-streaming API methods in\nthe request as well as the response.\n\nIt can be used as a top-level request field, which is convenient if one\nwants to extract parameters from either the URL or HTTP template into the\nrequest fields and also want access to the raw HTTP body.\n\nExample:\n\n    message GetResourceRequest {\n      // A unique request id.\n      string request_id = 1;\n\n      // The raw HTTP body is bound to this field.\n      google.api.HttpBody http_body = 2;\n\n    }\n\n    service ResourceService {\n      rpc GetResource(GetResourceRequest)\n        returns (google.api.HttpBody);\n      rpc UpdateResource(google.api.HttpBody)\n        returns (google.protobuf.Empty);\n\n    }\n\nExample with streaming methods:\n\n    service CaldavService {\n      rpc GetCalendar(stream google.api.HttpBody)\n        returns (stream google.api.HttpBody);\n      rpc UpdateCalendar(stream google.api.HttpBody)\n        returns (stream google.api.HttpBody);\n\n    }\n\nUse of this type only changes how the request and response bodies are\nhandled, all other features will continue to work unchanged."
-    },
-    "crabscrmLabel": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      }
-    },
     "crabscrmOrder": {
       "type": "object",
       "properties": {
-        "name": {
-          "type": "string"
-        },
-        "phone": {
-          "type": "string"
-        },
         "items": {
           "type": "array",
           "items": {
@@ -322,7 +237,7 @@
         }
       }
     },
-    "crmCartItem": {
+    "crmCardItem": {
       "type": "object",
       "properties": {
         "id": {
@@ -358,52 +273,18 @@
         "amount": {
           "type": "string",
           "format": "int64"
-        },
-        "amountOld": {
-          "type": "string",
-          "format": "int64"
-        },
-        "discount": {
-          "type": "string",
-          "format": "int64"
-        },
-        "variants": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/crmVariant"
-          }
-        },
-        "labels": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/crabscrmLabel"
-          }
         }
       }
     },
-    "crmCartRsp": {
+    "crmCardRsp": {
       "type": "object",
       "properties": {
         "items": {
           "type": "array",
           "items": {
             "type": "object",
-            "$ref": "#/definitions/crmCartItem"
+            "$ref": "#/definitions/crmCardItem"
           }
-        },
-        "amount": {
-          "type": "string",
-          "format": "int64"
-        },
-        "amountOld": {
-          "type": "string",
-          "format": "int64"
-        },
-        "discount": {
-          "type": "string",
-          "format": "int64"
         }
       }
     },
@@ -550,13 +431,6 @@
         "category": {
           "type": "string",
           "format": "int64"
-        },
-        "labels": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/crabscrmLabel"
-          }
         }
       }
     },
@@ -592,9 +466,6 @@
             "type": "object",
             "$ref": "#/definitions/crmProperty"
           }
-        },
-        "active": {
-          "type": "boolean"
         }
       }
     },
@@ -602,12 +473,10 @@
       "type": "object",
       "properties": {
         "@type": {
-          "type": "string",
+          "type": "string"
-          "description": "A URL/resource name that uniquely identifies the type of the serialized\nprotocol buffer message. This string must contain at least\none \"/\" character. The last segment of the URL's path must represent\nthe fully qualified name of the type (as in\n`path/google.protobuf.Duration`). The name should be in a canonical form\n(e.g., leading \".\" is not accepted).\n\nIn practice, teams usually precompile into the binary all types that they\nexpect it to use in the context of Any. However, for URLs which use the\nscheme `http`, `https`, or no scheme, one can optionally set up a type\nserver that maps type URLs to message definitions as follows:\n\n* If no scheme is provided, `https` is assumed.\n* An HTTP GET on the URL must yield a [google.protobuf.Type][]\n  value in binary format, or produce an error.\n* Applications are allowed to cache lookup results based on the\n  URL, or have them precompiled into a binary to avoid any\n  lookup. Therefore, binary compatibility needs to be preserved\n  on changes to types. (Use versioned type names to manage\n  breaking changes.)\n\nNote: this functionality is not currently available in the official\nprotobuf release, and it is not used for type URLs beginning with\ntype.googleapis.com. As of May 2023, there are no widely used type server\nimplementations and no plans to implement one.\n\nSchemes other than `http`, `https` (or the empty scheme) might be\nused with implementation specific semantics."
         }
       },
-      "additionalProperties": {},
+      "additionalProperties": {}
-      "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n    // or ...\n    if (any.isSameTypeAs(Foo.getDefaultInstance())) {\n      foo = any.unpack(Foo.getDefaultInstance());\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := anypb.New(foo)\n     if err != nil {\n       ...\n     }\n     ...\n     foo := \u0026pb.Foo{}\n     if err := any.UnmarshalTo(foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
     },
     "rpcStatus": {
       "type": "object",

third_party/google/api/httpbody.proto

@@ -1,81 +0,0 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/protobuf/any.proto";
-
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody";
-option java_multiple_files = true;
-option java_outer_classname = "HttpBodyProto";
-option java_package = "com.google.api";
-option objc_class_prefix = "GAPI";
-
-// Message that represents an arbitrary HTTP body. It should only be used for
-// payload formats that can't be represented as JSON, such as raw binary or
-// an HTML page.
-//
-//
-// This message can be used both in streaming and non-streaming API methods in
-// the request as well as the response.
-//
-// It can be used as a top-level request field, which is convenient if one
-// wants to extract parameters from either the URL or HTTP template into the
-// request fields and also want access to the raw HTTP body.
-//
-// Example:
-//
-//     message GetResourceRequest {
-//       // A unique request id.
-//       string request_id = 1;
-//
-//       // The raw HTTP body is bound to this field.
-//       google.api.HttpBody http_body = 2;
-//
-//     }
-//
-//     service ResourceService {
-//       rpc GetResource(GetResourceRequest)
-//         returns (google.api.HttpBody);
-//       rpc UpdateResource(google.api.HttpBody)
-//         returns (google.protobuf.Empty);
-//
-//     }
-//
-// Example with streaming methods:
-//
-//     service CaldavService {
-//       rpc GetCalendar(stream google.api.HttpBody)
-//         returns (stream google.api.HttpBody);
-//       rpc UpdateCalendar(stream google.api.HttpBody)
-//         returns (stream google.api.HttpBody);
-//
-//     }
-//
-// Use of this type only changes how the request and response bodies are
-// handled, all other features will continue to work unchanged.
-message HttpBody {
-  // The HTTP Content-Type header value specifying the content type of the body.
-  string content_type = 1;
-
-  // The HTTP request/response body as raw binary.
-  bytes data = 2;
-
-  // Application specific response metadata. Must be set in the first response
-  // for streaming APIs.
-  repeated google.protobuf.Any extensions = 3;
-}