DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Improve eventbus & constraints handling

Browse Source 
Constraints are now preparsed into active structs
that can be used for matching
This commit is contained in:
Denis Arh
2020-01-18 07:05:35 +01:00
parent ded83ff5db
commit abf4d106bb
45 changed files with 1136 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codegen/v2/events.gen.go.tpl
+44 -1
View File
@@ -9,8 +9,11 @@ package {{ .Package }}
// {{ .Command }}
//
{{ if .Imports }}
{{ if or .Imports $.Events.Properties }}
import (
{{ if $.Events.Properties }}
"encoding/json"
{{ end }}
{{ range $i, $import := .Imports }}
"{{ $import }}"
{{ end }}
@@ -96,3 +99,43 @@ func (res {{ camelCase $.ResourceIdent "base" }}) {{ camelCase "" $p.Name }}() {
return res.{{ $p.Name }}
}
{{ end }}
// Encode internal data to be passed as event params & arguments to triggered Corredor script
func (res {{ camelCase .ResourceIdent "base" }}) Encode() (args map[string][]byte, err error) {
{{- if $.Events.Properties }}
args = make(map[string][]byte)
{{ range $prop := $.Events.Properties }}
if args["{{ $prop.Name }}"], err = json.Marshal(res.{{ $prop.Name }}); err != nil {
return nil, err
}
{{ end }}
{{ else }}
// Handle argument encoding
{{ end -}}
return
}
// Decode return values from Corredor script into struct props
func (res *{{ camelCase .ResourceIdent "base" }}) Decode(results map[string][]byte)( err error) {
{{- if $.Events.Result }}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $.Events.Result }}); err != nil {
return
}
}
{{ end -}}
{{- range $prop := $.Events.Properties }}
{{- if not $prop.Immutable }}
if r, ok := results["{{ $prop.Name }}"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $prop.Name }}); err != nil {
return
}
}
{{ end -}}
{{ end -}}
return
}
codegen/v2/events.go.tpl
+2 -45
View File
@@ -1,13 +1,9 @@
package {{ .Package }}
{{ if $.Events.Properties }}
import (
"encoding/json"
)
{{ end }}
import "github.com/cortezaproject/corteza-server/pkg/eventbus"
// Match returns false if given conditions do not match event & resource internals
func (res {{ camelCase .ResourceIdent "base" }}) Match(name string, op string, values ...string) bool {
func (res {{ camelCase .ResourceIdent "base" }}) Match(c constraint) bool {
// By default we match no mather what kind of constraints we receive
//
// Function will be called multiple times - once for every trigger constraint
@@ -17,42 +13,3 @@ func (res {{ camelCase .ResourceIdent "base" }}) Match(name string, op string, v
// When there are multiple values, Match() can decide how to treat them (OR, AND...)
return true
}
// Encode internal data to be passed as event params & arguments to triggered Corredor script
func (res {{ camelCase .ResourceIdent "base" }}) Encode() (args map[string][]byte, err error) {
{{- if $.Events.Properties }}
args = make(map[string][]byte)
{{ range $prop := $.Events.Properties }}
if args["{{ $prop.Name }}"], err = json.Marshal(res.{{ $prop.Name }}); err != nil {
return nil, err
}
{{ end }}
{{ else }}
// Handle argument encoding
{{ end -}}
return
}
// Decode return values from Corredor script into struct props
func (res *{{ camelCase .ResourceIdent "base" }}) Decode(results map[string][]byte)( err error) {
{{- if $.Events.Result }}
if r, ok := results["result"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $.Events.Result }}); err != nil {
return
}
}
{{ end -}}
{{- range $prop := $.Events.Properties }}
{{- if not $prop.Immutable }}
if r, ok := results["{{ $prop.Name }}"]; ok && len(results) == 1 {
if err = json.Unmarshal(r, res.{{ $prop.Name }}); err != nil {
return
}
}
{{ end -}}
{{ end -}}
return
}