mirror of
https://github.com/SamyRai/tercul-backend.git
synced 2025-12-27 02:51:34 +00:00
This commit addresses all the high-priority tasks outlined in the TASKS.md file, significantly improving the application's observability, completing key features, and refactoring critical parts of the codebase. ### Observability - **Centralized Logging:** Implemented a new structured, context-aware logging system using `zerolog`. A new logging middleware injects request-specific information (request ID, user ID, trace ID) into the logger, and all application logging has been refactored to use this new system. - **Prometheus Metrics:** Added Prometheus metrics for database query performance by creating a GORM plugin that automatically records query latency and totals. - **OpenTelemetry Tracing:** Fully instrumented all application services in `internal/app` and data repositories in `internal/data/sql` with OpenTelemetry tracing, providing deep visibility into application performance. ### Features - **Analytics:** Implemented like, comment, and bookmark counting. The respective command handlers now call the analytics service to increment counters when these actions are performed. - **Enrichment Tool:** Built a new, extensible `enrich` command-line tool to fetch data from external sources. The initial implementation enriches author data using the Open Library API. ### Refactoring & Fixes - **Decoupled Testing:** Refactored the testing utilities in `internal/testutil` to be database-agnostic, promoting the use of mock-based unit tests and improving test speed and reliability. - **Build Fixes:** Resolved numerous build errors, including a critical import cycle between the logging, observability, and authentication packages. - **Search Service:** Fixed the search service integration by implementing the `GetWorkContent` method in the localization service, allowing the search indexer to correctly fetch and index work content.
290 lines
9.0 KiB
Go
290 lines
9.0 KiB
Go
package work
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"tercul/internal/app/authz"
|
|
"tercul/internal/domain"
|
|
"tercul/internal/domain/search"
|
|
"tercul/internal/domain/work"
|
|
platform_auth "tercul/internal/platform/auth"
|
|
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/trace"
|
|
"gorm.io/gorm"
|
|
)
|
|
|
|
// WorkCommands contains the command handlers for the work aggregate.
|
|
type WorkCommands struct {
|
|
repo work.WorkRepository
|
|
searchClient search.SearchClient
|
|
authzSvc *authz.Service
|
|
tracer trace.Tracer
|
|
}
|
|
|
|
// NewWorkCommands creates a new WorkCommands handler.
|
|
func NewWorkCommands(repo work.WorkRepository, searchClient search.SearchClient, authzSvc *authz.Service) *WorkCommands {
|
|
return &WorkCommands{
|
|
repo: repo,
|
|
searchClient: searchClient,
|
|
authzSvc: authzSvc,
|
|
tracer: otel.Tracer("work.commands"),
|
|
}
|
|
}
|
|
|
|
// CreateWork creates a new work.
|
|
func (c *WorkCommands) CreateWork(ctx context.Context, work *work.Work) (*work.Work, error) {
|
|
ctx, span := c.tracer.Start(ctx, "CreateWork")
|
|
defer span.End()
|
|
if work == nil {
|
|
return nil, errors.New("work cannot be nil")
|
|
}
|
|
if work.Title == "" {
|
|
return nil, errors.New("work title cannot be empty")
|
|
}
|
|
if work.Language == "" {
|
|
return nil, errors.New("work language cannot be empty")
|
|
}
|
|
err := c.repo.Create(ctx, work)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Index the work in the search client
|
|
err = c.searchClient.IndexWork(ctx, work, "")
|
|
if err != nil {
|
|
// Log the error but don't fail the operation
|
|
}
|
|
return work, nil
|
|
}
|
|
|
|
// UpdateWork updates an existing work after performing an authorization check.
|
|
func (c *WorkCommands) UpdateWork(ctx context.Context, work *work.Work) error {
|
|
ctx, span := c.tracer.Start(ctx, "UpdateWork")
|
|
defer span.End()
|
|
if work == nil {
|
|
return fmt.Errorf("%w: work cannot be nil", domain.ErrValidation)
|
|
}
|
|
if work.ID == 0 {
|
|
return fmt.Errorf("%w: work ID cannot be zero", domain.ErrValidation)
|
|
}
|
|
|
|
userID, ok := platform_auth.GetUserIDFromContext(ctx)
|
|
if !ok {
|
|
return domain.ErrUnauthorized
|
|
}
|
|
|
|
existingWork, err := c.repo.GetByID(ctx, work.ID)
|
|
if err != nil {
|
|
if errors.Is(err, domain.ErrEntityNotFound) {
|
|
return fmt.Errorf("%w: work with id %d not found", domain.ErrEntityNotFound, work.ID)
|
|
}
|
|
return fmt.Errorf("failed to get work for authorization: %w", err)
|
|
}
|
|
|
|
can, err := c.authzSvc.CanEditWork(ctx, userID, existingWork)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !can {
|
|
return domain.ErrForbidden
|
|
}
|
|
|
|
if work.Title == "" {
|
|
return fmt.Errorf("%w: work title cannot be empty", domain.ErrValidation)
|
|
}
|
|
if work.Language == "" {
|
|
return fmt.Errorf("%w: work language cannot be empty", domain.ErrValidation)
|
|
}
|
|
|
|
err = c.repo.Update(ctx, work)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Index the work in the search client
|
|
return c.searchClient.IndexWork(ctx, work, "")
|
|
}
|
|
|
|
// DeleteWork deletes a work by ID after performing an authorization check.
|
|
func (c *WorkCommands) DeleteWork(ctx context.Context, id uint) error {
|
|
ctx, span := c.tracer.Start(ctx, "DeleteWork")
|
|
defer span.End()
|
|
if id == 0 {
|
|
return fmt.Errorf("%w: invalid work ID", domain.ErrValidation)
|
|
}
|
|
|
|
userID, ok := platform_auth.GetUserIDFromContext(ctx)
|
|
if !ok {
|
|
return domain.ErrUnauthorized
|
|
}
|
|
|
|
existingWork, err := c.repo.GetByID(ctx, id)
|
|
if err != nil {
|
|
if errors.Is(err, domain.ErrEntityNotFound) {
|
|
return fmt.Errorf("%w: work with id %d not found", domain.ErrEntityNotFound, id)
|
|
}
|
|
return fmt.Errorf("failed to get work for authorization: %w", err)
|
|
}
|
|
|
|
can, err := c.authzSvc.CanDeleteWork(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !can {
|
|
return domain.ErrForbidden
|
|
}
|
|
|
|
_ = userID // to avoid unused variable error
|
|
_ = existingWork // to avoid unused variable error
|
|
|
|
return c.repo.Delete(ctx, id)
|
|
}
|
|
|
|
// AnalyzeWork performs linguistic analysis on a work.
|
|
func (c *WorkCommands) AnalyzeWork(ctx context.Context, workID uint) error {
|
|
ctx, span := c.tracer.Start(ctx, "AnalyzeWork")
|
|
defer span.End()
|
|
// TODO: implement this
|
|
return nil
|
|
}
|
|
|
|
// MergeWork merges two works, moving all associations from the source to the target and deleting the source.
|
|
func (c *WorkCommands) MergeWork(ctx context.Context, sourceID, targetID uint) error {
|
|
ctx, span := c.tracer.Start(ctx, "MergeWork")
|
|
defer span.End()
|
|
if sourceID == targetID {
|
|
return fmt.Errorf("%w: source and target work IDs cannot be the same", domain.ErrValidation)
|
|
}
|
|
|
|
userID, ok := platform_auth.GetUserIDFromContext(ctx)
|
|
if !ok {
|
|
return domain.ErrUnauthorized
|
|
}
|
|
|
|
// The repo is a work.WorkRepository, which embeds domain.BaseRepository.
|
|
// We can use the WithTx method from the base repository to run the merge in a transaction.
|
|
err := c.repo.WithTx(ctx, func(tx *gorm.DB) error {
|
|
// We need to use the transaction `tx` for all operations inside this function.
|
|
// For repository methods that are not on the base repository, we need to
|
|
// create a new repository instance that uses the transaction.
|
|
// However, since we added `GetWithAssociationsInTx`, we can pass the tx directly.
|
|
|
|
// Authorization: Ensure user can edit both works
|
|
sourceWork, err := c.repo.GetWithAssociationsInTx(ctx, tx, sourceID)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to get source work: %w", err)
|
|
}
|
|
targetWork, err := c.repo.GetWithAssociationsInTx(ctx, tx, targetID)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to get target work: %w", err)
|
|
}
|
|
|
|
canEditSource, err := c.authzSvc.CanEditWork(ctx, userID, sourceWork)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
canEditTarget, err := c.authzSvc.CanEditWork(ctx, userID, targetWork)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !canEditSource || !canEditTarget {
|
|
return domain.ErrForbidden
|
|
}
|
|
|
|
// Merge WorkStats
|
|
if err = mergeWorkStats(tx, sourceID, targetID); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Re-associate polymorphic Translations
|
|
if err = tx.Model(&domain.Translation{}).
|
|
Where("translatable_id = ? AND translatable_type = ?", sourceID, "works").
|
|
Update("translatable_id", targetID).Error; err != nil {
|
|
return fmt.Errorf("failed to merge translations: %w", err)
|
|
}
|
|
|
|
// Append many-to-many associations
|
|
if err = tx.Model(targetWork).Association("Authors").Append(sourceWork.Authors); err != nil {
|
|
return fmt.Errorf("failed to merge authors: %w", err)
|
|
}
|
|
if err = tx.Model(targetWork).Association("Tags").Append(sourceWork.Tags); err != nil {
|
|
return fmt.Errorf("failed to merge tags: %w", err)
|
|
}
|
|
if err = tx.Model(targetWork).Association("Categories").Append(sourceWork.Categories); err != nil {
|
|
return fmt.Errorf("failed to merge categories: %w", err)
|
|
}
|
|
if err = tx.Model(targetWork).Association("Copyrights").Append(sourceWork.Copyrights); err != nil {
|
|
return fmt.Errorf("failed to merge copyrights: %w", err)
|
|
}
|
|
if err = tx.Model(targetWork).Association("Monetizations").Append(sourceWork.Monetizations); err != nil {
|
|
return fmt.Errorf("failed to merge monetizations: %w", err)
|
|
}
|
|
|
|
// Finally, delete the source work.
|
|
if err = tx.Select("Authors", "Tags", "Categories", "Copyrights", "Monetizations").Delete(sourceWork).Error; err != nil {
|
|
return fmt.Errorf("failed to delete source work associations: %w", err)
|
|
}
|
|
if err = tx.Delete(&work.Work{}, sourceID).Error; err != nil {
|
|
return fmt.Errorf("failed to delete source work: %w", err)
|
|
}
|
|
|
|
// Re-index the target work in the search client *after* the transaction commits.
|
|
// We can't do it here, so we'll do it after the WithTx call.
|
|
return nil
|
|
})
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Re-index the target work in the search client now that the transaction is committed.
|
|
targetWork, err := c.repo.GetByID(ctx, targetID)
|
|
if err == nil && targetWork != nil {
|
|
if searchErr := c.searchClient.IndexWork(ctx, targetWork, ""); searchErr != nil {
|
|
// Log the error but don't fail the main operation
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func mergeWorkStats(tx *gorm.DB, sourceWorkID, targetWorkID uint) error {
|
|
var sourceStats work.WorkStats
|
|
err := tx.Where("work_id = ?", sourceWorkID).First(&sourceStats).Error
|
|
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return fmt.Errorf("failed to get source work stats: %w", err)
|
|
}
|
|
|
|
// If source has no stats, there's nothing to do.
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
return nil
|
|
}
|
|
|
|
var targetStats work.WorkStats
|
|
err = tx.Where("work_id = ?", targetWorkID).First(&targetStats).Error
|
|
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
// If target has no stats, create new ones based on source stats.
|
|
sourceStats.ID = 0 // Let GORM create a new record
|
|
sourceStats.WorkID = targetWorkID
|
|
if err = tx.Create(&sourceStats).Error; err != nil {
|
|
return fmt.Errorf("failed to create new target stats: %w", err)
|
|
}
|
|
} else if err != nil {
|
|
return fmt.Errorf("failed to get target work stats: %w", err)
|
|
} else {
|
|
// Both have stats, so add source to target.
|
|
targetStats.Add(&sourceStats)
|
|
if err = tx.Save(&targetStats).Error; err != nil {
|
|
return fmt.Errorf("failed to save merged target stats: %w", err)
|
|
}
|
|
}
|
|
|
|
// Delete the old source stats
|
|
if err = tx.Delete(&work.WorkStats{}, sourceStats.ID).Error; err != nil {
|
|
return fmt.Errorf("failed to delete source work stats: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|