add service

internal/worker/invite_cleaner.go

@@ -2,9 +2,10 @@ package worker
 
 import (
 	"context"
-	"log"
 	"time"
 
+	"go.uber.org/zap"
+
 	"git.techease.ru/Smart-search/smart-search-back/internal/repository"
 )
 
@@ -13,13 +14,15 @@ type InviteCleaner struct {
 	ctx        context.Context
 	ticker     *time.Ticker
 	done       chan bool
+	logger     *zap.Logger
 }
 
-func NewInviteCleaner(ctx context.Context, inviteRepo repository.InviteRepository) *InviteCleaner {
+func NewInviteCleaner(ctx context.Context, inviteRepo repository.InviteRepository, logger *zap.Logger) *InviteCleaner {
 	return &InviteCleaner{
 		inviteRepo: inviteRepo,
 		ctx:        ctx,
 		done:       make(chan bool),
+		logger:     logger,
 	}
 }
 
@@ -36,13 +39,13 @@ func (w *InviteCleaner) Start() {
 			case <-w.done:
 				return
 			case <-w.ctx.Done():
-				log.Println("Invite cleaner context cancelled, stopping worker")
+				w.logger.Info("Invite cleaner context cancelled, stopping worker")
 				return
 			}
 		}
 	}()
 
-	log.Println("Invite cleaner worker started (runs every 6 hours)")
+	w.logger.Info("Invite cleaner worker started (runs every 6 hours)")
 }
 
 func (w *InviteCleaner) Stop() {
@@ -53,17 +56,17 @@ func (w *InviteCleaner) Stop() {
 	case w.done <- true:
 	default:
 	}
-	log.Println("Invite cleaner worker stopped")
+	w.logger.Info("Invite cleaner worker stopped")
 }
 
 func (w *InviteCleaner) deactivateExpiredInvites() {
 	count, err := w.inviteRepo.DeactivateExpired(w.ctx)
 	if err != nil {
-		log.Printf("Error deactivating expired invites: %v", err)
+		w.logger.Error("Error deactivating expired invites", zap.Error(err))
 		return
 	}
 
 	if count > 0 {
-		log.Printf("Deactivated %d expired invite codes", count)
+		w.logger.Info("Deactivated expired invite codes", zap.Int("count", count))
 	}
 }

internal/worker/session_cleaner.go

@@ -2,9 +2,10 @@ package worker
 
 import (
 	"context"
-	"log"
 	"time"
 
+	"go.uber.org/zap"
+
 	"git.techease.ru/Smart-search/smart-search-back/internal/repository"
 )
 
@@ -13,13 +14,15 @@ type SessionCleaner struct {
 	ctx         context.Context
 	ticker      *time.Ticker
 	done        chan bool
+	logger      *zap.Logger
 }
 
-func NewSessionCleaner(ctx context.Context, sessionRepo repository.SessionRepository) *SessionCleaner {
+func NewSessionCleaner(ctx context.Context, sessionRepo repository.SessionRepository, logger *zap.Logger) *SessionCleaner {
 	return &SessionCleaner{
 		sessionRepo: sessionRepo,
 		ctx:         ctx,
 		done:        make(chan bool),
+		logger:      logger,
 	}
 }
 
@@ -36,13 +39,13 @@ func (w *SessionCleaner) Start() {
 			case <-w.done:
 				return
 			case <-w.ctx.Done():
-				log.Println("Session cleaner context cancelled, stopping worker")
+				w.logger.Info("Session cleaner context cancelled, stopping worker")
 				return
 			}
 		}
 	}()
 
-	log.Println("Session cleaner worker started (runs every hour)")
+	w.logger.Info("Session cleaner worker started (runs every hour)")
 }
 
 func (w *SessionCleaner) Stop() {
@@ -53,17 +56,17 @@ func (w *SessionCleaner) Stop() {
 	case w.done <- true:
 	default:
 	}
-	log.Println("Session cleaner worker stopped")
+	w.logger.Info("Session cleaner worker stopped")
 }
 
 func (w *SessionCleaner) cleanExpiredSessions() {
 	count, err := w.sessionRepo.DeleteExpired(w.ctx)
 	if err != nil {
-		log.Printf("Error cleaning expired sessions: %v", err)
+		w.logger.Error("Error cleaning expired sessions", zap.Error(err))
 		return
 	}
 
 	if count > 0 {
-		log.Printf("Cleaned %d expired sessions", count)
+		w.logger.Info("Cleaned expired sessions", zap.Int("count", count))
 	}
 }

internal/worker/worker_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/gojuno/minimock/v3"
 	"github.com/stretchr/testify/suite"
+	"go.uber.org/zap"
 
 	"git.techease.ru/Smart-search/smart-search-back/internal/mocks"
 )
@@ -17,6 +18,7 @@ type WorkerSuite struct {
 	ctx    context.Context
 	cancel context.CancelFunc
 	ctrl   *minimock.Controller
+	logger *zap.Logger
 }
 
 func TestWorkerSuite(t *testing.T) {
@@ -26,6 +28,7 @@ func TestWorkerSuite(t *testing.T) {
 func (s *WorkerSuite) SetupTest() {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
 	s.ctrl = minimock.NewController(s.T())
+	s.logger = zap.NewNop()
 }
 
 func (s *WorkerSuite) TearDownTest() {
@@ -42,7 +45,7 @@ func (s *WorkerSuite) TestSessionCleaner_StartStop() {
 		return 5, nil
 	})
 
-	cleaner := NewSessionCleaner(s.ctx, sessionRepo)
+	cleaner := NewSessionCleaner(s.ctx, sessionRepo, s.logger)
 
 	cleaner.Start()
 
@@ -62,7 +65,7 @@ func (s *WorkerSuite) TestSessionCleaner_ContextCancellation() {
 		return 0, nil
 	})
 
-	cleaner := NewSessionCleaner(s.ctx, sessionRepo)
+	cleaner := NewSessionCleaner(s.ctx, sessionRepo, s.logger)
 
 	cleaner.Start()
 
@@ -84,7 +87,7 @@ func (s *WorkerSuite) TestInviteCleaner_StartStop() {
 		return 3, nil
 	})
 
-	cleaner := NewInviteCleaner(s.ctx, inviteRepo)
+	cleaner := NewInviteCleaner(s.ctx, inviteRepo, s.logger)
 
 	cleaner.Start()
 
@@ -104,7 +107,7 @@ func (s *WorkerSuite) TestInviteCleaner_ContextCancellation() {
 		return 0, nil
 	})
 
-	cleaner := NewInviteCleaner(s.ctx, inviteRepo)
+	cleaner := NewInviteCleaner(s.ctx, inviteRepo, s.logger)
 
 	cleaner.Start()
 
@@ -124,7 +127,7 @@ func (s *WorkerSuite) TestSessionCleaner_ConcurrentStops() {
 		return 0, nil
 	})
 
-	cleaner := NewSessionCleaner(s.ctx, sessionRepo)
+	cleaner := NewSessionCleaner(s.ctx, sessionRepo, s.logger)
 
 	cleaner.Start()
 
@@ -151,7 +154,7 @@ func (s *WorkerSuite) TestInviteCleaner_ConcurrentStops() {
 		return 0, nil
 	})
 
-	cleaner := NewInviteCleaner(s.ctx, inviteRepo)
+	cleaner := NewInviteCleaner(s.ctx, inviteRepo, s.logger)
 
 	cleaner.Start()
 
@@ -180,7 +183,7 @@ func (s *WorkerSuite) TestSessionCleaner_MultipleStartStop() {
 		return 2, nil
 	})
 
-	cleaner := NewSessionCleaner(s.ctx, sessionRepo)
+	cleaner := NewSessionCleaner(s.ctx, sessionRepo, s.logger)
 
 	for i := 0; i < 3; i++ {
 		cleaner.Start()
@@ -200,7 +203,7 @@ func (s *WorkerSuite) TestInviteCleaner_MultipleStartStop() {
 		return 1, nil
 	})
 
-	cleaner := NewInviteCleaner(s.ctx, inviteRepo)
+	cleaner := NewInviteCleaner(s.ctx, inviteRepo, s.logger)
 
 	for i := 0; i < 3; i++ {
 		cleaner.Start()