added tariff grpc client for get tariff

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/caarlos0/env/v8 v8.0.0
 	github.com/go-resty/resty/v2 v2.11.0
 	github.com/gofiber/fiber/v2 v2.52.5
-	github.com/golang-jwt/jwt/v5 v5.2.0
+	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/joho/godotenv v1.5.1
 	github.com/labstack/echo/v4 v4.11.4
@@ -21,16 +21,17 @@ require (
 	github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf
 	github.com/twmb/franz-go v1.18.0
 	github.com/twmb/franz-go/pkg/kadm v1.11.0
-	go.mongodb.org/mongo-driver v1.14.0
+	go.mongodb.org/mongo-driver v1.15.0
 	go.uber.org/zap v1.27.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157
+	google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a
-	google.golang.org/grpc v1.65.0
+	google.golang.org/grpc v1.74.2
-	google.golang.org/protobuf v1.34.2
+	google.golang.org/protobuf v1.36.6
 	gopkg.in/tucnak/telebot.v2 v2.5.0
 )
 
 require (
 	gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 // indirect
+	gitea.pena/PenaSide/tariffs v0.0.0-20250724065619-d952c197086b // indirect
 	github.com/ClickHouse/clickhouse-go v1.5.4 // indirect
 	github.com/andybalholm/brotli v1.1.0 // indirect
 	github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
@@ -63,12 +64,12 @@ require (
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
 	go.etcd.io/bbolt v1.3.10 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -17,6 +17,8 @@ gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a h1:UySqMga
 gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU=
 gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 h1:jDVeUhGBTXBibmW5dmtJg2m2+z5z2Rf6J4G0LpjVoJ0=
 gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU=
+gitea.pena/PenaSide/tariffs v0.0.0-20250724065619-d952c197086b h1:+Bgjp2yHQpNo01za8JLkEtssM8zogPjlNvwXRNNPbeA=
+gitea.pena/PenaSide/tariffs v0.0.0-20250724065619-d952c197086b/go.mod h1:cALhkOSALbDnN43uWeEhnijXacfT8obhMESCIAxehaE=
 gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ=
 gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4/go.mod h1:Bp5fJX0XsTV3QYximX6R2kCRvVKQAPwxjjCPm+ToTY8=
 gitea.pena/PenaSide/trashlog v0.0.0-20250222101337-a43552caae6f h1:KbZU49A8tGnqWZiDwerKx2LVT7LD69Y13bwHkuyIjrM=
@@ -62,6 +64,7 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -194,6 +197,7 @@ go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
 go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
 go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
 go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
+go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
@@ -218,6 +222,7 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
 golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
 golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -245,6 +250,7 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
 golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
 golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -256,6 +262,7 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -275,6 +282,7 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
 golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
 golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -291,6 +299,7 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
 golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
@@ -319,8 +328,11 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=
 google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
+google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a h1:SGktgSolFCo75dnHJF2yMvnns6jCmHFJ0vE4Vn2JKvQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a/go.mod h1:a77HrdMjoeKbnd2jmgcWdaS++ZLZAEq3orIOAEIKiVw=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -328,8 +340,10 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
 google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

internal/app/app.go

@@ -128,6 +128,7 @@ func Run(config *models.Config, logger *zap.Logger, build Build) (appErr error)
 		CodewordServiceHost:      config.CodewordMicroserviceGRPC,
 		Notifier:                 notificationBot,
 		NotificationRsPayChannel: config.NotificationRsPayChannel,
+		TariffMicroserviceGRPC:   config.TariffMicroserviceGRPC,
 	})
 
 	repositories := initialize.NewRepositories(initialize.RepositoriesDeps{

internal/initialize/clients.go

@@ -3,6 +3,7 @@ package initialize
 import (
 	"gitea.pena/PenaSide/customer/internal/interface/client"
 	"gitea.pena/PenaSide/customer/internal/models"
+	"gitea.pena/PenaSide/tariffs/pkg/grpc_clients"
 	"go.uber.org/zap"
 	"gopkg.in/tucnak/telebot.v2"
 )
@@ -20,6 +21,7 @@ type ClientsDeps struct {
 	CodewordServiceHost      string
 	NotificationRsPayChannel int64
 	Notifier                 *telebot.Bot
+	TariffMicroserviceGRPC   string
 }
 
 type Clients struct {
@@ -33,6 +35,7 @@ type Clients struct {
 	MailClient         *client.MailClient
 	CodewordClient     *client.CodewordClient
 	TelegramClient     *client.TelegramClient
+	TariffGrpcClient   *grpc_clients.TariffGRPCClient
 }
 
 func NewClients(deps ClientsDeps) *Clients {
@@ -74,5 +77,9 @@ func NewClients(deps ClientsDeps) *Clients {
 			Notifier:           deps.Notifier,
 			NotifierPayChannel: deps.NotificationRsPayChannel,
 		}),
+		TariffGrpcClient: grpc_clients.NewTariffGRPCClient(grpc_clients.Deps{
+			Logger:            deps.Logger,
+			TariffServiceHost: deps.TariffMicroserviceGRPC,
+		}),
 	}
 }

internal/initialize/services.go

@@ -61,10 +61,10 @@ func NewServices(deps ServicesDeps) *Services {
 			NotifyChannel:     deps.NotificationChannel,
 			AdminURL:          deps.AdminURL,
 			HistoryRepo:       deps.Repositories.HistoryRepository,
-			HubAdminClient:    deps.Clients.HubadminClient,
 			DiscountClient:    deps.Clients.DiscountClient,
 			CurrencyClient:    deps.Clients.CurrencyClient,
 			Producer:          deps.Brokers.TariffProducer,
+			TariffGrpcClient:  deps.Clients.TariffGrpcClient,
 		}),
 		TariffBrokerService: tariffBrokerService,
 	}

internal/models/config.go

@@ -15,6 +15,7 @@ type Config struct {
 	GrpcDomain                 string   `env:"GRPC_DOMAIN"`
 	AuthMicroserviceURL        string   `env:"AUTH_MICROSERVICE_URL,required"`     // http://10.8.0.6:59300/user
 	HubadminMicroserviceURL    string   `env:"HUBADMIN_MICROSERVICE_URL,required"` // http://10.8.0.6:59303/tariff
+	TariffMicroserviceGRPC     string   `env:"TARIFF_MICROSERVICE_GRPC_URL,required"`
 	CurrencyMicroserviceURL    string   `env:"CURRENCY_MICROSERVICE_URL,required"` // http://10.8.0.6:3131/change
 	DiscountMicroserviceGRPC   string   `env:"DISCOUNT_MICROSERVICE_GRPC_URL,required"`
 	CodewordMicroserviceGRPC   string   `env:"CODEWORD_MICROSERVICE_GRPC_URL,required"`

internal/service/callback/payment.go

@@ -10,6 +10,7 @@ import (
 	"gitea.pena/PenaSide/customer/internal/utils"
 	"gitea.pena/PenaSide/customer/internal/utils/transfer"
 	"gitea.pena/PenaSide/customer/pkg/validate"
+	"gitea.pena/PenaSide/tariffs/pkg/grpc_clients"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"log"
 	"sync"
@@ -42,7 +43,7 @@ type PaymentCallbackServiceDeps struct {
 	NotifyChannel     int64
 	AdminURL          string
 	HistoryRepo       *repository.HistoryRepository
-	HubAdminClient    *client.HubadminClient
+	TariffGrpcClient  *grpc_clients.TariffGRPCClient
 	DiscountClient    *client.DiscountClient
 	CurrencyClient    *client.CurrencyClient
 	Producer          *tariff.Producer
@@ -57,7 +58,7 @@ type PaymentCallbackService struct {
 	notifyChannel     int64
 	adminURL          string
 	historyRepo       *repository.HistoryRepository
-	hubAdminClient    *client.HubadminClient
+	tariffGrpcClient  *grpc_clients.TariffGRPCClient
 	discountClient    *client.DiscountClient
 	currencyClient    *client.CurrencyClient
 	producer          *tariff.Producer
@@ -160,10 +161,41 @@ func (receiver *PaymentCallbackService) CartPurchaseEvent(ctx context.Context, e
 		return nil
 	}
 
-	tariffs, err := receiver.hubAdminClient.GetTariffs(ctx, accesToken, account.Cart)
+	tariffs := make([]models.Tariff, len(account.Cart))
+	for index, tariffID := range account.Cart {
+		resp, err := receiver.tariffGrpcClient.GetTariff(ctx, tariffID)
 		if err != nil {
-		receiver.logger.Error("failed to get tariffs on <CartPurchaseEvent> of <PaymentCallbackService>", zap.Error(err))
+			receiver.logger.Error("failed to get tariff on <GetTariffs> of <PaymentCallbackService>", zap.Error(err), zap.String("tariffID", tariffID))
-		return err
+			return errors.New(
+				fmt.Errorf("failed to get tariff on <FindByUserID> of <PaymentCallbackService>: %w", err),
+				errors.ErrInternalError,
+			)
+		}
+
+		pbTariff := resp.Tariff
+		privileges := make([]models.Privilege, 0, len(pbTariff.Privileges))
+		for _, pbPriv := range pbTariff.Privileges {
+			privileges = append(privileges, models.Privilege{
+				ID:          pbPriv.Id,
+				Name:        pbPriv.Name,
+				PrivilegeID: pbPriv.PrivilegeId,
+				ServiceKey:  pbPriv.ServiceKey,
+				Description: pbPriv.Description,
+				Amount:      uint64(pbPriv.Amount),
+				Type:        models.PrivilegeType(pbPriv.Type),
+				Value:       pbPriv.Value,
+				Price:       uint64(pbPriv.Price),
+			})
+		}
+
+		tariffs[index] = models.Tariff{
+			ID:         pbTariff.Id,
+			Name:       pbTariff.Name,
+			Price:      uint64(pbTariff.Price),
+			IsCustom:   pbTariff.IsCustom,
+			Privileges: privileges,
+			Deleted:    pbTariff.IsDeleted,
+		}
 	}
 
 	tariffsAmount := utils.CalculateCartPurchasesAmount(tariffs)