Пофиксил что-то

.github/workflows/deploy.yml

@@ -11,40 +11,32 @@ jobs:
     name: linters
     runs-on: ubuntu-latest
     steps:
-      -
-        name: checkout staging
+      - name: checkout staging
         uses: actions/checkout@v4
-      -
-        name: install Go
+
+      - name: install Go
         uses: actions/setup-go@v5
         with:
             go-version: '1.23'
-      -
-        name: golangci-lint
+
+      - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
             version: v1.62.2
 
   tests:
     runs-on: ubuntu-latest
+    needs: linter
     steps:
-      -
-        name: checkout staging
+      - name: checkout staging
         uses: actions/checkout@v4
-      -
-        name: install Go
+
+      - name: install Go
         uses: actions/setup-go@v5
         with:
           go-version: '1.23'
-      -
-        run: |
-          sudo apt-get -y update
-          sudo apt-get install -y libwebp-dev wkhtmltopdf
-      -
-        name: build
-        run: go build -v ./...
-      -
-        name: Test
+
+      - name: Test
         run: go test -v ./...
 
   deploy:

Makefile

@@ -39,7 +39,7 @@ build_all: build_auth build_user build_poll build_board
 
 run_tests:
 	@echo "==> Running tests..."
-	@go test $(GOFLAGS) -coverprofile ../coverage_raw.out -v ./...
+	@go test $(GOFLAGS) -coverprofile coverage_raw.out -v ./...
 
 test: run_tests
 	@echo "==> Calculating coverage..."

database/elastic/migrator.go

@@ -6,8 +6,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
+	"os"
 	"strings"
 
 	"github.com/elastic/go-elasticsearch/v8"
@@ -110,7 +110,7 @@ func deleteIndex(index string, es *elasticsearch.Client) {
 
 func createIndexWithMapping(index, mappingFile string, es *elasticsearch.Client) {
 	// Read mapping JSON from file
-	mapping, err := ioutil.ReadFile(mappingFile)
+	mapping, err := os.ReadFile(mappingFile)
 	if err != nil {
 		log.Fatalf("Error reading mapping file: %s", err)
 	}
@@ -189,10 +189,22 @@ func loadDataToElasticsearch(ctx context.Context, cfg Configuration, es *elastic
 		}
 
 		// Write to buffer
-		writer.Write(metaLine)
-		writer.WriteByte('\n')
-		writer.Write(dataLine)
-		writer.WriteByte('\n')
+		_, err = writer.Write(metaLine)
+		if err != nil {
+			return fmt.Errorf("elastic: %w", err)
+		}
+		err = writer.WriteByte('\n')
+		if err != nil {
+			return fmt.Errorf("elastic: %w", err)
+		}
+		_, err = writer.Write(dataLine)
+		if err != nil {
+			return fmt.Errorf("elastic: %w", err)
+		}
+		err = writer.WriteByte('\n')
+		if err != nil {
+			return fmt.Errorf("elastic: %w", err)
+		}
 
 		count++
 		if count%batchSize == 0 {

internal/pkg/board/repository/elastic.go

@@ -47,10 +47,10 @@ func (be *BoardElasticRepository) CreateCard(ctx context.Context, boardID int64,
 }
 
 func (be *BoardElasticRepository) UpdateCard(ctx context.Context, boardID int64, cardID int64, cardTitle string) error {
-	funcName := "UpdateCard"
-	if 1 == 1 {
-		panic(funcName + " not implemented")
-	}
+	// funcName := "UpdateCard"
+	// if 1 == 1 {
+	// 	panic(funcName + " not implemented")
+	// }
 
 	return nil
 }

internal/pkg/board/repository/members.go

@@ -681,7 +681,7 @@ func (r *BoardRepository) RearrangeCards(ctx context.Context, column1 []models.C
 		return fmt.Errorf("%s (batch query): %w", funcName, err)
 	}
 
-	tx.Commit(ctx)
+	err = tx.Commit(ctx)
 	logging.Debug(ctx, funcName, " commit has err: ", err)
 	if err != nil {
 		return fmt.Errorf("%s (commit): %w", funcName, err)
@@ -713,7 +713,7 @@ func (r *BoardRepository) RearrangeColumns(ctx context.Context, columns []models
 		return fmt.Errorf("%s (batch query): %w", funcName, err)
 	}
 
-	tx.Commit(ctx)
+	err = tx.Commit(ctx)
 	logging.Debug(ctx, funcName, " commit has err: ", err)
 	if err != nil {
 		return fmt.Errorf("%s (commit): %w", funcName, err)

internal/pkg/board/usecase/board_uc.go

@@ -734,7 +734,10 @@ func (uc *BoardUsecase) MoveColumn(ctx context.Context, userID int64, columnID i
 		columns = slices.Insert(columns, destIdx-1, col)
 	}
 
-	uc.boardRepository.RearrangeColumns(ctx, columns)
+	err = uc.boardRepository.RearrangeColumns(ctx, columns)
+	if err != nil {
+		return fmt.Errorf("%s: %w", funcName, err)
+	}
 
 	return nil
 }
@@ -805,6 +808,9 @@ func (uc *BoardUsecase) GetSharedCard(ctx context.Context, userID int64, cardUUI
 	}
 
 	board, err := uc.boardRepository.GetBoard(ctx, boardID, -1)
+	if err != nil {
+		return nil, nil, err
+	}
 
 	return nil, &models.SharedCardDummyResponse{
 		Card:  cardDetails,

internal/pkg/middleware/logging_middleware/middleware.go

@@ -1,17 +1,14 @@
 package logging_middleware
 
 import (
+	"RPO_back/internal/pkg/utils/logging"
 	"context"
 	"net/http"
 	"sync"
 
 	log "github.com/sirupsen/logrus"
 )
 
-type contextKey string
-
-const rIDKey = contextKey("requestID")
-
 var (
 	rIDCounter uint64 = 1
 	mu         sync.Mutex
@@ -24,7 +21,7 @@ func LoggingMiddleware(next http.Handler) http.Handler {
 		rID := rIDCounter
 		mu.Unlock()
 
-		ctx := context.WithValue(r.Context(), rIDKey, rID)
+		ctx := context.WithValue(r.Context(), logging.RequestIDkey, rID)
 		log.Infof("Запрос: %s %s, RequestID: %d", r.Method, r.RequestURI, rID)
 
 		next.ServeHTTP(w, r.WithContext(ctx))

internal/pkg/middleware/logging_middleware/middleware_test.go

@@ -27,15 +27,15 @@ func TestLoggingMiddleware(t *testing.T) {
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 }
 
-type testWriter struct {
-	content []byte
-}
-
-func (tw *testWriter) Write(p []byte) (n int, err error) {
-	tw.content = append(tw.content, p...)
-	return len(p), nil
-}
-
-func (tw *testWriter) String() string {
-	return string(tw.content)
-}
+// type testWriter struct {
+// 	content []byte
+// }
+
+// func (tw *testWriter) Write(p []byte) (n int, err error) {
+// 	tw.content = append(tw.content, p...)
+// 	return len(p), nil
+// }
+
+// func (tw *testWriter) String() string {
+// 	return string(tw.content)
+// }

internal/pkg/user/usecase/user_uc.go

@@ -51,6 +51,9 @@ func (uc *UserUsecase) SetMyAvatar(ctx context.Context, userID int64, file *mode
 	}
 
 	err = uc.userRepo.SetUserAvatar(ctx, userID, fileID)
+	if err != nil {
+		return nil, fmt.Errorf("%s: %w", funcName, err)
+	}
 
 	return uc.userRepo.GetUserProfile(ctx, userID)
 }