[minor_change] add action and priority attributes to template_contrac…

…t_filter

models/schema_template_contract_filter.go

@@ -1,63 +1,27 @@
 package models
 
-type TemplateContractFilter struct {
-	Ops   string `json:",omitempty"`
-	Path  string `json:",omitempty"`
-	Value string `json:",omitempty"`
-}
-
-type TemplateContractFilterRelationShip struct {
-	Ops   string                 `json:",omitempty"`
-	Path  string                 `json:",omitempty"`
-	Value map[string]interface{} `json:",omitempty"`
-}
+func NewTemplateContractFilterRelationShip(ops, path, action, priority string, filterRef map[string]interface{}, directives []interface{}) *PatchPayload {
 
-func NewTemplateContractFilter(ops, path, filterType string) *TemplateContractFilter {
-
-	return &TemplateContractFilter{
-		Ops:   ops,
-		Path:  path,
-		Value: filterType,
+	filterMap := map[string]interface{}{
+		"filterRef": filterRef,
 	}
 
-}
-
-func NewTemplateContractFilterRelationShip(ops, path string, filterRef map[string]interface{}, directives []interface{}) *TemplateContractFilterRelationShip {
-	var contractMap map[string]interface{}
-	if ops != "remove" {
-		contractMap = map[string]interface{}{
-			"filterRef":  filterRef,
-			"directives": directives,
-		}
-	} else {
-		contractMap = nil
+	if len(directives) > 0 {
+		filterMap["directives"] = directives
 	}
-	return &TemplateContractFilterRelationShip{
-		Ops:   ops,
-		Path:  path,
-		Value: contractMap,
-	}
-
-}
 
-func (FilterAttributes *TemplateContractFilter) ToMap() (map[string]interface{}, error) {
-	FilterAttributesMap := make(map[string]interface{})
-	A(FilterAttributesMap, "op", FilterAttributes.Ops)
-	A(FilterAttributesMap, "path", FilterAttributes.Path)
-	if FilterAttributes.Value != "" {
-		A(FilterAttributesMap, "value", FilterAttributes.Value)
+	if action != "" {
+		filterMap["action"] = action
 	}
 
-	return FilterAttributesMap, nil
-}
+	if priority != "" {
+		filterMap["priorityOverride"] = priority
+	}
 
-func (FilterAttributes *TemplateContractFilterRelationShip) ToMap() (map[string]interface{}, error) {
-	FilterAttributesMap := make(map[string]interface{})
-	A(FilterAttributesMap, "op", FilterAttributes.Ops)
-	A(FilterAttributesMap, "path", FilterAttributes.Path)
-	if FilterAttributes.Value != nil {
-		A(FilterAttributesMap, "value", FilterAttributes.Value)
+	return &PatchPayload{
+		Ops:   ops,
+		Path:  path,
+		Value: filterMap,
 	}
 
-	return FilterAttributesMap, nil
 }