From a8566cf166878b1f36cfac722571e5f090e855fa Mon Sep 17 00:00:00 2001 From: Zdenek Devaty Date: Mon, 9 Dec 2024 15:09:08 +0100 Subject: [PATCH] Add support for property subtype --- asset/asset.go | 9 +++++---- go.mod | 4 ++-- go.sum | 8 ++++---- utils/utils.go | 5 +++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/asset/asset.go b/asset/asset.go index 21b7284..257b129 100644 --- a/asset/asset.go +++ b/asset/asset.go @@ -145,8 +145,9 @@ func InitAssetTypeFiles(pattern string) func(db.Connection) error { type SubType string const ( - Status SubType = "status" - Info SubType = "info" - Input SubType = "input" - Output SubType = "output" + Status SubType = "status" + Info SubType = "info" + Input SubType = "input" + Output SubType = "output" + Property SubType = "property" ) diff --git a/go.mod b/go.mod index 1fab00d..ff331b3 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( github.com/volatiletech/inflect v0.0.1 // indirect github.com/volatiletech/sqlboiler/v4 v4.17.1 // indirect github.com/volatiletech/strmangle v0.0.8 // indirect - golang.org/x/crypto v0.29.0 // indirect - golang.org/x/text v0.20.0 // indirect + golang.org/x/crypto v0.30.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 867cf25..0921775 100644 --- a/go.sum +++ b/go.sum @@ -561,8 +561,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= -golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= -golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= +golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= +golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -793,8 +793,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/utils/utils.go b/utils/utils.go index 1cce78d..592c735 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -2,9 +2,10 @@ package utils import ( "fmt" - "github.com/eliona-smart-building-assistant/go-eliona/asset" "reflect" "strings" + + "github.com/eliona-smart-building-assistant/go-eliona/asset" ) type FieldTag struct { @@ -29,7 +30,7 @@ func parseElionaTag(field reflect.StructField) (*FieldTag, error) { if subtypeTag != "" { subType = asset.SubType(subtypeTag) switch subType { - case asset.Status, asset.Info, asset.Input, asset.Output: + case asset.Status, asset.Info, asset.Input, asset.Output, asset.Property: // valid subtype default: return nil, fmt.Errorf("invalid subtype in eliona tag on field %s", field.Name)