feat: support multiple filters for LoadFilteredPolicy (#178)

Author: JalinWang

adapter.go

@@ -69,6 +69,10 @@ type Filter struct {
 	V7    []string
 }
 
+type BatchFilter struct {
+	filters []Filter
+}
+
 // Adapter represents the Gorm adapter for policy storage.
 type Adapter struct {
 	driverName     string
@@ -456,17 +460,32 @@ func (a *Adapter) LoadPolicy(model model.Model) error {
 func (a *Adapter) LoadFilteredPolicy(model model.Model, filter interface{}) error {
 	var lines []CasbinRule
 
-	filterValue, ok := filter.(Filter)
-	if !ok {
-		return errors.New("invalid filter type")
-	}
-
-	if err := a.db.Scopes(a.filterQuery(a.db, filterValue)).Order("ID").Find(&lines).Error; err != nil {
-		return err
-	}
+	batchFilter := BatchFilter{
+		filters: []Filter{},
+	}
+	switch filterValue := filter.(type) {
+	case Filter:
+		batchFilter.filters = []Filter{filterValue}
+	case *Filter:
+		batchFilter.filters = []Filter{*filterValue}
+	case []Filter:
+		batchFilter.filters = filterValue
+	case BatchFilter:
+		batchFilter = filterValue
+	case *BatchFilter:
+		batchFilter = *filterValue
+	default:
+		return errors.New("unsupported filter type")
+	}
+
+	for _, f := range batchFilter.filters {
+		if err := a.db.Scopes(a.filterQuery(a.db, f)).Order("ID").Find(&lines).Error; err != nil {
+			return err
+		}
 
-	for _, line := range lines {
-		loadPolicyLine(line, model)
+		for _, line := range lines {
+			loadPolicyLine(line, model)
+		}
 	}
 	a.isFiltered = true
 

adapter_test.go

@@ -334,6 +334,19 @@ func testFilteredPolicy(t *testing.T, a *Adapter) {
 	// Load policies for alice and bob
 	assert.Nil(t, e.LoadFilteredPolicy(Filter{V0: []string{"alice", "bob"}}))
 	testGetPolicy(t, e, [][]string{{"alice", "data1", "read"}, {"bob", "data2", "write"}})
+
+	assert.Nil(t, e.LoadFilteredPolicy(BatchFilter{
+		filters: []Filter{
+			{V0: []string{"alice"}},
+			{V1: []string{"data2"}},
+		},
+	}))
+	testGetPolicy(t, e, [][]string{
+		{"alice", "data1", "read"},
+		{"bob", "data2", "write"},
+		{"data2_admin", "data2", "read"},
+		{"data2_admin", "data2", "write"},
+	})
 }
 
 func testUpdatePolicy(t *testing.T, a *Adapter) {