chore: Rename packages

Also Run tests on macos and windows

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/workflows/ci.yml

@@ -19,6 +19,8 @@ jobs:
   test:
     name: Test
     uses: codello/.github/.github/workflows/go-test.yml@v0
+    with:
+      test-on: ubuntu-latest,ubuntu-20.04,windows-latest,macos-latest
 
   build:
     name: Build

.gitignore

@@ -22,6 +22,7 @@ go.work
 
 # Compiled Binaries
 build/
+karman
 
 # Testing files
 tmp/

Dockerfile

@@ -11,4 +11,4 @@ COPY --chmod=755 build/${TARGETOS}/${TARGETARCH}/karman /karman
 USER nonroot:nonroot
 
 EXPOSE 8080
-ENTRYPOINT ["/karman"]
+ENTRYPOINT ["/karman", "server"]

Makefile

@@ -1,18 +1,7 @@
-OPENAPI_FILES := $(shell find api -type f -name '*.yaml')
-OPENAPI_SPECS := api/karman.yaml $(shell find api/tags -type f -name '*.yaml')
+OPENAPI_FILES := $(shell find ./openapi/ -type f -name '*.yaml')
+OPENAPI_SPECS := ./openapi/karman.yaml $(shell find ./openapi/tags/ -type f -name '*.yaml')
 GO_FILES = $(shell find . -type f -name '*.go')
 
-
-.PHONY: all
-all: build openapi
-
-.PHONY: image
-image: build
-	docker build -t ghcr.io/Karaoke-Manager/server .
-
-.PHONY: build
-build: build/karman
-
 .PHONY: openapi
 openapi: build/openapi.html build/openapi.yaml
 
@@ -24,11 +13,8 @@ build/openapi.yaml: .redocly.yaml $(OPENAPI_FILES)
 	@echo "Build OpenAPI Document"
 	@redocly join --output "$@" $(OPENAPI_SPECS)
 	@echo "Inserting Tag Groups"
-	@yq -i '.x-tagGroups = ($(shell yq -j .x-tagGroups < api/karman.yaml))' "$@"
+	@yq -i '.x-tagGroups = ($(shell yq -j .x-tagGroups < ./openapi/karman.yaml))' "$@"
 
 build/openapi.html: build/openapi.yaml
 	@echo "Build HTML Documentation"
 	@redocly build-docs --output "$@" "$<"
-
-build/karman: $(GO_FILES)
-	go build -o build/karman github.com/Karaoke-Manager/karman/cmd/karman

internal/api/apierror/common.go → api/apierror/common.go

@@ -6,8 +6,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/pkg/render"
 	"gorm.io/gorm"
+
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 // ProblemTypeDomain is the base domain for all custom problem types.

internal/api/apierror/httperrors.go → api/apierror/httperrors.go

@@ -3,7 +3,7 @@ package apierror
 import (
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/pkg/mediatype"
+	"github.com/Karaoke-Manager/karman/pkg/mediatype"
 )
 
 const (

internal/api/apierror/rfc7807.go → api/apierror/rfc7807.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/pkg/mediatype"
-	"github.com/Karaoke-Manager/server/pkg/render"
+	"github.com/Karaoke-Manager/karman/pkg/mediatype"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 // ProblemDetails implements [RFC 7807] "Problem Details for HTTP APIs".

internal/api/apierror/song.go → api/apierror/song.go

@@ -6,7 +6,7 @@ import (
 
 	"codello.dev/ultrastar/txt"
 
-	"github.com/Karaoke-Manager/server/internal/model"
+	"github.com/Karaoke-Manager/karman/model"
 )
 
 const (

internal/api/apierror/upload.go → api/apierror/upload.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/internal/entity"
+	"github.com/Karaoke-Manager/karman/model"
 )
 
 // These constants identify known problem types related to uploads.
@@ -20,7 +20,7 @@ const (
 )
 
 // UploadClosed generates an error indicating that the upload has been marked for processing and cannot be modified.
-func UploadClosed(upload entity.Upload) *ProblemDetails {
+func UploadClosed(upload *model.Upload) *ProblemDetails {
 	return &ProblemDetails{
 		Type:   TypeUploadClosed,
 		Title:  "Upload Closed",
@@ -33,7 +33,7 @@ func UploadClosed(upload entity.Upload) *ProblemDetails {
 }
 
 // UploadFileNotFound generates an error indicating that a requested file within an upload was not found.
-func UploadFileNotFound(upload entity.Upload, path string) *ProblemDetails {
+func UploadFileNotFound(upload *model.Upload, path string) *ProblemDetails {
 	return &ProblemDetails{
 		Type:   TypeUploadFileNotFound,
 		Title:  "File not Found",

internal/api/controller.go → api/controller.go

@@ -3,15 +3,15 @@ package api
 import (
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	"github.com/Karaoke-Manager/server/internal/service/media"
-	"github.com/Karaoke-Manager/server/internal/service/song"
-	"github.com/Karaoke-Manager/server/pkg/render"
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 
-	"github.com/Karaoke-Manager/server/internal/api/v1"
-	"github.com/Karaoke-Manager/server/internal/service/upload"
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/api/v1"
+	"github.com/Karaoke-Manager/karman/pkg/render"
+	"github.com/Karaoke-Manager/karman/service/media"
+	"github.com/Karaoke-Manager/karman/service/song"
+	"github.com/Karaoke-Manager/karman/service/upload"
 )
 
 // Controller is the main API controller.

internal/api/middleware/contenttype.go → api/middleware/contenttype.go

@@ -3,9 +3,9 @@ package middleware
 import (
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	"github.com/Karaoke-Manager/server/pkg/mediatype"
-	"github.com/Karaoke-Manager/server/pkg/render"
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/pkg/mediatype"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 // ContentTypeJSON is an instance of the RequireContentType middleware for the common application of JSON requests.

internal/api/middleware/contenttype_test.go → api/middleware/contenttype_test.go

@@ -6,10 +6,11 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	_ "github.com/Karaoke-Manager/server/pkg/render/json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	_ "github.com/Karaoke-Manager/karman/pkg/render/json"
 )
 
 func TestRequireContentType(t *testing.T) {

internal/api/middleware/paginate.go → api/middleware/paginate.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	"github.com/Karaoke-Manager/server/pkg/render"
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 const (

internal/api/middleware/paginate_test.go → api/middleware/paginate_test.go

@@ -6,9 +6,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/Karaoke-Manager/karman/api/apierror"
 )
 
 func TestPaginate(t *testing.T) {

internal/api/middleware/uuid.go → api/middleware/uuid.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	"github.com/Karaoke-Manager/server/pkg/render"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
+
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 // UUID is a simple middleware that fetches a UUID value from a request parameter named param.

internal/api/middleware/uuid_test.go → api/middleware/uuid_test.go

@@ -7,11 +7,12 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/Karaoke-Manager/karman/api/apierror"
 )
 
 func TestUUID(t *testing.T) {

internal/schema/list.go → api/schema/list.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/Karaoke-Manager/server/pkg/render"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 // List is a generic schema type for list responses.

internal/schema/song.go → api/schema/song.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Karaoke-Manager/server/internal/model"
-	"github.com/Karaoke-Manager/server/pkg/mediatype"
+	"github.com/Karaoke-Manager/karman/model"
+	"github.com/Karaoke-Manager/karman/pkg/mediatype"
 
 	"codello.dev/ultrastar"
 	"github.com/google/uuid"

internal/schema/upload.go → api/schema/upload.go

@@ -1,8 +1,8 @@
 package schema
 
 import (
-	"github.com/Karaoke-Manager/server/internal/entity"
-	"github.com/Karaoke-Manager/server/pkg/render"
+	"github.com/Karaoke-Manager/karman/model"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 type UploadStatus string
@@ -20,7 +20,7 @@ type Upload struct {
 	Status UploadStatus `json:"status"`
 }
 
-func NewUploadFromModel(m entity.Upload) *Upload {
+func NewUploadFromModel(m *model.Upload) *Upload {
 	var status UploadStatus
 	if m.Open {
 		status = UploadStatusCreated

internal/api/v1/controller.go → api/v1/controller.go

@@ -3,11 +3,11 @@ package v1
 import (
 	"github.com/go-chi/chi/v5"
 
-	"github.com/Karaoke-Manager/server/internal/api/v1/songs"
-	"github.com/Karaoke-Manager/server/internal/api/v1/uploads"
-	"github.com/Karaoke-Manager/server/internal/service/media"
-	"github.com/Karaoke-Manager/server/internal/service/song"
-	"github.com/Karaoke-Manager/server/internal/service/upload"
+	"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"
 )
 
 // Controller implements the /v1 API namespace.

internal/api/v1/songs/controller.go → api/v1/songs/controller.go

@@ -3,11 +3,11 @@ package songs
 import (
 	"github.com/go-chi/chi/v5"
 
-	"github.com/Karaoke-Manager/server/internal/api/middleware"
-	"github.com/Karaoke-Manager/server/internal/service/media"
-	"github.com/Karaoke-Manager/server/internal/service/song"
-	"github.com/Karaoke-Manager/server/pkg/render"
-	_ "github.com/Karaoke-Manager/server/pkg/render/json"
+	"github.com/Karaoke-Manager/karman/api/middleware"
+	"github.com/Karaoke-Manager/karman/pkg/render"
+	_ "github.com/Karaoke-Manager/karman/pkg/render/json"
+	"github.com/Karaoke-Manager/karman/service/media"
+	"github.com/Karaoke-Manager/karman/service/song"
 )
 
 // Controller implements the /v1/songs endpoint.

internal/api/v1/songs/controller_test.go → api/v1/songs/controller_test.go

@@ -5,16 +5,14 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	"github.com/Karaoke-Manager/server/internal/model"
-
-	"github.com/google/uuid"
-
 	"github.com/go-chi/chi/v5"
+	"github.com/google/uuid"
 
-	"github.com/Karaoke-Manager/server/internal/service/media"
-	"github.com/Karaoke-Manager/server/internal/service/song"
-	"github.com/Karaoke-Manager/server/internal/test"
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/model"
+	"github.com/Karaoke-Manager/karman/service/media"
+	"github.com/Karaoke-Manager/karman/service/song"
+	"github.com/Karaoke-Manager/karman/test"
 )
 
 // setup prepares a test instance of the songs.Controller.

internal/api/v1/songs/crud.go → api/v1/songs/crud.go

@@ -7,11 +7,11 @@ import (
 	"codello.dev/ultrastar/txt"
 	"gorm.io/gorm"
 
-	"github.com/Karaoke-Manager/server/internal/api/apierror"
-	"github.com/Karaoke-Manager/server/internal/api/middleware"
-	"github.com/Karaoke-Manager/server/internal/model"
-	"github.com/Karaoke-Manager/server/internal/schema"
-	"github.com/Karaoke-Manager/server/pkg/render"
+	"github.com/Karaoke-Manager/karman/api/apierror"
+	"github.com/Karaoke-Manager/karman/api/middleware"
+	schema2 "github.com/Karaoke-Manager/karman/api/schema"
+	"github.com/Karaoke-Manager/karman/model"
+	"github.com/Karaoke-Manager/karman/pkg/render"
 )
 
 // Create implements the POST /v1/songs endpoint.
@@ -27,7 +27,7 @@ func (c *Controller) Create(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	render.SetStatus(r, http.StatusCreated)
-	s := schema.FromSong(song)
+	s := schema2.FromSong(song)
 	_ = render.Render(w, r, &s)
 }
 
@@ -40,14 +40,14 @@ func (c *Controller) Find(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp := schema.List[*schema.Song]{
-		Items:  make([]*schema.Song, len(songs)),
+	resp := schema2.List[*schema2.Song]{
+		Items:  make([]*schema2.Song, len(songs)),
 		Offset: pagination.Offset,
 		Limit:  pagination.RequestLimit,
 		Total:  total,
 	}
 	for i, upload := range songs {
-		s := schema.FromSong(upload)
+		s := schema2.FromSong(upload)
 		resp.Items[i] = &s
 	}
 	_ = render.Render(w, r, &resp)
@@ -56,14 +56,14 @@ func (c *Controller) Find(w http.ResponseWriter, r *http.Request) {
 // Get implements the GET /v1/songs/{uuid} endpoint.
 func (c *Controller) Get(w http.ResponseWriter, r *http.Request) {
 	song := MustGetSong(r.Context())
-	resp := schema.FromSong(song)
+	resp := schema2.FromSong(song)
 	_ = render.Render(w, r, &resp)
 }
 
 // Update implements the PATCH /v1/songs/{uuid} endpoint.
 func (c *Controller) Update(w http.ResponseWriter, r *http.Request) {
 	song := MustGetSong(r.Context())
-	update := schema.FromSong(song)
+	update := schema2.FromSong(song)
 	if err := render.Bind(r, &update); err != nil {
 		_ = render.Render(w, r, apierror.BindError(err))
 		return