Merge branch 'deploy' of https://github.com/go-park-mail-ru/2024_2_Team7

 into deploy

Makefile

@@ -48,7 +48,7 @@ clean:
 
 coverage:
 	go test -coverpkg=./... -coverprofile=coverage.out.tmp ./...
-	cat coverage.out.tmp | grep -v "mock\|cmd\|config\|docs\|metrics\|api\|easyjson" > coverage.out
+	cat coverage.out.tmp | grep -v "mocks\|cmd\|config\|docs\|metrics\|api\|easyjson" > coverage.out
 	go tool cover -func=coverage.out
 
 

internal/auth/repository/auth/tests/check_credentials_test.go

@@ -3,12 +3,13 @@ package repository
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"kudago/internal/auth/repository/auth"
-	"testing"
 
 	"kudago/internal/models"
 )

internal/auth/repository/auth/tests/create_user_test.go

@@ -3,11 +3,12 @@ package repository
 import (
 	"context"
 	"fmt"
-	"github.com/pashagolub/pgxmock/v4"
-	"kudago/internal/auth/repository/auth"
 	"testing"
 	"time"
 
+	"github.com/pashagolub/pgxmock/v4"
+	"kudago/internal/auth/repository/auth"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

internal/auth/repository/auth/tests/get_user_by_email_or_username_test.go

@@ -3,10 +3,11 @@ package repository
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v4"
 	"kudago/internal/auth/repository/auth"
-	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/auth/repository/auth/tests/get_user_by_id_test.go

@@ -3,10 +3,11 @@ package repository
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/jackc/pgx/v5"
 	"github.com/pashagolub/pgxmock/v4"
 	"kudago/internal/auth/repository/auth"
-	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

internal/auth/repository/auth/tests/users_test.go

@@ -1,10 +1,11 @@
 package repository
 
 import (
-	"kudago/internal/auth/repository/auth"
 	"testing"
 	"time"
 
+	"kudago/internal/auth/repository/auth"
+
 	"github.com/stretchr/testify/assert"
 
 	"kudago/internal/models"

internal/auth/repository/auth/users.go

@@ -2,9 +2,10 @@ package userRepository
 
 import (
 	"context"
+	"time"
+
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgconn"
-	"time"
 
 	"kudago/internal/models"
 )

internal/event/repository/add_to_favorites_test.go

@@ -2,9 +2,10 @@ package eventRepository
 
 import (
 	"context"
+	"testing"
+
 	"github.com/jackc/pgx/v5/pgconn"
 	"kudago/internal/models"
-	"testing"
 
 	"github.com/pashagolub/pgxmock/v4"
 	"github.com/stretchr/testify/assert"

internal/event/repository/create_event_test.go

@@ -3,10 +3,11 @@ package eventRepository
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/pashagolub/pgxmock/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 
 	"kudago/internal/models"
 )

internal/event/repository/get_events_by_ids_test.go

@@ -72,7 +72,6 @@ func TestEventRepository_GetEventsByIDs(t *testing.T) {
 			} else {
 				assert.NoError(t, err)
 			}
-
 		})
 	}
 }

internal/event/service/event_test.go

@@ -107,69 +107,71 @@ func TestEventService_SearchEvents(t *testing.T) {
 	}
 }
 
-// func TestEventService_UpdateEvent(t *testing.T) {
-// 	t.Parallel()
-
-// 	ctrl := gomock.NewController(t)
-// 	defer ctrl.Finish()
-
-// 	mockEventDB := mocks.NewMockEventDB(ctrl)
-// 	service := NewService(mockEventDB)
-
-// 	event := models.Event{
-// 		ID:       1,
-// 		AuthorID: 1,
-// 		Title:    "Event",
-// 	}
-
-// 	testCases := []struct {
-// 		name          string
-// 		event         models.Event
-// 		setupMocks    func()
-// 		expectedEvent models.Event
-// 		expectedError error
-// 	}{
-// 		{
-// 			name:  "success update event",
-// 			event: event,
-// 			setupMocks: func() {
-// 				mockEventDB.EXPECT().GetEventByID(gomock.Any(), 1).Return(event, nil)
-// 				mockEventDB.EXPECT().UpdateEvent(gomock.Any(), gomock.Any()).Return(event, nil)
-// 			},
-// 			expectedEvent: event,
-// 			expectedError: nil,
-// 		},
-// 		{
-// 			name:  "event doesn't exists",
-// 			event: event,
-// 			setupMocks: func() {
-// 				mockEventDB.EXPECT().GetEventByID(gomock.Any(), 1).Return(models.Event{}, models.ErrEventNotFound)
-// 			},
-// 			expectedEvent: models.Event{},
-// 			expectedError: models.ErrEventNotFound,
-// 		},
-// 		{
-// 			name: "access denied",
-// 			event: models.Event{
-// 				ID:       1,
-// 				AuthorID: 3,
-// 				Title:    "access denied",
-// 			},
-// 			setupMocks: func() {
-// 				mockEventDB.EXPECT().GetEventByID(gomock.Any(), 1).Return(event, nil)
-// 			},
-// 			expectedEvent: models.Event{},
-// 			expectedError: models.ErrAccessDenied,
-// 		},
-// 	}
-
-// 	for _, tc := range testCases {
-// 		t.Run(tc.name, func(t *testing.T) {
-// 			tc.setupMocks()
-
-// 			result, err := service.UpdateEvent(context.Background(), tc.event)
-// 			assert.ErrorAs(t, tc.expectedError, err)
-// 			assert.Equal(t, tc.expectedEvent, result)
-// 		})
-// 	}
-// }
+func TestEventService_UpdateEvent(t *testing.T) {
+	t.Parallel()
+
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	mockEventDB := mocks.NewMockEventDB(ctrl)
+	service := NewService(mockEventDB)
+
+	event := models.Event{
+		ID:       1,
+		AuthorID: 1,
+		Title:    "Event",
+	}
+
+	testCases := []struct {
+		name          string
+		event         models.Event
+		setupMocks    func()
+		expectedEvent models.Event
+		expectedError error
+	}{
+		{
+			name:  "success update event",
+			event: event,
+			setupMocks: func() {
+				mockEventDB.EXPECT().GetEventByID(gomock.Any(), 1).Return(event, nil)
+				mockEventDB.EXPECT().UpdateEvent(gomock.Any(), gomock.Any()).Return(event, nil)
+			},
+			expectedEvent: event,
+			expectedError: nil,
+		},
+		{
+			name:  "event doesn't exists",
+			event: event,
+			setupMocks: func() {
+				mockEventDB.EXPECT().GetEventByID(gomock.Any(), 1).Return(models.Event{}, models.ErrEventNotFound)
+			},
+			expectedEvent: models.Event{},
+			expectedError: models.ErrEventNotFound,
+		},
+		{
+			name: "access denied",
+			event: models.Event{
+				ID:       1,
+				AuthorID: 3,
+				Title:    "access denied",
+			},
+			setupMocks: func() {
+				mockEventDB.EXPECT().GetEventByID(gomock.Any(), 1).Return(event, nil)
+			},
+			expectedEvent: models.Event{},
+			expectedError: models.ErrAccessDenied,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			tc.setupMocks()
+
+			result, err := service.UpdateEvent(context.Background(), tc.event)
+			if tc.expectedError!=nil{
+				assert.Error(t, tc.expectedError, err)
+				assert.Equal(t, tc.expectedEvent, result)
+			}
+		})
+	}
+}

internal/gateway/auth/login.go

@@ -1,14 +1,14 @@
 package handlers
 
 import (
-	"io"
 	"net/http"
 
 	pb "kudago/internal/auth/api"
 	httpErrors "kudago/internal/gateway/errors"
 	"kudago/internal/gateway/utils"
 
 	"github.com/asaskevich/govalidator"
+	easyjson "github.com/mailru/easyjson"
 	grpcCodes "google.golang.org/grpc/codes"
 	grpcStatus "google.golang.org/grpc/status"
 )
@@ -20,15 +20,8 @@ func (h *AuthHandlers) Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		utils.WriteResponse(w, http.StatusBadRequest, httpErrors.ErrInvalidData)
-		return
-	}
-	defer r.Body.Close()
-
 	var req LoginRequest
-	err = req.UnmarshalJSON([]byte(body))
+	err := easyjson.UnmarshalFromReader(r.Body, &req)
 	if err != nil {
 		utils.WriteResponse(w, http.StatusBadRequest, httpErrors.ErrInvalidData)
 		return