code nitpicks

Author: raf555

internal/assets/assets.go

@@ -44,6 +44,5 @@ func (r *reader) To(target any) error {
 	}
 
 	gz.Close()
-
 	return nil
 }

internal/dto/response/error.go

@@ -7,21 +7,25 @@ import (
 
 type (
 	Error struct {
-		Message error `json:"message" swaggertype:"string"`
+		Err error `json:"message" swaggertype:"string"`
 	}
 
 	internalError struct {
 		Message string `json:"message"`
 	}
 )
 
+var (
+	InternalServerError = Error{errors.New("internal server error")}
+	MethodNotAllowed    = Error{errors.New("method not allowed")}
+	NotFound            = Error{errors.New("not found")}
+)
+
 func (e Error) MarshalJSON() ([]byte, error) {
-	i := internalError{e.Message.Error()}
+	i := internalError{e.Err.Error()}
 	return json.Marshal(i)
 }
 
-var (
-	ErrInternalServerError = errors.New("internal server error")
-	ErrMethodNotAllowed    = errors.New("method not allowed")
-	ErrNotFound            = errors.New("not found")
-)
+func ErrorOf(err error) Error {
+	return Error{Err: err}
+}

internal/handlers/v1/entry/entry.go

@@ -28,7 +28,7 @@ import (
 func (h *Handler) Entry(ctx *gin.Context) {
 	entryNo, ok := h.getEntryNo(ctx)
 	if !ok {
-		ctx.JSON(http.StatusBadRequest, response.Error{Message: errUnexpectedEntryNo})
+		ctx.JSON(http.StatusBadRequest, response.ErrorOf(errUnexpectedEntryNo))
 		return
 	}
 
@@ -38,14 +38,14 @@ func (h *Handler) Entry(ctx *gin.Context) {
 	if err != nil {
 		switch {
 		case errors.Is(err, dict.ErrUnexpectedEmptyLemma) || errors.Is(err, dict.ErrUnexpectedEntryNumber):
-			ctx.JSON(http.StatusBadRequest, response.Error{Message: err})
+			ctx.JSON(http.StatusBadRequest, response.ErrorOf(err))
 		case errors.Is(err, dict.ErrLemmaNotFound) || errors.Is(err, dict.ErrEntryNotFound):
-			ctx.JSON(http.StatusNotFound, response.Error{Message: err})
+			ctx.JSON(http.StatusNotFound, response.ErrorOf(err))
 		case errors.Is(err, dict.ErrLemmaTooLong):
-			ctx.JSON(http.StatusRequestURITooLong, response.Error{Message: err})
+			ctx.JSON(http.StatusRequestURITooLong, response.ErrorOf(err))
 		default:
 			h.logger.ErrorContext(ctx, "Unexpected lemma retrieval failure", slog.String("error", err.Error()))
-			ctx.JSON(http.StatusInternalServerError, response.Error{Message: response.ErrInternalServerError})
+			ctx.JSON(http.StatusInternalServerError, response.InternalServerError)
 		}
 
 		return

internal/handlers/v1/entry/random.go

@@ -1,11 +1,9 @@
 package entry
 
 import (
-	"log/slog"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/raf555/kbbi-api/internal/dto/response"
 )
 
 // Entry godoc
@@ -16,12 +14,6 @@ import (
 // @Failure      500      {object}  response.Error
 // @Router       /api/v1/entry/_random [get]
 func (h *Handler) Random(ctx *gin.Context) {
-	lemma, err := h.dict.RandomLemma()
-	if err != nil {
-		h.logger.ErrorContext(ctx, "Unexpected Random Lemma failure", slog.String("error", err.Error()))
-		ctx.JSON(http.StatusInternalServerError, response.Error{Message: response.ErrInternalServerError})
-		return
-	}
-
+	lemma := h.dict.RandomLemma()
 	ctx.Redirect(http.StatusFound, lemma.Lemma)
 }

internal/handlers/v1/entry/wotd.go

@@ -19,7 +19,7 @@ func (h *Handler) WOTD(ctx *gin.Context) {
 	wotd, err := h.dict.LemmaOfTheDay()
 	if err != nil {
 		h.logger.ErrorContext(ctx, "Unexpected WOTD failure", slog.String("error", err.Error()))
-		ctx.JSON(http.StatusInternalServerError, response.Error{Message: response.ErrInternalServerError})
+		ctx.JSON(http.StatusInternalServerError, response.InternalServerError)
 		return
 	}
 

internal/logger/slog.go

@@ -7,7 +7,7 @@ import (
 	slogformatter "github.com/samber/slog-formatter"
 )
 
-func NewLogger() *slog.Logger {
+func New() *slog.Logger {
 	timeDurationFormatter := slogformatter.FormatByKind(slog.KindDuration, func(v slog.Value) slog.Value {
 		return slog.StringValue(v.Duration().String())
 	})

internal/repositories/dict/dict.go

@@ -108,10 +108,9 @@ func (d *Dictionary) Lemma(lemma string, entryNoPtr *int) (kbbi.Lemma, error) {
 	return lemmaData, nil
 }
 
-func (d *Dictionary) RandomLemma() (kbbi.Lemma, error) {
+func (d *Dictionary) RandomLemma() kbbi.Lemma {
 	randomIdx := rand.IntN(len(d.lemmas))
-
-	return d.lemmas[randomIdx], nil
+	return d.lemmas[randomIdx]
 }
 
 func (d *Dictionary) LemmaOfTheDay() (kbbi.Lemma, error) {

internal/repositories/wotd/wotd.go

@@ -29,7 +29,7 @@ func New(env *config.Configuration) (*Repository, error) {
 
 	repo := &Repository{
 		lemmaIndexes: lemmaIndexes,
-		epoch:        time.Date(2022, 10, 30, 0, 0, 0, 0, loc).UnixMilli(),
+		epoch:        time.Date(2022, time.October, 30, 0, 0, 0, 0, loc).UnixMilli(),
 	}
 
 	return repo, nil

internal/router/router.go

@@ -29,15 +29,15 @@ func New(
 
 		router.Use(gin.CustomRecovery(func(ctx *gin.Context, err any) {
 			logger.ErrorContext(ctx, "Panic occured", slog.Any("panic", err))
-			ctx.JSON(http.StatusInternalServerError, response.Error{Message: response.ErrInternalServerError})
+			ctx.JSON(http.StatusInternalServerError, response.InternalServerError)
 		}))
 
 		router.NoMethod(func(ctx *gin.Context) {
-			ctx.JSON(http.StatusMethodNotAllowed, response.Error{Message: response.ErrMethodNotAllowed})
+			ctx.JSON(http.StatusMethodNotAllowed, response.MethodNotAllowed)
 		})
 
 		router.NoRoute(func(ctx *gin.Context) {
-			ctx.JSON(http.StatusNotFound, response.Error{Message: response.ErrNotFound})
+			ctx.JSON(http.StatusNotFound, response.NotFound)
 		})
 	}
 

wire.go

@@ -20,7 +20,7 @@ var (
 	)
 
 	mainDepSet = wire.NewSet(
-		logger.NewLogger,
+		logger.New,
 	)
 
 	repoSet = wire.NewSet(