mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2024-11-22 08:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: allow zeroing out asset ids (#624)

Browse source
This commit is contained in:
Hayden 2023-11-15 21:46:47 -06:00 committed by GitHub
parent afbc6a49ac
commit 8cc0f30291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/internal/data/repo/asset_id_type.go
View file

@ -47,6 +47,11 @@ func (aid AssetID) MarshalJSON() ([]byte, error) {
} }
func (aid *AssetID) UnmarshalJSON(d []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)
d = bytes.Replace(d, []byte(`-`), []byte(``), -1) d = bytes.Replace(d, []byte(`-`), []byte(``), -1)

2
backend/internal/data/repo/repo_items.go
View file

@ -68,7 +68,7 @@ type (
ItemUpdate struct { ItemUpdate struct {
ParentID uuid.UUID `json:"parentId" extensions:"x-nullable,x-omitempty"` ParentID uuid.UUID `json:"parentId" extensions:"x-nullable,x-omitempty"`
ID uuid.UUID `json:"id"` ID uuid.UUID `json:"id"`
AssetID AssetID `json:"assetId,string"` AssetID AssetID `json:"assetId"`
Name string `json:"name"` Name string `json:"name"`
Description string `json:"description"` Description string `json:"description"`
Quantity int `json:"quantity"` Quantity int `json:"quantity"`