Release/linter comments (#47)

Makefile

@@ -52,9 +52,9 @@ generate-movie-api:
 	mkdir -p movie_service/pkg/movie_v1
 	protoc --proto_path movie_service/proto \
 	--go_out=movie_service/pkg/movie_v1 --go_opt=paths=source_relative \
-	--plugin=protoc-gen-go=/Users/unicoyal/go/bin/protoc-gen-go \
+	--plugin=protoc-gen-go=/Users/rugarov/go/bin/protoc-gen-go \
 	--go-grpc_out=movie_service/pkg/movie_v1 --go-grpc_opt=paths=source_relative \
-	--plugin=protoc-gen-go-grpc=/Users/unicoyal/go/bin/protoc-gen-go-grpc \
+	--plugin=protoc-gen-go-grpc=/Users/rugarov/go/bin/protoc-gen-go-grpc \
 	movie_service/proto/movie.proto
 
 generate-payment-api:

docker-compose.yml

@@ -54,6 +54,15 @@ services:
       - /sys:/host/sys:ro
       - /:/rootfs:ro
 
+  facade_redis:
+    image: 'redis:latest'
+    command: redis-server
+    container_name: facade_redis
+    volumes:
+      - redis:/data
+    networks:
+      - cassette-world
+
   watchtower:
     image: containrrr/watchtower:latest
     container_name: watchtower
@@ -70,15 +79,6 @@ services:
     depends_on:
       - facade_app
 
-  facade_redis:
-    image: 'redis:latest'
-    command: redis-server
-    container_name: facade_redis
-    volumes:
-      - redis:/data
-    networks:
-      - cassette-world
-
 networks:
   cassette-world:
     external:

go.mod

@@ -24,6 +24,7 @@ require (
 	github.com/rs/zerolog v1.33.0
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
+	go.uber.org/mock v0.4.0
 	golang.org/x/crypto v0.29.0
 	google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf v1.35.2

go.sum

@@ -211,6 +211,8 @@ go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt3
 go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

internal/app/api/struct.go

@@ -194,6 +194,7 @@ type ActorSearchData struct {
 // easyjson:json
 type ActorSearchList []ActorSearchData
 
+// AddOrUpdateRatingReq json struct
 type AddOrUpdateRatingReq struct {
 	Rating int `json:"rating"`
 }

internal/app/app.go

@@ -5,34 +5,24 @@ import (
 	"errors"
 	"fmt"
 
-	ws "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/room/ws"
-	"github.com/go-redis/redis/v8"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-
 	"log"
 	"net/http"
 	"os"
 	"time"
 
-	"github.com/rs/zerolog"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/gorilla/mux"
-
 	auth "github.com/go-park-mail-ru/2024_2_GOATS/auth_service/pkg/auth_v1"
 	"github.com/go-park-mail-ru/2024_2_GOATS/config"
 	authApi "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/auth/delivery"
 	authServ "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/auth/service"
 	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/client"
-
 	movieApi "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/movie/delivery"
 	movieServ "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/movie/service"
 	payApi "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/payment/delivery"
 	payServ "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/payment/service"
 	roomRepo "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/room/repository"
 	roomApi "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/room/room_handler"
 	roomServ "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/room/service"
+	ws "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/room/ws"
 	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/router"
 	subApi "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/subscription/delivery"
 	subServ "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/subscription/service"
@@ -42,6 +32,12 @@ import (
 	movie "github.com/go-park-mail-ru/2024_2_GOATS/movie_service/pkg/movie_v1"
 	payment "github.com/go-park-mail-ru/2024_2_GOATS/payment_service/pkg/payment_v1"
 	user "github.com/go-park-mail-ru/2024_2_GOATS/user_service/pkg/user_v1"
+	"github.com/go-redis/redis/v8"
+	"github.com/gorilla/mux"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/rs/zerolog"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 )
 
 // App root facade struct
@@ -175,7 +171,7 @@ func (a *App) Run() {
 
 	ctxValues := config.FromContext(ctx)
 
-	router.SetupRoom(roomHub, delRoom, mx)
+	router.SetupRoom(delRoom, mx)
 
 	srv := &http.Server{
 		Addr:         fmt.Sprintf(":%d", ctxValues.Listener.Port),

internal/app/auth/service/service_test.go

@@ -10,8 +10,8 @@ import (
 	errVals "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/errors"
 	"github.com/go-park-mail-ru/2024_2_GOATS/internal/app/models"
 	servUserMock "github.com/go-park-mail-ru/2024_2_GOATS/internal/app/user/service/mocks"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
 )
 
 func TestService_Register(t *testing.T) {

internal/app/client/movie.go

@@ -14,6 +14,7 @@ import (
 //go:generate mockgen -source=movie.go -destination=../user/service/mocks/movie_mock.go
 //go:generate mockgen -source=movie.go -destination=../movie/service/mocks/mock.go
 
+// MovieClientInterface интерфейс клиента фильмов
 type MovieClientInterface interface {
 	// GetMovieByGenre(ctx context.Context, genre string) ([]models.MovieShortInfo, error)
 	GetMovie(ctx context.Context, mvID int) (*models.MovieInfo, error)
@@ -22,8 +23,8 @@ type MovieClientInterface interface {
 	SearchActors(ctx context.Context, query string) ([]models.ActorInfo, error)
 	GetCollection(ctx context.Context, filter string) ([]models.Collection, error)
 	GetFavorites(ctx context.Context, mvIDs []uint64) ([]models.MovieShortInfo, error)
-	GetUserRating(ctx context.Context, movieID, userID int) (int, error)
-	AddOrUpdateRating(ctx context.Context, movieID, userID, rating int) error
+	GetUserRating(ctx context.Context, movieID, userID int32) (int32, error)
+	AddOrUpdateRating(ctx context.Context, movieID, userID, rating int32) error
 }
 
 // MovieClient struct implements MovieClientInterface
@@ -228,7 +229,7 @@ func (m MovieClient) GetActor(ctx context.Context, actorID int) (*models.ActorIn
 // var respp = make([]models.MovieShortInfo, 0, len(respMovie))
 
 // 	for i, movie := range respMovie {
-// 		respp[i].ID = int(movie.Id)
+// 		respp[i].ID = int(movie.ID)
 // 		respp[i].CardURL = movie.CardUrl
 // 		respp[i].MovieType = movie.MovieType
 // 		respp[i].AlbumURL = movie.AlbumUrl
@@ -332,13 +333,14 @@ func (m MovieClient) GetFavorites(ctx context.Context, mvIDs []uint64) ([]models
 	return ans, nil
 }
 
-func (m MovieClient) GetUserRating(ctx context.Context, movieID, userID int) (int, error) {
+// GetUserRating получение рейтинга
+func (m MovieClient) GetUserRating(ctx context.Context, movieID, userID int32) (int32, error) {
 	start := time.Now()
 	method := "GetUserRating"
 
 	resp, err := m.movieMS.GetUserRating(ctx, &movie.GetUserRatingRequest{
-		MovieId: int32(movieID),
-		UserId:  int32(userID),
+		MovieId: movieID,
+		UserId:  userID,
 	})
 
 	saveMetric(start, movieClient, method, err)
@@ -347,17 +349,18 @@ func (m MovieClient) GetUserRating(ctx context.Context, movieID, userID int) (in
 		return 0, err
 	}
 
-	return int(resp.Rating.Rating), nil
+	return int32(resp.Rating.Rating), nil
 }
 
-func (m MovieClient) AddOrUpdateRating(ctx context.Context, movieID, userID, rating int) error {
+// AddOrUpdateRating добавление рейтинга
+func (m MovieClient) AddOrUpdateRating(ctx context.Context, movieID, userID, rating int32) error {
 	start := time.Now()
 	method := "AddOrUpdateRating"
 
 	_, err := m.movieMS.AddOrUpdateRating(ctx, &movie.AddOrUpdateRatingRequest{
-		MovieId: int32(movieID),
-		UserId:  int32(userID),
-		Rating:  int32(rating),
+		MovieId: movieID,
+		UserId:  userID,
+		Rating:  rating,
 	})
 
 	saveMetric(start, movieClient, method, err)

internal/app/movie/delivery/delivery.go

@@ -17,6 +17,6 @@ type MovieServiceInterface interface {
 	// GetMovieByGenre(ctx context.Context, genre string) ([]models.MovieShortInfo, *errVals.ServiceError)
 	SearchMovies(ctx context.Context, query string) ([]models.MovieInfo, error)
 	SearchActors(ctx context.Context, query string) ([]models.ActorInfo, error)
-	GetUserRating(ctx context.Context, movieID int) (int, *errVals.ServiceError)
-	AddOrUpdateRating(ctx context.Context, movieID, rating int) *errVals.ServiceError
+	GetUserRating(ctx context.Context, movieID int32) (int32, *errVals.ServiceError)
+	AddOrUpdateRating(ctx context.Context, movieID, rating int32) *errVals.ServiceError
 }