fix: CI/CD

.github/workflows/pull_requests.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    name: go-build
+    name: go-build and test
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.23
@@ -20,8 +20,8 @@ jobs:
       - name: Get dependencies
         run: go mod tidy
 
-#      - name: Run make test
-#        run: make test
+      - name: Run make test
+        run: go test ./...
 
   golangci:
     name: go-lint

.github/workflows/push.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    name: go-build
+    name: go-build and test
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.23
@@ -20,8 +20,8 @@ jobs:
       - name: Get dependencies
         run: go mod tidy
 
-#      - name: Run make test
-#        run: make test
+      - name: Run make test
+        run: go test ./...
 
   linter:
     name: go-lint
@@ -38,14 +38,15 @@ jobs:
 
   deploy:
     name: Deploy to VM
-    needs: [build]
+    needs: [build, linter]
     runs-on: ubuntu-latest
     environment: CICD
-    timeout-minutes: 40
+    timeout-minutes: 50
     steps:
       - name: Execute commands over ssh
         uses: appleboy/ssh-action@master
         with:
+          command_timeout: '50m'
           host: ${{ secrets.HOST }}
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.SSH_KEY }}

.gitignore

@@ -26,4 +26,6 @@ go.work.sum
 
 .idea
 
-qodana.yaml
+qodana.yaml
+
+*.log

.golangci.yml

@@ -0,0 +1,20 @@
+issues:
+  exclude-rules:
+    - linters:
+        - staticcheck
+      text: "SA1029:"
+    - linters:
+        - staticcheck
+      text: "SA6005:"
+    - linters:
+        - staticcheck
+      text: "SA4010:"
+    - linters:
+        - staticcheck
+      text: "SA1006:"
+    - linters:
+        - govet
+      text: "printf:"
+    - linters:
+        - gosimple
+      text: "S1009:"

internal/grpc_api/profile/dto.go

@@ -1,15 +1 @@
 package profile
-
-import (
-	profile_grpc "github.com/go-park-mail-ru/2024_2_kotyari/api/protos/profile/gen"
-	"github.com/go-park-mail-ru/2024_2_kotyari/internal/model"
-)
-
-func toGrpcModel(p model.Profile) *profile_grpc.GetProfileResponse {
-	return &profile_grpc.GetProfileResponse{
-		Email:     p.Email,
-		Username:  p.Username,
-		Gender:    p.Gender,
-		AvatarUrl: p.AvatarURL,
-	}
-}

internal/repository/category/get_related_products_by_productid.go

@@ -20,22 +20,14 @@ func (cs *CategoriesStore) GetRelatedProductsByProductID(ctx context.Context, pr
 	cs.log.Info("[CategoriesStore.GetRelatedProductsByProductID] Started executing",
 		slog.Any("request-id", requestID))
 
-	categories, err := cs.categoriesGetter.GetProductCategories(ctx, productID)
-	if err != nil {
-	}
-	//cs.log.Info("[CategoriesStore.GetRelatedProductsByProductID] Вывод полученных категорий", slog.Any("categories", categories))
-	if len(categories) == 0 {
-	}
+	categories, _ := cs.categoriesGetter.GetProductCategories(ctx, productID)
 
 	var allProducts []model.ProductCatalog
 	seenProducts := make(map[uint32]bool)
 
 	for _, category := range categories {
 
-		products, err := cs.GetProductsByCategoryLink(ctx, category.LinkTo, sortField, sortOrder)
-		if err != nil {
-
-		}
+		products, _ := cs.GetProductsByCategoryLink(ctx, category.LinkTo, sortField, sortOrder)
 
 		for _, product := range products {
 			if !seenProducts[product.ID] {
@@ -45,9 +37,5 @@ func (cs *CategoriesStore) GetRelatedProductsByProductID(ctx context.Context, pr
 		}
 	}
 
-	if len(allProducts) == 0 {
-
-	}
-
 	return allProducts, nil
 }

internal/repository/file/file_test.go

@@ -3,7 +3,6 @@ package file
 import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -26,7 +25,7 @@ func TestGetFile(t *testing.T) {
 			filename: "test-file.txt",
 			setup: func() string {
 				filePath := filepath.Join(baseDir, "test-file.txt")
-				err := ioutil.WriteFile(filePath, []byte("content"), 0644)
+				err := os.WriteFile(filePath, []byte("content"), 0644)
 				if err != nil {
 					t.Fatalf("Ошибка при создании файла для теста: %v", err)
 				}
@@ -82,7 +81,7 @@ func TestSaveFile(t *testing.T) {
 			name:     "Success",
 			filename: "new-file.txt",
 			setup: func() (*os.File, string) {
-				tempFile, _ := ioutil.TempFile("", "temp-file")
+				tempFile, _ := os.CreateTemp("", "temp-file")
 				_, _ = tempFile.WriteString("test content")
 				return tempFile, filepath.Join(baseDir, "new-file.txt")
 			},
@@ -93,7 +92,7 @@ func TestSaveFile(t *testing.T) {
 			filename: "existing-file.txt",
 			setup: func() (*os.File, string) {
 				filePath := filepath.Join(baseDir, "existing-file.txt")
-				err := ioutil.WriteFile(filePath, []byte("existing content"), 0644)
+				err := os.WriteFile(filePath, []byte("existing content"), 0644)
 				assert.NoError(t, err)
 				return nil, filePath
 			},
@@ -103,7 +102,7 @@ func TestSaveFile(t *testing.T) {
 			name:     "Error Creating File",
 			filename: "invalid-path/invalid-file.txt",
 			setup: func() (*os.File, string) {
-				tempFile, _ := ioutil.TempFile("", "temp-file")
+				tempFile, _ := os.CreateTemp("", "temp-file")
 				_, _ = tempFile.WriteString("test content")
 				return tempFile, ""
 			},

internal/repository/orders/get_nearest_delivery_date_test.go

@@ -59,9 +59,8 @@ func (suite *OrdersRepoGetNearestDeliveryDateSuite) TestGetNearestDeliveryDate_N
 }
 
 func (suite *OrdersRepoGetNearestDeliveryDateSuite) TestGetNearestDeliveryDate_QueryError() {
-	ctx := context.Background()
 	requestID := uuid.New()
-	ctx = context.WithValue(context.Background(), utils.RequestIDName, requestID)
+	ctx := context.WithValue(context.Background(), utils.RequestIDName, requestID)
 	var userID uint32 = 12345
 
 	expectedError := errors.New("database error")

internal/repository/orders/get_order_by_id_test.go

@@ -30,9 +30,8 @@ func (suite *OrdersRepoGetOrderByIdSuite) SetupTest() {
 }
 
 func (suite *OrdersRepoGetOrderByIdSuite) TestGetOrderById_Success() {
-	ctx := context.Background()
 	requestID := uuid.New()
-	ctx = context.WithValue(context.Background(), utils.RequestIDName, requestID)
+	ctx := context.WithValue(context.Background(), utils.RequestIDName, requestID)
 	userID := uint32(12345)
 	orderID := uuid.New()
 
@@ -70,9 +69,8 @@ func (suite *OrdersRepoGetOrderByIdSuite) TestGetOrderById_Success() {
 }
 
 func (suite *OrdersRepoGetOrderByIdSuite) TestGetOrderById_QueryError() {
-	ctx := context.Background()
 	requestID := uuid.New()
-	ctx = context.WithValue(context.Background(), utils.RequestIDName, requestID)
+	ctx := context.WithValue(context.Background(), utils.RequestIDName, requestID)
 	userID := uint32(12345)
 	orderID := uuid.New()
 

internal/repository/orders/get_orders_test.go

@@ -29,9 +29,8 @@ func (suite *OrdersRepoGetOrdersSuite) SetupTest() {
 }
 
 func (suite *OrdersRepoGetOrdersSuite) TestGetOrders_Success() {
-	ctx := context.Background()
 	requestID := uuid.New()
-	ctx = context.WithValue(context.Background(), utils.RequestIDName, requestID)
+	ctx := context.WithValue(context.Background(), utils.RequestIDName, requestID)
 	userID := uint32(12345)
 
 	orderID := uuid.New()
@@ -71,9 +70,8 @@ func (suite *OrdersRepoGetOrdersSuite) TestGetOrders_Success() {
 }
 
 func (suite *OrdersRepoGetOrdersSuite) TestGetOrders_QueryError() {
-	ctx := context.Background()
 	requestID := uuid.New()
-	ctx = context.WithValue(context.Background(), utils.RequestIDName, requestID)
+	ctx := context.WithValue(context.Background(), utils.RequestIDName, requestID)
 	userID := uint32(12345)
 
 	expectedSQL := `

internal/repository/product/dto.go

@@ -33,32 +33,3 @@ func (dto *dtoOptionBlock) ToModel() model.OptionsBlock {
 		Options: options,
 	}
 }
-
-func optionToDTO(option model.Option) dtoOption {
-	return dtoOption{
-		Link:  option.Link,
-		Value: option.Value,
-	}
-}
-
-func optionsBlockToDTO(optionsBlock model.OptionsBlock) dtoOptionBlock {
-	options := make([]dtoOption, len(optionsBlock.Options))
-	for i, option := range optionsBlock.Options {
-		options[i] = optionToDTO(option)
-	}
-	return dtoOptionBlock{
-		Title:   optionsBlock.Title,
-		Type:    optionsBlock.Type,
-		Options: options,
-	}
-}
-
-func optionsToDto(opts model.Options) []dtoOptionBlock {
-	res := make([]dtoOptionBlock, len(opts.Values))
-
-	for i, option := range opts.Values {
-		res[i] = optionsBlockToDTO(option)
-	}
-
-	return res
-}

internal/usecase/profile/get_profile_test.go

@@ -15,7 +15,6 @@ import (
 
 var (
 	testContextRequestIDValue = uuid.New()
-	dbTestError               = errors.New("ошибка базы данных")
 )
 
 const testContextRequestIDKey = "request-id"