core/oc-lib
6
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

logs update

Browse Source
This commit is contained in:
mr
2024-08-02 14:07:43 +02:00
parent e23756eba6
commit fa52c71e93
11 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbs/dbs.go
View File

@@ -101,8 +101,8 @@ func ToValueOperator(operator Operator, value interface{}) interface{} {
}
type Filters struct {
And map[string]Filter `json:"and"`
Or map[string]Filter `json:"or"`
And map[string][]Filter `json:"and"`
Or map[string][]Filter `json:"or"`
}
type Filter struct {

8
dbs/mongo/mongo.go
View File

@@ -267,13 +267,17 @@ func (m *MongoDB) Search(filters *dbs.Filters, collection_name string) (*mongo.C
f := bson.D{}
if filters != nil {
for k, filter := range filters.Or {
orList = append(orList, dbs.StringToOperator(filter.Operator).ToMongoOperator(k, filter.Value))
for _, ff := range filter {
orList = append(orList, dbs.StringToOperator(ff.Operator).ToMongoOperator(k, ff.Value))
}
}
if len(orList) > 0 {
f = bson.D{{"$or", orList}}
}
for k, filter := range filters.And {
f = append(f, dbs.StringToOperator(filter.Operator).ToMongoEOperator(k, filter.Value))
for _, ff := range filter {
f = append(f, dbs.StringToOperator(ff.Operator).ToMongoEOperator(k, ff.Value))
}
}
}