siteworxpro/reloading-manager
1
Fork 0
Code Pull Requests Actions Releases 3 Activity

fix tpyo #8

Merged
rrise merged 4 commits from lint into master 2025-06-10 15:56:06 +00:00
Conversation 0 Commits 4 Files Changed 15 +57 -57
6 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45b33d1ad8 - Show all commits

2
backend/.golangci.yml
View File

@@ -3,13 +3,13 @@ linters:
default: standard default: standard
enable: enable:
- whitespace - whitespace
- wrapcheck
- tagalign - tagalign
- reassign - reassign
- bodyclose - bodyclose
- contextcheck - contextcheck
- containedctx - containedctx
- godot - godot
- usestdlibvars
formatters: formatters:
settings: settings:

38
backend/handlers/bullets/handler.go
View File

@@ -27,9 +27,9 @@ func Photo(c echo.Context) error {
}() }()
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
byId, err := db.Bullets.GetBulletById(context.Background(), *uid) byId, err := db.Bullets.GetBulletById(context.Background(), *uid)
@@ -57,12 +57,12 @@ func Delete(c echo.Context) error {
}() }()
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
err := db.Bullets.DeleteBullet(context.Background(), *uid) err = db.Bullets.DeleteBullet(context.Background(), *uid)
if err != nil { if err != nil {
return err return err
} }
@@ -77,9 +77,9 @@ func Put(c echo.Context) error {
}() }()
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
byId, err := db.Bullets.GetBulletById(context.Background(), *uid) byId, err := db.Bullets.GetBulletById(context.Background(), *uid)
@@ -109,9 +109,9 @@ func Put(c echo.Context) error {
weight, _ := strconv.ParseInt(c.FormValue("weight"), 10, 32) weight, _ := strconv.ParseInt(c.FormValue("weight"), 10, 32)
diameter, _ := strconv.ParseInt(c.FormValue("diameter"), 10, 32) diameter, _ := strconv.ParseInt(c.FormValue("diameter"), 10, 32)
manufacturerId := c.FormValue("manufacturer_id") manufacturerId := c.FormValue("manufacturer_id")
manufacturerUid := handlers.ParseUuidOrBadRequest(c, manufacturerId) manufacturerUid, err := handlers.ParseUuidOrBadRequest(c, manufacturerId)
if manufacturerUid == nil { if err == nil || manufacturerUid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
name := c.FormValue("name") name := c.FormValue("name")
@@ -161,9 +161,9 @@ func Get(c echo.Context) error {
if c.Param("id") != "" { if c.Param("id") != "" {
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
byId, err := db.Bullets.GetBulletById(context.Background(), *uid) byId, err := db.Bullets.GetBulletById(context.Background(), *uid)
@@ -258,9 +258,9 @@ func Post(c echo.Context) error {
_ = db.Db.Close(context.Background()) _ = db.Db.Close(context.Background())
}() }()
manufacturerUid := handlers.ParseUuidOrBadRequest(c, manufacturerId) manufacturerUid, err := handlers.ParseUuidOrBadRequest(c, manufacturerId)
if manufacturerUid == nil { if err != nil || manufacturerUid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
manufacturer, err := db.Manufacturer.GetById(context.Background(), *manufacturerUid) manufacturer, err := db.Manufacturer.GetById(context.Background(), *manufacturerUid)

8
backend/handlers/cartridge/handler.go
View File

@@ -87,12 +87,12 @@ func Delete(c echo.Context) error {
_ = db.Db.Close(context.Background()) _ = db.Db.Close(context.Background())
}() }()
uid := handlers.ParseUuidOrBadRequest(c, c.Param("id")) uid, err := handlers.ParseUuidOrBadRequest(c, c.Param("id"))
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "invalid id")
} }
err := db.Loads.DeleteCartridge(context.Background(), *uid) err = db.Loads.DeleteCartridge(context.Background(), *uid)
if err != nil { if err != nil {
return err return err

22
backend/handlers/manufacturer/handler.go
View File

@@ -27,9 +27,9 @@ func Get(c echo.Context) error {
if c.Param("id") != "" { if c.Param("id") != "" {
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
byId, err := db.Manufacturer.GetById(context.Background(), *uid) byId, err := db.Manufacturer.GetById(context.Background(), *uid)
@@ -80,12 +80,12 @@ func Delete(c echo.Context) error {
}() }()
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
_, err := db.Manufacturer.GetById(context.Background(), *uid) _, err = db.Manufacturer.GetById(context.Background(), *uid)
if err != nil { if err != nil {
return echo.NewHTTPError(http.StatusNotFound, "Not found") return echo.NewHTTPError(http.StatusNotFound, "Not found")
} }
@@ -107,12 +107,12 @@ func Post(c echo.Context) error {
if c.Param("id") != "" { if c.Param("id") != "" {
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID format")
} }
_, err := db.Manufacturer.GetById(context.Background(), *uid) _, err = db.Manufacturer.GetById(context.Background(), *uid)
if err != nil { if err != nil {
return echo.NewHTTPError(http.StatusNotFound, "Not found") return echo.NewHTTPError(http.StatusNotFound, "Not found")
} }

33
backend/handlers/primers/handler.go
View File

@@ -3,6 +3,7 @@ package primers
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"git.siteworxpro.com/reloading-manager/backend/database" "git.siteworxpro.com/reloading-manager/backend/database"
"git.siteworxpro.com/reloading-manager/backend/handlers" "git.siteworxpro.com/reloading-manager/backend/handlers"
"git.siteworxpro.com/reloading-manager/backend/models/primers" "git.siteworxpro.com/reloading-manager/backend/models/primers"
@@ -45,9 +46,9 @@ func Post(c echo.Context) error {
if c.Param("id") != "" { if c.Param("id") != "" {
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID.")
} }
p, err := db.Primer.GetPrimerById(context.Background(), *uid) p, err := db.Primer.GetPrimerById(context.Background(), *uid)
@@ -60,9 +61,9 @@ func Post(c echo.Context) error {
} }
if c.FormValue("manufacturer_id") != "" { if c.FormValue("manufacturer_id") != "" {
mid := handlers.ParseUuidOrBadRequest(c, c.FormValue("manufacturer_id")) mid, err := handlers.ParseUuidOrBadRequest(c, c.FormValue("manufacturer_id"))
if mid == nil { if err != nil || mid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid Manufacturer ID.")
} }
p.ManufacturerID = *mid p.ManufacturerID = *mid
@@ -121,9 +122,9 @@ func Post(c echo.Context) error {
newUuid := uuid.New().String() newUuid := uuid.New().String()
uid, _ := handlers.ParseUuid(newUuid) uid, _ := handlers.ParseUuid(newUuid)
mid := handlers.ParseUuidOrBadRequest(c, manufacturerId) mid, err := handlers.ParseUuidOrBadRequest(c, manufacturerId)
if mid == nil { if err != nil || mid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid Manufacturer ID.")
} }
err = db.Primer.InsertPrimer(context.Background(), primers.InsertPrimerParams{ err = db.Primer.InsertPrimer(context.Background(), primers.InsertPrimerParams{
@@ -155,9 +156,9 @@ func Photo(c echo.Context) error {
}() }()
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID.")
} }
byId, err := db.Primer.GetPrimerById(context.Background(), *uid) byId, err := db.Primer.GetPrimerById(context.Background(), *uid)
@@ -185,14 +186,14 @@ func Get(c echo.Context) error {
if c.Param("id") != "" { if c.Param("id") != "" {
id := c.Param("id") id := c.Param("id")
uid := handlers.ParseUuidOrBadRequest(c, id) uid, err := handlers.ParseUuidOrBadRequest(c, id)
if uid == nil { if err != nil || uid == nil {
return nil return echo.NewHTTPError(http.StatusBadRequest, "Invalid UUID.")
} }
row, err := db.Primer.GetPrimerById(context.Background(), *uid) row, err := db.Primer.GetPrimerById(context.Background(), *uid)
if err != nil { if err != nil {
return err return fmt.Errorf("primer not found: %v", err)
} }
return c.JSON(http.StatusOK, handlers.Response[PrimerResponse]{ return c.JSON(http.StatusOK, handlers.Response[PrimerResponse]{

11
backend/handlers/uuid.go
View File

@@ -1,6 +1,7 @@
package handlers package handlers
import ( import (
"fmt"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/pgtype"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
@@ -23,7 +24,7 @@ func ParseUuidOrEmpty(s string) *pgtype.UUID {
func ParseUuid(s string) (*pgtype.UUID, error) { func ParseUuid(s string) (*pgtype.UUID, error) {
uid, err := uuid.Parse(s) uid, err := uuid.Parse(s)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("invalid UUID format: %v", err)
} }
return &pgtype.UUID{ return &pgtype.UUID{
@@ -32,13 +33,11 @@ func ParseUuid(s string) (*pgtype.UUID, error) {
}, nil }, nil
} }
func ParseUuidOrBadRequest(c echo.Context, s string) *pgtype.UUID { func ParseUuidOrBadRequest(c echo.Context, s string) (*pgtype.UUID, error) {
uid, err := ParseUuid(s) uid, err := ParseUuid(s)
if err != nil { if err != nil {
_ = BadRequest(c, "Invalid UUID.") return nil, BadRequest(c, fmt.Sprintf("invalid UUID. %v", err))
return nil
} }
return uid return uid, nil
} }