GuanM/certimate
1
0
Fork 0
mirror of https://github.com/usual2970/certimate.git synced 2025-06-07 21:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor code

Browse Source
This commit is contained in:
Yoan.liu 2025-05-21 15:59:02 +08:00
parent 7d8dd523a2
commit 75326b1ddd
2 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
internal/domain/expr.go
View File

@ -10,6 +10,7 @@ type Value any
type ( type (
ComparisonOperator string ComparisonOperator string
LogicalOperator string LogicalOperator string
ValueType string
) )
const ( const (
@ -24,15 +25,19 @@ const (
And LogicalOperator = "and" And LogicalOperator = "and"
Or LogicalOperator = "or" Or LogicalOperator = "or"
Not LogicalOperator = "not" Not LogicalOperator = "not"
Number ValueType = "number"
String ValueType = "string"
Boolean ValueType = "boolean"
) )
type EvalResult struct { type EvalResult struct {
Type string Type ValueType
Value any Value any
} }
func (e *EvalResult) GetFloat64() (float64, error) { func (e *EvalResult) GetFloat64() (float64, error) {
if e.Type != "number" { if e.Type != Number {
return 0, fmt.Errorf("type mismatch: %s", e.Type) return 0, fmt.Errorf("type mismatch: %s", e.Type)
} }
switch v := e.Value.(type) { switch v := e.Value.(type) {
@ -50,7 +55,7 @@ func (e *EvalResult) GreaterThan(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "number": case Number:
left, err := e.GetFloat64() left, err := e.GetFloat64()
if err != nil { if err != nil {
@ -62,12 +67,12 @@ func (e *EvalResult) GreaterThan(other *EvalResult) (*EvalResult, error) {
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: left > right, Value: left > right,
}, nil }, nil
case "string": case String:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(string) > other.Value.(string), Value: e.Value.(string) > other.Value.(string),
}, nil }, nil
@ -81,7 +86,7 @@ func (e *EvalResult) GreaterOrEqual(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "number": case Number:
left, err := e.GetFloat64() left, err := e.GetFloat64()
if err != nil { if err != nil {
return nil, err return nil, err
@ -91,12 +96,12 @@ func (e *EvalResult) GreaterOrEqual(other *EvalResult) (*EvalResult, error) {
return nil, err return nil, err
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: left >= right, Value: left >= right,
}, nil }, nil
case "string": case String:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(string) >= other.Value.(string), Value: e.Value.(string) >= other.Value.(string),
}, nil }, nil
@ -110,7 +115,7 @@ func (e *EvalResult) LessThan(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "number": case Number:
left, err := e.GetFloat64() left, err := e.GetFloat64()
if err != nil { if err != nil {
return nil, err return nil, err
@ -120,12 +125,12 @@ func (e *EvalResult) LessThan(other *EvalResult) (*EvalResult, error) {
return nil, err return nil, err
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: left < right, Value: left < right,
}, nil }, nil
case "string": case String:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(string) < other.Value.(string), Value: e.Value.(string) < other.Value.(string),
}, nil }, nil
@ -139,7 +144,7 @@ func (e *EvalResult) LessOrEqual(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "number": case Number:
left, err := e.GetFloat64() left, err := e.GetFloat64()
if err != nil { if err != nil {
return nil, err return nil, err
@ -149,12 +154,12 @@ func (e *EvalResult) LessOrEqual(other *EvalResult) (*EvalResult, error) {
return nil, err return nil, err
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: left <= right, Value: left <= right,
}, nil }, nil
case "string": case String:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(string) <= other.Value.(string), Value: e.Value.(string) <= other.Value.(string),
}, nil }, nil
@ -168,7 +173,7 @@ func (e *EvalResult) Equal(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "number": case Number:
left, err := e.GetFloat64() left, err := e.GetFloat64()
if err != nil { if err != nil {
return nil, err return nil, err
@ -178,12 +183,12 @@ func (e *EvalResult) Equal(other *EvalResult) (*EvalResult, error) {
return nil, err return nil, err
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: left == right, Value: left == right,
}, nil }, nil
case "string": case String:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(string) == other.Value.(string), Value: e.Value.(string) == other.Value.(string),
}, nil }, nil
@ -197,7 +202,7 @@ func (e *EvalResult) NotEqual(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "number": case Number:
left, err := e.GetFloat64() left, err := e.GetFloat64()
if err != nil { if err != nil {
return nil, err return nil, err
@ -207,12 +212,12 @@ func (e *EvalResult) NotEqual(other *EvalResult) (*EvalResult, error) {
return nil, err return nil, err
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: left != right, Value: left != right,
}, nil }, nil
case "string": case String:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(string) != other.Value.(string), Value: e.Value.(string) != other.Value.(string),
}, nil }, nil
@ -226,9 +231,9 @@ func (e *EvalResult) And(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "boolean": case Boolean:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(bool) && other.Value.(bool), Value: e.Value.(bool) && other.Value.(bool),
}, nil }, nil
default: default:
@ -241,9 +246,9 @@ func (e *EvalResult) Or(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "boolean": case Boolean:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(bool) || other.Value.(bool), Value: e.Value.(bool) || other.Value.(bool),
}, nil }, nil
default: default:
@ -252,11 +257,11 @@ func (e *EvalResult) Or(other *EvalResult) (*EvalResult, error) {
} }
func (e *EvalResult) Not() (*EvalResult, error) { func (e *EvalResult) Not() (*EvalResult, error) {
if e.Type != "boolean" { if e.Type != Boolean {
return nil, fmt.Errorf("type mismatch: %s", e.Type) return nil, fmt.Errorf("type mismatch: %s", e.Type)
} }
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: !e.Value.(bool), Value: !e.Value.(bool),
}, nil }, nil
} }
@ -266,9 +271,9 @@ func (e *EvalResult) Is(other *EvalResult) (*EvalResult, error) {
return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type) return nil, fmt.Errorf("type mismatch: %s vs %s", e.Type, other.Type)
} }
switch e.Type { switch e.Type {
case "boolean": case Boolean:
return &EvalResult{ return &EvalResult{
Type: "boolean", Type: Boolean,
Value: e.Value.(bool) == other.Value.(bool), Value: e.Value.(bool) == other.Value.(bool),
}, nil }, nil
default: default:
@ -282,9 +287,9 @@ type Expr interface {
} }
type ConstExpr struct { type ConstExpr struct {
Type string `json:"type"` Type string `json:"type"`
Value Value `json:"value"` Value Value `json:"value"`
ValueType string `json:"valueType"` ValueType ValueType `json:"valueType"`
} }
func (c ConstExpr) GetType() string { return c.Type } func (c ConstExpr) GetType() string { return c.Type }

6
internal/domain/workflow.go
View File

@ -210,9 +210,9 @@ type WorkflowNodeIO struct {
} }
type WorkflowNodeIOValueSelector struct { type WorkflowNodeIOValueSelector struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Type string `json:"type"` Type ValueType `json:"type"`
} }
const WorkflowNodeIONameCertificate string = "certificate" const WorkflowNodeIONameCertificate string = "certificate"