golang/repo-pattern
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change separator

Browse Source
This commit is contained in:
Eden Kirin
2024-06-27 13:49:28 +02:00
parent 30714bb3da
commit f7cf63c2bf
5 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/repository/method_list_test.go
+4 -4
View File
@@ -43,10 +43,10 @@ func (m MyModel) TableName() string {
}
type MyModelFilter struct {
Id *uuid.UUID `filterfield:"field=id,operator=EQ"`
Ids *[]uuid.UUID `filterfield:"field=id,operator=IN"`
Value *string `filterfield:"field=value,operator=EQ"`
CntGT *int `filterfield:"field=cnt,operator=GT"`
Id *uuid.UUID `filterfield:"field=id;operator=EQ"`
Ids *[]uuid.UUID `filterfield:"field=id;operator=IN"`
Value *string `filterfield:"field=value;operator=EQ"`
CntGT *int `filterfield:"field=cnt;operator=GT"`
}
func TestListMethod(t *testing.T) {
app/repository/smartfilter/filterfield.go
+1
View File
@@ -11,6 +11,7 @@ import (
type FilterField struct {
Name string
Operator Operator
Joins []string
valueKind reflect.Kind
boolValue *bool
app/repository/smartfilter/smartfilter.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
)
const TAG_NAME = "filterfield"
const TAG_PAIRS_SEPARATOR = ","
const TAG_PAIRS_SEPARATOR = ";"
const TAG_KEYVALUE_SEPARATOR = "="
type handlerFunc func(query *gorm.DB, tableName string, filterField *FilterField) *gorm.DB
app/repository/smartfilter/smartfilter_test.go
+12 -12
View File
@@ -101,11 +101,11 @@ func TestGetFilterFields(t *testing.T) {
t.Run("Skip nil fields", func(t *testing.T) {
type TestFilter struct {
Alive *bool `filterfield:"alive,EQ"`
Id *int64 `filterfield:"id,EQ"`
Ids *[]uint `filterfield:"id,IN"`
IdsNot *[]uint `filterfield:"id,NOT_IN"`
FirstName *string `filterfield:"first_name,EQ"`
Alive *bool `filterfield:"alive;EQ"`
Id *int64 `filterfield:"id;EQ"`
Ids *[]uint `filterfield:"id;IN"`
IdsNot *[]uint `filterfield:"id;NOT_IN"`
FirstName *string `filterfield:"first_name;EQ"`
}
filter := TestFilter{}
result := getFilterFields(filter)
@@ -119,7 +119,7 @@ func TestGetFilterFields(t *testing.T) {
)
type TestFilter struct {
Alive *bool
Id *int64 `funnytag:"created_at,LT"`
Id *int64 `funnytag:"created_at;LT"`
}
filter := TestFilter{
Alive: &alive,
@@ -140,7 +140,7 @@ func TestFilterField(t *testing.T) {
testCases := []TagParseTestCase{
{
name: "Parse without spaces",
tagValue: "field=field_1,operator=EQ",
tagValue: "field=field_1;operator=EQ",
expected: FilterField{
Name: "field_1",
Operator: OperatorEQ,
@@ -148,7 +148,7 @@ func TestFilterField(t *testing.T) {
},
{
name: "Parse spaces between pairs",
tagValue: " field=field_2 , operator=LT ",
tagValue: " field=field_2 ; operator=LT ",
expected: FilterField{
Name: "field_2",
Operator: OperatorLT,
@@ -156,7 +156,7 @@ func TestFilterField(t *testing.T) {
},
{
name: "Parse spaces between around keys and values",
tagValue: "operator = LIKE , field = field_3",
tagValue: "operator = LIKE ; field = field_3",
expected: FilterField{
Name: "field_3",
Operator: OperatorLIKE,
@@ -174,19 +174,19 @@ func TestFilterField(t *testing.T) {
}
t.Run("Fail on invalid tag value", func(t *testing.T) {
filterField, err := newFilterField("field=field_1=fail, operator=EQ")
filterField, err := newFilterField("field=field_1=fail; operator=EQ")
assert.Nil(t, filterField)
assert.EqualError(t, err, "invalid tag value: field=field_1=fail")
})
t.Run("Fail on invalid operator", func(t *testing.T) {
filterField, err := newFilterField("field=field_1, operator=FAIL")
filterField, err := newFilterField("field=field_1; operator=FAIL")
assert.Nil(t, filterField)
assert.EqualError(t, err, "unknown operator: FAIL")
})
t.Run("Fail on invalid value key", func(t *testing.T) {
filterField, err := newFilterField("failkey=field_1, operator=FAIL")
filterField, err := newFilterField("failkey=field_1; operator=FAIL")
assert.Nil(t, filterField)
assert.EqualError(t, err, "invalid value key: failkey")
})