Merge branch 'dev'

cmd/converter/main.go

@@ -27,7 +27,7 @@ func main() {
 
 	log := setupLogger(cfg.Env)
 	log.Info("starting application", slog.Any("cfg", cfg))
-	applicaton := app.New(log, cfg.GRPC.Port, cfg.TokenTTL)
+	applicaton := app.New(log, cfg.GRPC.Port)
 	go applicaton.GRPCSrv.MustRun()
 
 	// TODO: инициализировать приложение app

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/redis/go-redis/v9 v9.5.3 // indirect
 	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -31,6 +31,8 @@ golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
 google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=

internal/app/app.go

@@ -3,7 +3,6 @@ package app
 import (
 	grpcapp "converter/internal/app/grpc"
 	"log/slog"
-	"time"
 )
 
 type App struct {
@@ -12,8 +11,7 @@ type App struct {
 
 func New(
 	log *slog.Logger,
-	grpcPort int,
-	tokenTTl time.Duration) *App {
+	grpcPort int) *App {
 	//TODO: инициализировать хранилище
 	//TODO: init convert service
 

internal/services/converter/converter.go

@@ -42,7 +42,6 @@ func (c *Converter) Convert(
 		return 0, 0, fmt.Errorf("%s: %w", op, err)
 	}
 
-	convertedAmount = uint32(float32(amount) * rate.Rate)
-
+	convertedAmount = uint32(float32(amount) / rate.Rate)
 	return convertedAmount, rate.Rate, nil
 }