fix: allow zeroing out asset ids (#624)

hay-kot · Nov 16, 2023 · 8cc0f30 · 8cc0f30
1 parent afbc6a4
commit 8cc0f30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/backend/internal/data/repo/asset_id_type.go b/backend/internal/data/repo/asset_id_type.go
@@ -47,6 +47,11 @@ func (aid AssetID) MarshalJSON() ([]byte, error) {
 }
 
 func (aid *AssetID) UnmarshalJSON(d []byte) error {
+	if len(d) == 0 || bytes.Equal(d, []byte(`""`)) {
+		*aid = -1
+		return nil
+	}
+
 	d = bytes.Replace(d, []byte(`"`), []byte(``), -1)
 	d = bytes.Replace(d, []byte(`-`), []byte(``), -1)
 

diff --git a/backend/internal/data/repo/repo_items.go b/backend/internal/data/repo/repo_items.go
@@ -68,7 +68,7 @@ type (
 	ItemUpdate struct {
 		ParentID    uuid.UUID `json:"parentId" extensions:"x-nullable,x-omitempty"`
 		ID          uuid.UUID `json:"id"`
-		AssetID     AssetID   `json:"assetId,string"`
+		AssetID     AssetID   `json:"assetId"`
 		Name        string    `json:"name"`
 		Description string    `json:"description"`
 		Quantity    int       `json:"quantity"`