Add inverted filter also for public event types

rarimo · Jun 18, 2024 · 9f5d99b · 9f5d99b
1 parent d157735
commit 9f5d99b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/docs/spec/paths/integrations@rarime-points-svc@v1@public@event_types.yaml b/docs/spec/paths/integrations@rarime-points-svc@v1@public@event_types.yaml
@@ -17,6 +17,16 @@ get:
         items:
           type: string
           example: "passport_scan"
+    - in: query
+      name: 'filter[name][not]'
+      description: |
+        Inverted filter by type name: excludes provided values
+      required: false
+      schema:
+        type: array
+        items:
+          type: string
+          example: "referral_specific"
     - in: query
       name: 'filter[flag]'
       description: Filter by configuration flags. Values are disjunctive (OR).

diff --git a/internal/service/handlers/list_event_types.go b/internal/service/handlers/list_event_types.go
@@ -20,6 +20,9 @@ func ListEventTypes(w http.ResponseWriter, r *http.Request) {
 	types := EventTypes(r).List(
 		evtypes.FilterByNames(req.FilterName...),
 		evtypes.FilterByFlags(req.FilterFlag...),
+		func(ev evtypes.EventConfig) bool {
+			return len(req.FilterNotName) > 0 && !evtypes.FilterByNames(req.FilterNotName...)(ev)
+		},
 	)
 
 	resTypes := make([]resources.EventType, len(types))

diff --git a/internal/service/requests/list_event_types.go b/internal/service/requests/list_event_types.go
@@ -9,8 +9,9 @@ import (
 )
 
 type ListExpiredEvents struct {
-	FilterName []string `filter:"name"`
-	FilterFlag []string `filter:"flag"`
+	FilterName    []string `filter:"name"`
+	FilterFlag    []string `filter:"flag"`
+	FilterNotName []string `url:"filter[name][not]"`
 }
 
 func NewListEventTypes(r *http.Request) (req ListExpiredEvents, err error) {
@@ -25,7 +26,9 @@ func NewListEventTypes(r *http.Request) (req ListExpiredEvents, err error) {
 			evtypes.FlagNotStarted,
 			evtypes.FlagExpired,
 			evtypes.FlagDisabled,
-		)))}.Filter()
+		))),
+		"filter[name][not]": val.Validate(req.FilterNotName, val.When(len(req.FilterName) > 0, val.Nil, val.Empty)),
+	}.Filter()
 
 	return
 }
diff --git a/internal/service/requests/list_events.go b/internal/service/requests/list_events.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	validation "github.com/go-ozzo/ozzo-validation/v4"
+	val "github.com/go-ozzo/ozzo-validation/v4"
 	"github.com/rarimo/rarime-points-svc/internal/data"
 	"github.com/rarimo/rarime-points-svc/internal/service/page"
 	"gitlab.com/distributed_lab/urlval/v4"
@@ -33,9 +33,10 @@ func NewListEvents(r *http.Request) (req ListEvents, err error) {
 		*req.FilterNullifier = strings.ToLower(*req.FilterNullifier)
 	}
 
-	err = validation.Errors{
-		"filter[nullifier]": validation.Validate(req.FilterNullifier, validation.Required, validation.Match(nullifierRegexp)),
-		"filter[status]":    validation.Validate(req.FilterStatus, validation.Each(validation.In(data.EventOpen, data.EventFulfilled, data.EventClaimed))),
+	err = val.Errors{
+		"filter[nullifier]":             val.Validate(req.FilterNullifier, val.Required, val.Match(nullifierRegexp)),
+		"filter[status]":                val.Validate(req.FilterStatus, val.Each(val.In(data.EventOpen, data.EventFulfilled, data.EventClaimed))),
+		"filter[meta.static.name][not]": val.Validate(req.FilterNotType, val.When(len(req.FilterType) > 0, val.Nil, val.Empty)),
 	}.Filter()
 	return
 }