' in content or '
Жил в одном ауле старик с двумя сыновьями. Пришла старику пора помирать. - Позвал он сыновей и говорит:
— Мои дорогие дети, я оставляю вам наследство. - Но не наследством вы будете богаты. Дороже денег, дороже добра три совета. Будете - их помнить — проживёте в достатке всю жизнь. Вот мои советы, запоминайте. Первыми - никому не кланяйтесь — пусть другие вам кланяются. Всякую еду ешьте с мёдом. Спите - всегда на пуховиках.
Старик умер.
Сыновья забыли о его советах и давай - жить в своё удовольствие — пить да гулять, много есть и долго спать.
- """ - - print("Original HTML:") - print("=" * 50) - print(sample_html) - print() - - print("Converted to Markdown:") - print("=" * 50) - markdown = html_to_markdown(sample_html) - print(markdown) - print() - - print("Benefits of Markdown format:") - print("- Preserves paragraph structure") - print("- Maintains dialogue formatting") - print("- Easy to read and edit") - print("- Can be rendered to HTML when needed") - print("- Smaller file size than HTML") - print("- Better for version control") - -if __name__ == "__main__": - test_conversion() diff --git a/services/auth_service.go b/services/auth_service.go index 9f27e1e..5b3d09e 100644 --- a/services/auth_service.go +++ b/services/auth_service.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" "strings" + models2 "tercul/internal/models" + "tercul/internal/repositories" "time" "github.com/asaskevich/govalidator" - "tercul/auth" - "tercul/logger" - "tercul/models" - "tercul/repositories" + "tercul/internal/platform/auth" + "tercul/internal/platform/log" ) var ( @@ -26,8 +26,8 @@ var ( type AuthService interface { Login(ctx context.Context, input LoginInput) (*AuthResponse, error) Register(ctx context.Context, input RegisterInput) (*AuthResponse, error) - GetUserFromContext(ctx context.Context) (*models.User, error) - ValidateToken(ctx context.Context, tokenString string) (*models.User, error) + GetUserFromContext(ctx context.Context) (*models2.User, error) + ValidateToken(ctx context.Context, tokenString string) (*models2.User, error) } // authService handles authentication operations @@ -61,9 +61,9 @@ type RegisterInput struct { // AuthResponse represents authentication response type AuthResponse struct { - Token string `json:"token"` - User *models.User `json:"user"` - ExpiresAt time.Time `json:"expires_at"` + Token string `json:"token"` + User *models2.User `json:"user"` + ExpiresAt time.Time `json:"expires_at"` } // Login authenticates a user and returns a JWT token @@ -75,9 +75,9 @@ func (s *authService) Login(ctx context.Context, input LoginInput) (*AuthRespons // Validate input if err := s.validateLoginInput(input); err != nil { - logger.LogWarn("Login failed - invalid input", - logger.F("email", input.Email), - logger.F("error", err)) + log.LogWarn("Login failed - invalid input", + log.F("email", input.Email), + log.F("error", err)) return nil, fmt.Errorf("%w: %v", ErrInvalidInput, err) } @@ -87,34 +87,34 @@ func (s *authService) Login(ctx context.Context, input LoginInput) (*AuthRespons // Find user by email user, err := s.userRepo.FindByEmail(ctx, email) if err != nil { - logger.LogWarn("Login failed - user not found", - logger.F("email", email)) + log.LogWarn("Login failed - user not found", + log.F("email", email)) return nil, ErrInvalidCredentials } // Check if user is active if !user.Active { - logger.LogWarn("Login failed - user inactive", - logger.F("user_id", user.ID), - logger.F("email", email)) + log.LogWarn("Login failed - user inactive", + log.F("user_id", user.ID), + log.F("email", email)) return nil, ErrInvalidCredentials } // Verify password if !user.CheckPassword(input.Password) { - logger.LogWarn("Login failed - invalid password", - logger.F("user_id", user.ID), - logger.F("email", email)) + log.LogWarn("Login failed - invalid password", + log.F("user_id", user.ID), + log.F("email", email)) return nil, ErrInvalidCredentials } // Generate JWT token token, err := s.jwtManager.GenerateToken(user) if err != nil { - logger.LogError("Failed to generate JWT token", - logger.F("user_id", user.ID), - logger.F("email", email), - logger.F("error", err)) + log.LogError("Failed to generate JWT token", + log.F("user_id", user.ID), + log.F("email", email), + log.F("error", err)) return nil, fmt.Errorf("failed to generate token: %w", err) } @@ -122,16 +122,16 @@ func (s *authService) Login(ctx context.Context, input LoginInput) (*AuthRespons now := time.Now() user.LastLoginAt = &now if err := s.userRepo.Update(ctx, user); err != nil { - logger.LogWarn("Failed to update last login time", - logger.F("user_id", user.ID), - logger.F("error", err)) + log.LogWarn("Failed to update last login time", + log.F("user_id", user.ID), + log.F("error", err)) // Don't fail the login if we can't update the timestamp } - logger.LogInfo("User logged in successfully", - logger.F("user_id", user.ID), - logger.F("email", email), - logger.F("role", user.Role)) + log.LogInfo("User logged in successfully", + log.F("user_id", user.ID), + log.F("email", email), + log.F("role", user.Role)) return &AuthResponse{ Token: token, @@ -149,10 +149,10 @@ func (s *authService) Register(ctx context.Context, input RegisterInput) (*AuthR // Validate input if err := s.validateRegisterInput(input); err != nil { - logger.LogWarn("Registration failed - invalid input", - logger.F("email", input.Email), - logger.F("username", input.Username), - logger.F("error", err)) + log.LogWarn("Registration failed - invalid input", + log.F("email", input.Email), + log.F("username", input.Username), + log.F("error", err)) return nil, fmt.Errorf("%w: %v", ErrInvalidInput, err) } @@ -165,56 +165,56 @@ func (s *authService) Register(ctx context.Context, input RegisterInput) (*AuthR // Check if user already exists by email existingUser, err := s.userRepo.FindByEmail(ctx, email) if err == nil && existingUser != nil { - logger.LogWarn("Registration failed - email already exists", - logger.F("email", email)) + log.LogWarn("Registration failed - email already exists", + log.F("email", email)) return nil, ErrUserAlreadyExists } // Check if user already exists by username existingUser, err = s.userRepo.FindByUsername(ctx, username) if err == nil && existingUser != nil { - logger.LogWarn("Registration failed - username already exists", - logger.F("username", username)) + log.LogWarn("Registration failed - username already exists", + log.F("username", username)) return nil, ErrUserAlreadyExists } // Create new user - user := &models.User{ + user := &models2.User{ Username: username, Email: email, Password: input.Password, // Will be hashed by BeforeSave hook FirstName: firstName, LastName: lastName, DisplayName: firstName + " " + lastName, - Role: models.UserRoleReader, // Default role + Role: models2.UserRoleReader, // Default role Active: true, Verified: false, // Email verification required } // Save user to database if err := s.userRepo.Create(ctx, user); err != nil { - logger.LogError("Failed to create user", - logger.F("email", email), - logger.F("username", username), - logger.F("error", err)) + log.LogError("Failed to create user", + log.F("email", email), + log.F("username", username), + log.F("error", err)) return nil, fmt.Errorf("failed to create user: %w", err) } // Generate JWT token token, err := s.jwtManager.GenerateToken(user) if err != nil { - logger.LogError("Failed to generate JWT token for new user", - logger.F("user_id", user.ID), - logger.F("email", email), - logger.F("error", err)) + log.LogError("Failed to generate JWT token for new user", + log.F("user_id", user.ID), + log.F("email", email), + log.F("error", err)) return nil, fmt.Errorf("failed to generate token: %w", err) } - logger.LogInfo("User registered successfully", - logger.F("user_id", user.ID), - logger.F("email", email), - logger.F("username", username), - logger.F("role", user.Role)) + log.LogInfo("User registered successfully", + log.F("user_id", user.ID), + log.F("email", email), + log.F("username", username), + log.F("role", user.Role)) return &AuthResponse{ Token: token, @@ -224,7 +224,7 @@ func (s *authService) Register(ctx context.Context, input RegisterInput) (*AuthR } // GetUserFromContext extracts user from context -func (s *authService) GetUserFromContext(ctx context.Context) (*models.User, error) { +func (s *authService) GetUserFromContext(ctx context.Context) (*models2.User, error) { // Validate context if ctx == nil { return nil, ErrContextRequired @@ -232,23 +232,23 @@ func (s *authService) GetUserFromContext(ctx context.Context) (*models.User, err claims, err := auth.RequireAuth(ctx) if err != nil { - logger.LogWarn("Failed to get user from context - authentication required", - logger.F("error", err)) + log.LogWarn("Failed to get user from context - authentication required", + log.F("error", err)) return nil, err } user, err := s.userRepo.GetByID(ctx, claims.UserID) if err != nil { - logger.LogWarn("Failed to get user from context - user not found", - logger.F("user_id", claims.UserID), - logger.F("error", err)) + log.LogWarn("Failed to get user from context - user not found", + log.F("user_id", claims.UserID), + log.F("error", err)) return nil, ErrUserNotFound } // Check if user is still active if !user.Active { - logger.LogWarn("Failed to get user from context - user inactive", - logger.F("user_id", user.ID)) + log.LogWarn("Failed to get user from context - user inactive", + log.F("user_id", user.ID)) return nil, ErrInvalidCredentials } @@ -256,7 +256,7 @@ func (s *authService) GetUserFromContext(ctx context.Context) (*models.User, err } // ValidateToken validates a JWT token and returns the user -func (s *authService) ValidateToken(ctx context.Context, tokenString string) (*models.User, error) { +func (s *authService) ValidateToken(ctx context.Context, tokenString string) (*models2.User, error) { // Validate context if ctx == nil { return nil, ErrContextRequired @@ -264,34 +264,34 @@ func (s *authService) ValidateToken(ctx context.Context, tokenString string) (*m // Validate token string if tokenString == "" { - logger.LogWarn("Token validation failed - empty token") + log.LogWarn("Token validation failed - empty token") return nil, auth.ErrMissingToken } claims, err := s.jwtManager.ValidateToken(tokenString) if err != nil { - logger.LogWarn("Token validation failed - invalid token", - logger.F("error", err)) + log.LogWarn("Token validation failed - invalid token", + log.F("error", err)) return nil, err } user, err := s.userRepo.GetByID(ctx, claims.UserID) if err != nil { - logger.LogWarn("Token validation failed - user not found", - logger.F("user_id", claims.UserID), - logger.F("error", err)) + log.LogWarn("Token validation failed - user not found", + log.F("user_id", claims.UserID), + log.F("error", err)) return nil, ErrUserNotFound } if !user.Active { - logger.LogWarn("Token validation failed - user inactive", - logger.F("user_id", user.ID)) + log.LogWarn("Token validation failed - user inactive", + log.F("user_id", user.ID)) return nil, ErrInvalidCredentials } - logger.LogInfo("Token validated successfully", - logger.F("user_id", user.ID), - logger.F("role", user.Role)) + log.LogInfo("Token validated successfully", + log.F("user_id", user.ID), + log.F("role", user.Role)) return user, nil } @@ -304,18 +304,18 @@ func (s *authService) validateLoginInput(input LoginInput) error { if input.Password == "" { return errors.New("password is required") } - + // Sanitize and validate email email := strings.TrimSpace(input.Email) if !govalidator.IsEmail(email) { return errors.New("invalid email format") } - + // Validate password length if len(input.Password) < 6 { return errors.New("password must be at least 6 characters") } - + return nil } @@ -336,7 +336,7 @@ func (s *authService) validateRegisterInput(input RegisterInput) error { if input.LastName == "" { return errors.New("last name is required") } - + // Sanitize and validate username username := strings.TrimSpace(input.Username) if len(username) < 3 || len(username) > 50 { @@ -345,18 +345,18 @@ func (s *authService) validateRegisterInput(input RegisterInput) error { if !govalidator.Matches(username, `^[a-zA-Z0-9_-]+$`) { return errors.New("username can only contain letters, numbers, underscores, and hyphens") } - + // Sanitize and validate email email := strings.TrimSpace(input.Email) if !govalidator.IsEmail(email) { return errors.New("invalid email format") } - + // Validate password strength if len(input.Password) < 6 { return errors.New("password must be at least 6 characters") } - + // Sanitize and validate names firstName := strings.TrimSpace(input.FirstName) lastName := strings.TrimSpace(input.LastName) @@ -366,6 +366,6 @@ func (s *authService) validateRegisterInput(input RegisterInput) error { if len(lastName) < 1 || len(lastName) > 50 { return errors.New("last name must be between 1 and 50 characters") } - + return nil } diff --git a/services/auth_service_test.go b/services/auth_service_test.go index 3039959..7e531aa 100644 --- a/services/auth_service_test.go +++ b/services/auth_service_test.go @@ -2,12 +2,12 @@ package services import ( "context" + models2 "tercul/internal/models" "testing" "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "tercul/models" ) // AuthServiceSuite is a test suite for the AuthService @@ -59,25 +59,25 @@ func TestAuthServiceSuite(t *testing.T) { func TestUserModelPasswordHashing(t *testing.T) { // This is a real test that tests the actual password hashing functionality // which is part of the authentication system - - user := &models.User{ + + user := &models2.User{ Username: "testuser", Email: "test@example.com", Password: "testpassword", // This will be hashed by BeforeSave Active: true, - Role: models.UserRoleReader, + Role: models2.UserRoleReader, } // Test that the CheckPassword method works correctly // We'll test with a simple approach - create a hash manually and test it - + // Test that the method exists and can be called // This is a basic test to ensure the method works assert.False(t, user.CheckPassword("wrongpassword"), "CheckPassword should return false for wrong password") - + // Test empty password assert.False(t, user.CheckPassword(""), "CheckPassword should return false for empty password") - + // Test that the method handles invalid hashes gracefully user.Password = "invalid-hash" assert.False(t, user.CheckPassword("anypassword"), "CheckPassword should return false for invalid hash") @@ -86,18 +86,18 @@ func TestUserModelPasswordHashing(t *testing.T) { // TestUserRoleValidation tests the UserRole enum func TestUserRoleValidation(t *testing.T) { // Test that all user roles are valid - validRoles := []models.UserRole{ - models.UserRoleReader, - models.UserRoleContributor, - models.UserRoleReviewer, - models.UserRoleEditor, - models.UserRoleAdmin, + validRoles := []models2.UserRole{ + models2.UserRoleReader, + models2.UserRoleContributor, + models2.UserRoleReviewer, + models2.UserRoleEditor, + models2.UserRoleAdmin, } - + for _, role := range validRoles { assert.NotEmpty(t, string(role), "User role should not be empty") } - + // Test role hierarchy (if implemented) // This would test that higher roles have more permissions than lower roles } @@ -110,7 +110,7 @@ func TestAuthErrorTypes(t *testing.T) { assert.NotNil(t, ErrUserAlreadyExists) assert.NotNil(t, ErrInvalidInput) assert.NotNil(t, ErrContextRequired) - + // Test error messages assert.Contains(t, ErrInvalidCredentials.Error(), "invalid credentials") assert.Contains(t, ErrUserNotFound.Error(), "user not found") @@ -123,9 +123,9 @@ func TestAuthErrorTypes(t *testing.T) { func TestAuthServiceInterface(t *testing.T) { // This test ensures that the AuthService interface has all required methods // It's a compile-time check that the interface is complete - + var _ AuthService = (*authService)(nil) - + // If this compiles, it means authService implements AuthService interface // This is a simple but effective way to ensure interface compliance } @@ -137,10 +137,10 @@ func TestInputStructs(t *testing.T) { Email: "test@example.com", Password: "password123", } - + assert.Equal(t, "test@example.com", loginInput.Email) assert.Equal(t, "password123", loginInput.Password) - + // Test RegisterInput struct registerInput := RegisterInput{ Username: "testuser", @@ -149,7 +149,7 @@ func TestInputStructs(t *testing.T) { FirstName: "Test", LastName: "User", } - + assert.Equal(t, "testuser", registerInput.Username) assert.Equal(t, "test@example.com", registerInput.Email) assert.Equal(t, "password123", registerInput.Password) @@ -160,20 +160,20 @@ func TestInputStructs(t *testing.T) { // TestAuthResponseStruct tests that AuthResponse struct is properly defined func TestAuthResponseStruct(t *testing.T) { // Test AuthResponse struct - user := &models.User{ + user := &models2.User{ Username: "testuser", Email: "test@example.com", Active: true, - Role: models.UserRoleReader, + Role: models2.UserRoleReader, } user.ID = 1 - + authResponse := AuthResponse{ Token: "jwt.token.here", User: user, ExpiresAt: time.Now().Add(24 * time.Hour), } - + assert.Equal(t, "jwt.token.here", authResponse.Token) assert.Equal(t, user, authResponse.User) assert.True(t, authResponse.ExpiresAt.After(time.Now())) diff --git a/services/copyright_service.go b/services/copyright_service.go index f7c4461..6f059cc 100644 --- a/services/copyright_service.go +++ b/services/copyright_service.go @@ -3,8 +3,8 @@ package services import ( "context" "errors" - "tercul/models" - "tercul/repositories" + "tercul/internal/models" + "tercul/internal/repositories" ) // CopyrightService defines business logic for copyright operations diff --git a/services/localization_service.go b/services/localization_service.go index 09dc4ac..824fdd8 100644 --- a/services/localization_service.go +++ b/services/localization_service.go @@ -3,8 +3,8 @@ package services import ( "context" "errors" - "tercul/models" - "tercul/repositories" + "tercul/internal/models" + "tercul/internal/repositories" ) // LocalizationService resolves localized attributes using translations diff --git a/services/search_index_service.go b/services/search_index_service.go index 1557be2..4a05563 100644 --- a/services/search_index_service.go +++ b/services/search_index_service.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "log" - "tercul/models" - "tercul/repositories" - "tercul/weaviate" + "tercul/internal/models" + "tercul/internal/platform/search" + "tercul/internal/repositories" ) // SearchIndexService pushes localized snapshots into Weaviate for search @@ -40,7 +40,7 @@ func (s *searchIndexService) IndexWork(ctx context.Context, work models.Work) er props["content"] = content } - _, wErr := weaviate.Client.Data().Creator(). + _, wErr := search.Client.Data().Creator(). WithClassName("Work"). WithID(formatID(work.ID)). WithProperties(props). diff --git a/services/work_service.go b/services/work_service.go index 61a78f0..13bda6a 100644 --- a/services/work_service.go +++ b/services/work_service.go @@ -3,8 +3,8 @@ package services import ( "context" "errors" - "tercul/models" - "tercul/repositories" + "tercul/internal/models" + repositories2 "tercul/internal/repositories" ) // WorkService defines the interface for work-related business logic @@ -14,14 +14,14 @@ type WorkService interface { GetWorkByID(ctx context.Context, id uint) (*models.Work, error) UpdateWork(ctx context.Context, work *models.Work) error DeleteWork(ctx context.Context, id uint) error - ListWorks(ctx context.Context, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) + ListWorks(ctx context.Context, page, pageSize int) (*repositories2.PaginatedResult[models.Work], error) // Domain-specific operations GetWorkWithTranslations(ctx context.Context, id uint) (*models.Work, error) FindWorksByTitle(ctx context.Context, title string) ([]models.Work, error) FindWorksByAuthor(ctx context.Context, authorID uint) ([]models.Work, error) FindWorksByCategory(ctx context.Context, categoryID uint) ([]models.Work, error) - FindWorksByLanguage(ctx context.Context, language string, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) + FindWorksByLanguage(ctx context.Context, language string, page, pageSize int) (*repositories2.PaginatedResult[models.Work], error) // Analysis operations AnalyzeWork(ctx context.Context, workID uint) error @@ -51,14 +51,14 @@ type TranslationAnalytics struct { // workService implements WorkService type workService struct { - workRepo repositories.WorkRepository + workRepo repositories2.WorkRepository analyzer interface { AnalyzeWork(ctx context.Context, workID uint) error } } // NewWorkService creates a new WorkService -func NewWorkService(workRepo repositories.WorkRepository, analyzer interface { +func NewWorkService(workRepo repositories2.WorkRepository, analyzer interface { AnalyzeWork(ctx context.Context, workID uint) error }) WorkService { return &workService{ @@ -126,7 +126,7 @@ func (s *workService) DeleteWork(ctx context.Context, id uint) error { } // ListWorks returns a paginated list of works -func (s *workService) ListWorks(ctx context.Context, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) { +func (s *workService) ListWorks(ctx context.Context, page, pageSize int) (*repositories2.PaginatedResult[models.Work], error) { return s.workRepo.List(ctx, page, pageSize) } @@ -167,7 +167,7 @@ func (s *workService) FindWorksByCategory(ctx context.Context, categoryID uint) } // FindWorksByLanguage finds works by language -func (s *workService) FindWorksByLanguage(ctx context.Context, language string, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) { +func (s *workService) FindWorksByLanguage(ctx context.Context, language string, page, pageSize int) (*repositories2.PaginatedResult[models.Work], error) { if language == "" { return nil, errors.New("language cannot be empty") } diff --git a/services/work_service_test.go b/services/work_service_test.go index e49674b..2a13b0c 100644 --- a/services/work_service_test.go +++ b/services/work_service_test.go @@ -2,14 +2,14 @@ package services_test import ( "context" + "tercul/internal/models" + "tercul/internal/repositories" "testing" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" - "tercul/models" - "tercul/repositories" + "gorm.io/gorm" "tercul/services" - "gorm.io/gorm" ) // MockWorkRepository is a mock implementation of the WorkRepository interface @@ -18,48 +18,56 @@ type MockWorkRepository struct { } func (m *MockWorkRepository) Create(ctx context.Context, entity *models.Work) error { - args := m.Called(ctx, entity) + args := m.Called(ctx, entity) return args.Error(0) } -func (m *MockWorkRepository) CreateInTx(ctx context.Context, _ *gorm.DB, _ *models.Work) error { return nil } +func (m *MockWorkRepository) CreateInTx(ctx context.Context, _ *gorm.DB, _ *models.Work) error { + return nil +} func (m *MockWorkRepository) GetByID(ctx context.Context, id uint) (*models.Work, error) { - args := m.Called(ctx, id) + args := m.Called(ctx, id) if args.Get(0) == nil { return nil, args.Error(1) } return args.Get(0).(*models.Work), args.Error(1) } -func (m *MockWorkRepository) GetByIDWithOptions(ctx context.Context, _ uint, _ *repositories.QueryOptions) (*models.Work, error) { return nil, nil } +func (m *MockWorkRepository) GetByIDWithOptions(ctx context.Context, _ uint, _ *repositories.QueryOptions) (*models.Work, error) { + return nil, nil +} func (m *MockWorkRepository) Update(ctx context.Context, entity *models.Work) error { - args := m.Called(ctx, entity) + args := m.Called(ctx, entity) return args.Error(0) } -func (m *MockWorkRepository) UpdateInTx(ctx context.Context, _ *gorm.DB, _ *models.Work) error { return nil } +func (m *MockWorkRepository) UpdateInTx(ctx context.Context, _ *gorm.DB, _ *models.Work) error { + return nil +} func (m *MockWorkRepository) Delete(ctx context.Context, id uint) error { - args := m.Called(ctx, id) + args := m.Called(ctx, id) return args.Error(0) } func (m *MockWorkRepository) DeleteInTx(ctx context.Context, _ *gorm.DB, _ uint) error { return nil } func (m *MockWorkRepository) List(ctx context.Context, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) { - args := m.Called(ctx, page, pageSize) + args := m.Called(ctx, page, pageSize) if args.Get(0) == nil { return nil, args.Error(1) } return args.Get(0).(*repositories.PaginatedResult[models.Work]), args.Error(1) } -func (m *MockWorkRepository) ListWithOptions(ctx context.Context, _ *repositories.QueryOptions) ([]models.Work, error) { return nil, nil } +func (m *MockWorkRepository) ListWithOptions(ctx context.Context, _ *repositories.QueryOptions) ([]models.Work, error) { + return nil, nil +} func (m *MockWorkRepository) ListAll(ctx context.Context) ([]models.Work, error) { - args := m.Called(ctx) + args := m.Called(ctx) if args.Get(0) == nil { return nil, args.Error(1) } @@ -67,7 +75,7 @@ func (m *MockWorkRepository) ListAll(ctx context.Context) ([]models.Work, error) } func (m *MockWorkRepository) GetAllForSync(ctx context.Context, batchSize, offset int) ([]models.Work, error) { - args := m.Called(ctx, batchSize, offset) + args := m.Called(ctx, batchSize, offset) if args.Get(0) == nil { return nil, args.Error(1) } @@ -75,14 +83,16 @@ func (m *MockWorkRepository) GetAllForSync(ctx context.Context, batchSize, offse } func (m *MockWorkRepository) Count(ctx context.Context) (int64, error) { - args := m.Called(ctx) + args := m.Called(ctx) return args.Get(0).(int64), args.Error(1) } -func (m *MockWorkRepository) CountWithOptions(ctx context.Context, _ *repositories.QueryOptions) (int64, error) { return 0, nil } +func (m *MockWorkRepository) CountWithOptions(ctx context.Context, _ *repositories.QueryOptions) (int64, error) { + return 0, nil +} func (m *MockWorkRepository) FindWithPreload(ctx context.Context, preloads []string, id uint) (*models.Work, error) { - args := m.Called(ctx, preloads, id) + args := m.Called(ctx, preloads, id) if args.Get(0) == nil { return nil, args.Error(1) } @@ -90,11 +100,13 @@ func (m *MockWorkRepository) FindWithPreload(ctx context.Context, preloads []str } func (m *MockWorkRepository) Exists(ctx context.Context, _ uint) (bool, error) { return false, nil } -func (m *MockWorkRepository) BeginTx(ctx context.Context) (*gorm.DB, error) { return nil, nil } -func (m *MockWorkRepository) WithTx(ctx context.Context, fn func(tx *gorm.DB) error) error { return nil } +func (m *MockWorkRepository) BeginTx(ctx context.Context) (*gorm.DB, error) { return nil, nil } +func (m *MockWorkRepository) WithTx(ctx context.Context, fn func(tx *gorm.DB) error) error { + return nil +} func (m *MockWorkRepository) FindByTitle(ctx context.Context, title string) ([]models.Work, error) { - args := m.Called(ctx, title) + args := m.Called(ctx, title) if args.Get(0) == nil { return nil, args.Error(1) } @@ -102,7 +114,7 @@ func (m *MockWorkRepository) FindByTitle(ctx context.Context, title string) ([]m } func (m *MockWorkRepository) FindByAuthor(ctx context.Context, authorID uint) ([]models.Work, error) { - args := m.Called(ctx, authorID) + args := m.Called(ctx, authorID) if args.Get(0) == nil { return nil, args.Error(1) } @@ -110,7 +122,7 @@ func (m *MockWorkRepository) FindByAuthor(ctx context.Context, authorID uint) ([ } func (m *MockWorkRepository) FindByCategory(ctx context.Context, categoryID uint) ([]models.Work, error) { - args := m.Called(ctx, categoryID) + args := m.Called(ctx, categoryID) if args.Get(0) == nil { return nil, args.Error(1) } @@ -118,7 +130,7 @@ func (m *MockWorkRepository) FindByCategory(ctx context.Context, categoryID uint } func (m *MockWorkRepository) FindByLanguage(ctx context.Context, language string, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) { - args := m.Called(ctx, language, page, pageSize) + args := m.Called(ctx, language, page, pageSize) if args.Get(0) == nil { return nil, args.Error(1) } @@ -126,7 +138,7 @@ func (m *MockWorkRepository) FindByLanguage(ctx context.Context, language string } func (m *MockWorkRepository) GetWithTranslations(ctx context.Context, id uint) (*models.Work, error) { - args := m.Called(ctx, id) + args := m.Called(ctx, id) if args.Get(0) == nil { return nil, args.Error(1) } @@ -134,7 +146,7 @@ func (m *MockWorkRepository) GetWithTranslations(ctx context.Context, id uint) ( } func (m *MockWorkRepository) ListWithTranslations(ctx context.Context, page, pageSize int) (*repositories.PaginatedResult[models.Work], error) { - args := m.Called(ctx, page, pageSize) + args := m.Called(ctx, page, pageSize) if args.Get(0) == nil { return nil, args.Error(1) } @@ -163,7 +175,7 @@ type WorkServiceSuite struct { func (s *WorkServiceSuite) SetupTest() { s.mockRepo = new(MockWorkRepository) s.mockAnalyzer = new(MockAnalyzer) - s.service = services.NewWorkService(s.mockRepo, s.mockAnalyzer) + s.service = services.NewWorkService(s.mockRepo, s.mockAnalyzer) } // TestCreateWork tests the CreateWork method @@ -177,16 +189,16 @@ func (s *WorkServiceSuite) TestCreateWork() { work.Language = "en" // Mock repository - s.mockRepo.On("Create", mock.Anything, work).Return(nil) + s.mockRepo.On("Create", mock.Anything, work).Return(nil) // Execute - err := s.service.CreateWork(context.Background(), work) + err := s.service.CreateWork(context.Background(), work) // Assert s.Require().NoError(err) // Verify mocks - s.mockRepo.AssertCalled(s.T(), "Create", mock.Anything, work) + s.mockRepo.AssertCalled(s.T(), "Create", mock.Anything, work) } // TestCreateWorkWithEmptyTitle tests the CreateWork method with an empty title @@ -199,7 +211,7 @@ func (s *WorkServiceSuite) TestCreateWorkWithEmptyTitle() { work.Language = "en" // Execute - err := s.service.CreateWork(context.Background(), work) + err := s.service.CreateWork(context.Background(), work) // Assert s.Require().Error(err) @@ -220,7 +232,7 @@ func (s *WorkServiceSuite) TestCreateWorkWithEmptyLanguage() { // Language is empty // Execute - err := s.service.CreateWork(context.Background(), work) + err := s.service.CreateWork(context.Background(), work) // Assert s.Require().Error(err) @@ -243,10 +255,10 @@ func (s *WorkServiceSuite) TestGetWorkByID() { expectedWork.Language = "en" // Mock repository - s.mockRepo.On("GetByID", mock.Anything, id).Return(expectedWork, nil) + s.mockRepo.On("GetByID", mock.Anything, id).Return(expectedWork, nil) // Execute - result, err := s.service.GetWorkByID(context.Background(), id) + result, err := s.service.GetWorkByID(context.Background(), id) // Assert s.Require().NoError(err) @@ -256,7 +268,7 @@ func (s *WorkServiceSuite) TestGetWorkByID() { s.Equal(expectedWork.Language, result.Language) // Verify mocks - s.mockRepo.AssertCalled(s.T(), "GetByID", mock.Anything, id) + s.mockRepo.AssertCalled(s.T(), "GetByID", mock.Anything, id) } // TestGetWorkByIDWithInvalidID tests the GetWorkByID method with an invalid ID @@ -265,7 +277,7 @@ func (s *WorkServiceSuite) TestGetWorkByIDWithInvalidID() { id := uint(0) // Invalid ID // Execute - result, err := s.service.GetWorkByID(context.Background(), id) + result, err := s.service.GetWorkByID(context.Background(), id) // Assert s.Require().Error(err) @@ -288,16 +300,16 @@ func (s *WorkServiceSuite) TestUpdateWork() { work.Language = "en" // Mock repository - s.mockRepo.On("Update", mock.Anything, work).Return(nil) + s.mockRepo.On("Update", mock.Anything, work).Return(nil) // Execute - err := s.service.UpdateWork(context.Background(), work) + err := s.service.UpdateWork(context.Background(), work) // Assert s.Require().NoError(err) // Verify mocks - s.mockRepo.AssertCalled(s.T(), "Update", mock.Anything, work) + s.mockRepo.AssertCalled(s.T(), "Update", mock.Anything, work) } // TestUpdateWorkWithInvalidID tests the UpdateWork method with an invalid ID @@ -312,7 +324,7 @@ func (s *WorkServiceSuite) TestUpdateWorkWithInvalidID() { work.Language = "en" // Execute - err := s.service.UpdateWork(context.Background(), work) + err := s.service.UpdateWork(context.Background(), work) // Assert s.Require().Error(err) @@ -328,16 +340,16 @@ func (s *WorkServiceSuite) TestDeleteWork() { id := uint(1) // Mock repository - s.mockRepo.On("Delete", mock.Anything, id).Return(nil) + s.mockRepo.On("Delete", mock.Anything, id).Return(nil) // Execute - err := s.service.DeleteWork(context.Background(), id) + err := s.service.DeleteWork(context.Background(), id) // Assert s.Require().NoError(err) // Verify mocks - s.mockRepo.AssertCalled(s.T(), "Delete", mock.Anything, id) + s.mockRepo.AssertCalled(s.T(), "Delete", mock.Anything, id) } // TestDeleteWorkWithInvalidID tests the DeleteWork method with an invalid ID @@ -346,7 +358,7 @@ func (s *WorkServiceSuite) TestDeleteWorkWithInvalidID() { id := uint(0) // Invalid ID // Execute - err := s.service.DeleteWork(context.Background(), id) + err := s.service.DeleteWork(context.Background(), id) // Assert s.Require().Error(err) diff --git a/syncjob/batch_processor.go b/syncjob/batch_processor.go index 0d02593..5ec0dad 100644 --- a/syncjob/batch_processor.go +++ b/syncjob/batch_processor.go @@ -3,11 +3,11 @@ package syncjob import ( "context" "fmt" + "gorm.io/gorm" "log" "strings" - "tercul/config" - "tercul/weaviate" - "gorm.io/gorm" + "tercul/internal/platform/config" + "tercul/internal/platform/search" ) // BatchProcessor handles batch processing of entities for sync operations @@ -22,7 +22,7 @@ func NewBatchProcessor(db *gorm.DB) *BatchProcessor { if batchSize <= 0 { batchSize = DefaultBatchSize } - + return &BatchProcessor{ db: db, defaultBatchSize: batchSize, @@ -32,44 +32,44 @@ func NewBatchProcessor(db *gorm.DB) *BatchProcessor { // ProcessEntitiesBatch processes a batch of entities from a given table func (bp *BatchProcessor) ProcessEntitiesBatch(ctx context.Context, className string, batchSize, offset int) error { log.Printf("Processing %s batch (offset %d, batch size %d)...", className, offset, batchSize) - + var results []map[string]interface{} tableName := toSnakeCase(className) - + if err := bp.db.Table(tableName).Limit(batchSize).Offset(offset).Find(&results).Error; err != nil { return fmt.Errorf("error fetching %s batch: %w", className, err) } - + if len(results) == 0 { log.Printf("No %s records found for batch (offset %d)", className, offset) return nil } - + return bp.CreateObjectsBatch(ctx, className, results) } // ProcessAllEntities processes all entities of a given type in batches func (bp *BatchProcessor) ProcessAllEntities(ctx context.Context, className string) error { log.Printf("Processing all %s entities...", className) - + var count int64 tableName := toSnakeCase(className) if err := bp.db.Table(tableName).Count(&count).Error; err != nil { return fmt.Errorf("error counting %s: %w", className, err) } - + if count == 0 { log.Printf("No %s entities found", className) return nil } - + for offset := 0; offset < int(count); offset += bp.defaultBatchSize { if err := bp.ProcessEntitiesBatch(ctx, className, bp.defaultBatchSize, offset); err != nil { log.Printf("Error processing %s batch (offset %d): %v", className, offset, err) // Continue with next batch instead of failing completely } } - + log.Printf("Completed processing all %s entities", className) return nil } @@ -105,11 +105,11 @@ func toSnakeCase(str string) string { "HybridEntityWork": "hybrid_entity_work", "CopyrightClaim": "copyright_claim", } - + if tableName, exists := specialCases[str]; exists { return tableName } - + // For other cases, convert CamelCase to snake_case var result string for i, r := range str { @@ -124,7 +124,7 @@ func toSnakeCase(str string) string { // CreateObjectsBatch creates multiple objects in Weaviate using the existing client func (bp *BatchProcessor) CreateObjectsBatch(ctx context.Context, className string, objects []map[string]interface{}) error { var errors []error - + for _, record := range objects { objID := fmt.Sprintf("%v", record["id"]) if err := bp.createObject(ctx, className, objID, record); err != nil { @@ -132,26 +132,26 @@ func (bp *BatchProcessor) CreateObjectsBatch(ctx context.Context, className stri errors = append(errors, err) } } - + if len(errors) > 0 { return fmt.Errorf("batch sync completed with %d errors", len(errors)) } - + return nil } // createObject creates a single object in Weaviate using the existing client func (bp *BatchProcessor) createObject(ctx context.Context, className, objID string, properties map[string]interface{}) error { - _, err := weaviate.Client.Data().Creator(). + _, err := search.Client.Data().Creator(). WithClassName(className). WithID(objID). WithProperties(properties). Do(ctx) - + if err != nil { return fmt.Errorf("failed to create %s object with ID %s: %w", className, objID, err) } - + log.Printf("Successfully synced %s ID %s", className, objID) return nil } diff --git a/syncjob/edges_sync.go b/syncjob/edges_sync.go index 7e8490d..3d116f7 100644 --- a/syncjob/edges_sync.go +++ b/syncjob/edges_sync.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "log" - "tercul/models" + "tercul/internal/models" ) // SyncAllEdges syncs all edges by enqueueing batch jobs. diff --git a/syncjob/entities_sync.go b/syncjob/entities_sync.go index 8ad7445..abe48d8 100644 --- a/syncjob/entities_sync.go +++ b/syncjob/entities_sync.go @@ -79,5 +79,3 @@ func (s *SyncJob) syncEntities(className string, ctx context.Context) error { batchProcessor := NewBatchProcessor(s.DB) return batchProcessor.ProcessAllEntities(ctx, className) } - - diff --git a/syncjob/queue.go b/syncjob/queue.go index 953c320..575584e 100644 --- a/syncjob/queue.go +++ b/syncjob/queue.go @@ -14,13 +14,13 @@ func enqueueTask[T any](client *asynq.Client, taskType string, payload T, delay if err != nil { return err } - + task := asynq.NewTask(taskType, data) _, err = client.Enqueue(task, asynq.ProcessIn(delay)) if err != nil { return err } - + return nil } diff --git a/syncjob/types.go b/syncjob/types.go index 0cf7f23..4b8d74e 100644 --- a/syncjob/types.go +++ b/syncjob/types.go @@ -32,9 +32,3 @@ type EdgeSyncPayload struct { BatchSize int `json:"batch_size"` Offset int `json:"offset"` } - - - - - -