Rename service package to core

api/apierror/common.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/Karaoke-Manager/karman/core"
 	"github.com/Karaoke-Manager/karman/pkg/render"
-	"github.com/Karaoke-Manager/karman/service"
 )
 
 // ProblemTypeDomain is the base domain for all custom problem types.
@@ -72,7 +72,7 @@ func JSONUnmarshalError(err *json.UnmarshalTypeError) *ProblemDetails {
 // This function maps known errors to their responses.
 func ServiceError(err error) *ProblemDetails {
 	switch {
-	case errors.Is(err, service.ErrNotFound):
+	case errors.Is(err, core.ErrNotFound):
 		return ErrNotFound
 	default:
 		return ErrInternalServerError

api/handler.go

@@ -11,11 +11,11 @@ import (
 	"github.com/Karaoke-Manager/karman/api/apierror"
 	"github.com/Karaoke-Manager/karman/api/middleware"
 	v1 "github.com/Karaoke-Manager/karman/api/v1"
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
+	"github.com/Karaoke-Manager/karman/core/upload"
 	"github.com/Karaoke-Manager/karman/pkg/render"
 	_ "github.com/Karaoke-Manager/karman/pkg/render/json" // JSON encoding for responses
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
-	"github.com/Karaoke-Manager/karman/service/upload"
 )
 
 // HealthChecker is an interface that can provide information about the system health.

api/v1/dav/handler.go

@@ -8,8 +8,8 @@ import (
 	"golang.org/x/net/webdav"
 
 	"github.com/Karaoke-Manager/karman/api/v1/dav/internal"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
 )
 
 func init() {

api/v1/dav/internal/filesystem.go

@@ -11,10 +11,10 @@ import (
 	"github.com/google/uuid"
 	"golang.org/x/net/webdav"
 
+	"github.com/Karaoke-Manager/karman/core"
+	"github.com/Karaoke-Manager/karman/core/media"
+	songsvc "github.com/Karaoke-Manager/karman/core/song"
 	"github.com/Karaoke-Manager/karman/model"
-	"github.com/Karaoke-Manager/karman/service"
-	"github.com/Karaoke-Manager/karman/service/media"
-	songsvc "github.com/Karaoke-Manager/karman/service/song"
 )
 
 // flatFS implements a [webdav.FileSystem] that serves songs in a flat hierarchy:
@@ -76,7 +76,7 @@ func (s *flatFS) find(ctx context.Context, name string) (node, error) {
 	}
 
 	song, err := s.songRepo.GetSong(ctx, id)
-	if errors.Is(err, service.ErrNotFound) {
+	if errors.Is(err, core.ErrNotFound) {
 		return nil, fs.ErrNotExist
 	} else if err != nil {
 		return nil, err

api/v1/dav/internal/mediafile.go

@@ -9,11 +9,11 @@ import (
 
 	"golang.org/x/net/webdav"
 
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
 	"github.com/Karaoke-Manager/karman/model"
 	"github.com/Karaoke-Manager/karman/pkg/mediatype"
 	"github.com/Karaoke-Manager/karman/pkg/streamio"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
 )
 
 // mediaNode is a node representing a media file.

api/v1/dav/internal/root.go

@@ -10,8 +10,8 @@ import (
 
 	"golang.org/x/net/webdav"
 
-	"github.com/Karaoke-Manager/karman/service/media"
-	songsvc "github.com/Karaoke-Manager/karman/service/song"
+	"github.com/Karaoke-Manager/karman/core/media"
+	songsvc "github.com/Karaoke-Manager/karman/core/song"
 )
 
 // rootNode represents the root directory of a flatFS.

api/v1/dav/internal/songdir.go

@@ -10,9 +10,9 @@ import (
 
 	"golang.org/x/net/webdav"
 
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
 	"github.com/Karaoke-Manager/karman/model"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
 )
 
 // songNode represents the directory for a song.

api/v1/dav/internal/txtfile.go

@@ -11,9 +11,9 @@ import (
 	"codello.dev/ultrastar/txt"
 	"golang.org/x/net/webdav"
 
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
 	"github.com/Karaoke-Manager/karman/model"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
 )
 
 // txtNode represents the TXT file for a song.

api/v1/handler.go

@@ -9,9 +9,9 @@ import (
 	"github.com/Karaoke-Manager/karman/api/v1/dav"
 	"github.com/Karaoke-Manager/karman/api/v1/songs"
 	"github.com/Karaoke-Manager/karman/api/v1/uploads"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
-	"github.com/Karaoke-Manager/karman/service/upload"
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
+	"github.com/Karaoke-Manager/karman/core/upload"
 )
 
 // Handler implements the /v1 API namespace.

api/v1/songs/handler.go

@@ -7,9 +7,9 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/Karaoke-Manager/karman/api/middleware"
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
 	"github.com/Karaoke-Manager/karman/pkg/render"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
 )
 
 // Handler implements the /v1/songs endpoints.

api/v1/songs/handler_test.go

@@ -14,10 +14,10 @@ import (
 	"github.com/jackc/pgxutil"
 
 	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
 	"github.com/Karaoke-Manager/karman/pkg/nolog"
 	_ "github.com/Karaoke-Manager/karman/pkg/render/json"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
 	"github.com/Karaoke-Manager/karman/test"
 )
 

api/v1/songs/media_test.go

@@ -17,9 +17,9 @@ import (
 
 	"github.com/Karaoke-Manager/karman/api/apierror"
 	"github.com/Karaoke-Manager/karman/api/schema"
+	"github.com/Karaoke-Manager/karman/core/media"
 	"github.com/Karaoke-Manager/karman/model"
 	"github.com/Karaoke-Manager/karman/pkg/mediatype"
-	"github.com/Karaoke-Manager/karman/service/media"
 	"github.com/Karaoke-Manager/karman/test"
 	testdata "github.com/Karaoke-Manager/karman/test/data"
 )

api/v1/uploads/file_crud.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/Karaoke-Manager/karman/api/apierror"
 	"github.com/Karaoke-Manager/karman/api/schema"
+	"github.com/Karaoke-Manager/karman/core/upload"
 	"github.com/Karaoke-Manager/karman/pkg/render"
-	"github.com/Karaoke-Manager/karman/service/upload"
 )
 
 // PutFile implements the PUT /v1/uploads/{uuid}/files/* endpoint.

api/v1/uploads/handler.go

@@ -7,9 +7,9 @@ import (
 	"github.com/go-chi/chi/v5"
 
 	"github.com/Karaoke-Manager/karman/api/middleware"
+	"github.com/Karaoke-Manager/karman/core/upload"
 	"github.com/Karaoke-Manager/karman/model"
 	"github.com/Karaoke-Manager/karman/pkg/render"
-	"github.com/Karaoke-Manager/karman/service/upload"
 )
 
 // Handler implements the /v1/uploads endpoints.

api/v1/uploads/handler_test.go

@@ -17,9 +17,9 @@ import (
 	"github.com/jackc/pgxutil"
 
 	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/core/upload"
 	"github.com/Karaoke-Manager/karman/pkg/nolog"
 	_ "github.com/Karaoke-Manager/karman/pkg/render/json"
-	"github.com/Karaoke-Manager/karman/service/upload"
 	"github.com/Karaoke-Manager/karman/test"
 )
 

cmd/karman/server.go

@@ -23,10 +23,10 @@ import (
 
 	"github.com/Karaoke-Manager/karman/api"
 	"github.com/Karaoke-Manager/karman/cmd/karman/internal"
+	"github.com/Karaoke-Manager/karman/core/media"
+	"github.com/Karaoke-Manager/karman/core/song"
+	"github.com/Karaoke-Manager/karman/core/upload"
 	"github.com/Karaoke-Manager/karman/migrations"
-	"github.com/Karaoke-Manager/karman/service/media"
-	"github.com/Karaoke-Manager/karman/service/song"
-	"github.com/Karaoke-Manager/karman/service/upload"
 )
 
 // serverCmd implements the "server" command.

service/doc.go → core/doc.go

@@ -1,4 +1,4 @@
-// Package service is the root package for the domain logic of Karman.
+// Package core is the root package for the domain logic of Karman.
 // This package itself contains only some shared utilities used by different service implementations.
 // Sub-packages of this package contain the actual service definitions and implementations.
-package service
+package core

service/errors.go → core/errors.go

@@ -1,4 +1,4 @@
-package service
+package core
 
 import (
 	"errors"

service/dbutil/errors.go → core/internal/dbutil/errors.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/jackc/pgx/v5"
 
-	"github.com/Karaoke-Manager/karman/service"
+	"github.com/Karaoke-Manager/karman/core"
 )
 
 func Error(err error) error {
 	if errors.Is(err, pgx.ErrNoRows) {
-		return service.ErrNotFound
+		return core.ErrNotFound
 	}
 	return err
 }

service/media/fakerepo.go → core/media/fakerepo.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/Karaoke-Manager/karman/core"
 	"github.com/Karaoke-Manager/karman/model"
-	svc "github.com/Karaoke-Manager/karman/service"
 )
 
 // fakeRepo is a Repository implementation backed by an in-memory map.
@@ -32,7 +32,7 @@ func (f fakeRepo) CreateFile(_ context.Context, file *model.File) error {
 // UpdateFile updates the stored version of file.
 func (f fakeRepo) UpdateFile(_ context.Context, file *model.File) error {
 	if _, ok := f.files[file.UUID]; !ok {
-		return svc.ErrNotFound
+		return core.ErrNotFound
 	}
 	file.UpdatedAt = time.Now()
 	f.files[file.UUID] = *file

service/media/fakerepo_test.go → core/media/fakerepo_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/Karaoke-Manager/karman/core"
 	"github.com/Karaoke-Manager/karman/model"
 	"github.com/Karaoke-Manager/karman/pkg/mediatype"
-	svc "github.com/Karaoke-Manager/karman/service"
 )
 
 func Test_fakeRepo_CreateFile(t *testing.T) {
@@ -59,7 +59,7 @@ func Test_fakeRepo_UpdateFile(t *testing.T) {
 			Model: model.Model{UUID: uuid.New()},
 		}
 		err := repo.UpdateFile(context.TODO(), &update)
-		if !errors.Is(err, svc.ErrNotFound) {
+		if !errors.Is(err, core.ErrNotFound) {
 			t.Errorf("UpdateFile(ctx, &update) returned an unexpected error: %s, expected ErrNotFound", err)
 		}
 	})

service/media/fakeservice.go → core/media/fakeservice.go

@@ -10,21 +10,21 @@ import (
 	"github.com/Karaoke-Manager/karman/pkg/mediatype"
 )
 
-// FakeService is a Service implementation that only uses dummy values for file contents.
+// fakeService is a Service implementation that only uses dummy values for file contents.
 // This type is intended for testing purposes.
-type FakeService struct {
+type fakeService struct {
 	repo Repository
 }
 
-// NewFakeService creates a new FakeService instance and returns it.
+// NewFakeService creates a new fakeService instance and returns it.
 // The placeholder will be the content of all "files".
 func NewFakeService(repo Repository) Service {
-	return &FakeService{repo}
+	return &fakeService{repo}
 }
 
 // StoreFile fully reads r and returns a file with dummy values.
 // file.Type will be set to mediaType.
-func (f *FakeService) StoreFile(ctx context.Context, mediaType mediatype.MediaType, r io.Reader) (model.File, error) {
+func (f *fakeService) StoreFile(ctx context.Context, mediaType mediatype.MediaType, r io.Reader) (model.File, error) {
 	h := sha256.New()
 	n, err := io.Copy(h, r)
 	if err != nil {

service/media/repo.go → core/media/repo.go

@@ -11,8 +11,8 @@ import (
 	"github.com/jackc/pgxutil"
 	"github.com/lmittmann/tint"
 
+	"github.com/Karaoke-Manager/karman/core/internal/dbutil"
 	"github.com/Karaoke-Manager/karman/model"
-	"github.com/Karaoke-Manager/karman/service/dbutil"
 )
 
 // dbRepo is a Repository implementation backed by a PostgreSQL database.

service/media/repo_test.go → core/media/repo_test.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/Karaoke-Manager/karman/core"
 	"github.com/Karaoke-Manager/karman/model"
 	"github.com/Karaoke-Manager/karman/pkg/mediatype"
 	"github.com/Karaoke-Manager/karman/pkg/nolog"
-	svc "github.com/Karaoke-Manager/karman/service"
 	"github.com/Karaoke-Manager/karman/test"
 	testdata "github.com/Karaoke-Manager/karman/test/data"
 )
@@ -89,7 +89,7 @@ func Test_dbRepo_UpdateFile(t *testing.T) {
 		file := model.File{}
 		file.UUID = uuid.New()
 		err := repo.UpdateFile(context.TODO(), &file)
-		if !errors.Is(err, svc.ErrNotFound) {
+		if !errors.Is(err, core.ErrNotFound) {
 			t.Errorf("UpdateFile(ctx, &file) returned an unexpected error: %s, expected ErrNotFound", err)
 		}
 	})

service/song/fakerepo.go → core/song/fakerepo.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/Karaoke-Manager/karman/core"
 	"github.com/Karaoke-Manager/karman/model"
-	svc "github.com/Karaoke-Manager/karman/service"
 )
 
 // fakeRepo is a simple implementation of Repository that can be used for testing.
@@ -36,7 +36,7 @@ func (r *fakeRepo) CreateSong(_ context.Context, song *model.Song) error {
 func (r *fakeRepo) GetSong(_ context.Context, id uuid.UUID) (model.Song, error) {
 	song, ok := r.songs[id]
 	if !ok {
-		return model.Song{}, svc.ErrNotFound
+		return model.Song{}, core.ErrNotFound
 	}
 	return song, nil
 }
@@ -73,7 +73,7 @@ func (r *fakeRepo) DeleteSong(_ context.Context, id uuid.UUID) (bool, error) {
 func (r *fakeRepo) UpdateSong(_ context.Context, song *model.Song) error {
 	_, ok := r.songs[song.UUID]
 	if !ok {
-		return svc.ErrNotFound
+		return core.ErrNotFound
 	}
 	song.UpdatedAt = time.Now()
 	r.songs[song.UUID] = *song

service/song/fakerepo_test.go → core/song/fakerepo_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/Karaoke-Manager/karman/core"
 	"github.com/Karaoke-Manager/karman/model"
-	svc "github.com/Karaoke-Manager/karman/service"
 )
 
 func Test_fakeRepo_CreateSong(t *testing.T) {
@@ -55,7 +55,7 @@ func Test_fakeRepo_GetSong(t *testing.T) {
 	t.Run("missing", func(t *testing.T) {
 		id := uuid.New()
 		_, err := repo.GetSong(context.TODO(), id)
-		if !errors.Is(err, svc.ErrNotFound) {
+		if !errors.Is(err, core.ErrNotFound) {
 			t.Errorf("GetSong(ctx, %q) produced an unexpected error: %s, expected ErrNotFound", id, err)
 		}
 	})
@@ -147,7 +147,7 @@ func Test_fakeRepo_UpdateSong(t *testing.T) {
 			Model: model.Model{UUID: uuid.New()},
 		}
 		err := repo.UpdateSong(context.TODO(), &update)
-		if !errors.Is(err, svc.ErrNotFound) {
+		if !errors.Is(err, core.ErrNotFound) {
 			t.Errorf("UpdateSong(ctx, &update) returned an unexpected error: %s, expected ErrNotFound", err)
 		}
 	})