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

42
app/main.go
View File

@ -20,19 +20,20 @@ var (
) )
type CertFilter struct { type CertFilter struct {
Alive *bool `filterfield:"field=alive,operator=EQ"` Alive *bool `filterfield:"field=alive;operator=EQ"`
SerialNumber *string `filterfield:"field=serial_number,operator=NE"` SerialNumber *string `filterfield:"field=serial_number;operator=NE"`
SerialNumberContains *string `filterfield:"field=serial_number,operator=LIKE"` SerialNumberContains *string `filterfield:"field=serial_number;operator=LIKE"`
IssuerContains *string `filterfield:"field=issuer,operator=ILIKE"` IssuerContains *string `filterfield:"field=issuer;operator=ILIKE"`
Id *uuid.UUID `filterfield:"field=id,operator=EQ"` Id *uuid.UUID `filterfield:"field=id;operator=EQ"`
Ids *[]uuid.UUID `filterfield:"field=id,operator=IN"` Ids *[]uuid.UUID `filterfield:"field=id;operator=IN"`
IdsNot *[]string `filterfield:"field=id,operator=NOT_IN"` IdsNot *[]string `filterfield:"field=id;operator=NOT_IN"`
CreatedAt_Lt *time.Time `filterfield:"field=created_at,operator=LT"` CreatedAt_Lt *time.Time `filterfield:"field=created_at;operator=LT"`
Timestamps *[]time.Time `filterfield:"field=created_at,operator=IN"` Timestamps *[]time.Time `filterfield:"field=created_at;operator=IN"`
// CompanyIsActive *bool `filterfield:"joins=companies;field=is_active;operator=EQ"`
} }
type CompanyFilter struct { type CompanyFilter struct {
IsActive *bool `filterfield:"field=is_active,operator=EQ"` IsActive *bool `filterfield:"field=is_active;operator=EQ"`
} }
func doMagic(db *gorm.DB) { func doMagic(db *gorm.DB) {
@ -93,6 +94,24 @@ func doList(db *gorm.DB) {
} }
} }
func doListWithJoins(db *gorm.DB) {
repo := repository.RepoBase[models.Cert]{}
repo.Init(db, nil)
filter := CertFilter{
Alive: &TRUE,
}
certs, err := repo.List(filter, nil)
if err != nil {
panic(err)
}
for n, cert := range *certs {
fmt.Printf(">> [%d] %+v %s (alive %t)\n", n, cert.Id, cert.CreatedAt, cert.Alive)
}
}
func doCount(db *gorm.DB) { func doCount(db *gorm.DB) {
repo := repository.RepoBase[models.Cert]{} repo := repository.RepoBase[models.Cert]{}
repo.Init(db, nil) repo.Init(db, nil)
@ -184,7 +203,8 @@ func main() {
db := db.InitDB() db := db.InitDB()
// doMagic(db) // doMagic(db)
// doList(db) doList(db)
// doListWithJoins(db)
// doCount(db) // doCount(db)
// doSave(db) // doSave(db)
doDelete(db) doDelete(db)

8
app/repository/method_list_test.go
View File

@ -43,10 +43,10 @@ func (m MyModel) TableName() string {
} }
type MyModelFilter struct { type MyModelFilter struct {
Id *uuid.UUID `filterfield:"field=id,operator=EQ"` Id *uuid.UUID `filterfield:"field=id;operator=EQ"`
Ids *[]uuid.UUID `filterfield:"field=id,operator=IN"` Ids *[]uuid.UUID `filterfield:"field=id;operator=IN"`
Value *string `filterfield:"field=value,operator=EQ"` Value *string `filterfield:"field=value;operator=EQ"`
CntGT *int `filterfield:"field=cnt,operator=GT"` CntGT *int `filterfield:"field=cnt;operator=GT"`
} }
func TestListMethod(t *testing.T) { func TestListMethod(t *testing.T) {

1
app/repository/smartfilter/filterfield.go
View File

@ -11,6 +11,7 @@ import (
type FilterField struct { type FilterField struct {
Name string Name string
Operator Operator Operator Operator
Joins []string
valueKind reflect.Kind valueKind reflect.Kind
boolValue *bool boolValue *bool

2
app/repository/smartfilter/smartfilter.go
View File

@ -11,7 +11,7 @@ import (
) )
const TAG_NAME = "filterfield" const TAG_NAME = "filterfield"
const TAG_PAIRS_SEPARATOR = "," const TAG_PAIRS_SEPARATOR = ";"
const TAG_KEYVALUE_SEPARATOR = "=" const TAG_KEYVALUE_SEPARATOR = "="
type handlerFunc func(query *gorm.DB, tableName string, filterField *FilterField) *gorm.DB type handlerFunc func(query *gorm.DB, tableName string, filterField *FilterField) *gorm.DB

24
app/repository/smartfilter/smartfilter_test.go
View File

@ -101,11 +101,11 @@ func TestGetFilterFields(t *testing.T) {
t.Run("Skip nil fields", func(t *testing.T) { t.Run("Skip nil fields", func(t *testing.T) {
type TestFilter struct { type TestFilter struct {
Alive *bool `filterfield:"alive,EQ"` Alive *bool `filterfield:"alive;EQ"`
Id *int64 `filterfield:"id,EQ"` Id *int64 `filterfield:"id;EQ"`
Ids *[]uint `filterfield:"id,IN"` Ids *[]uint `filterfield:"id;IN"`
IdsNot *[]uint `filterfield:"id,NOT_IN"` IdsNot *[]uint `filterfield:"id;NOT_IN"`
FirstName *string `filterfield:"first_name,EQ"` FirstName *string `filterfield:"first_name;EQ"`
} }
filter := TestFilter{} filter := TestFilter{}
result := getFilterFields(filter) result := getFilterFields(filter)
@ -119,7 +119,7 @@ func TestGetFilterFields(t *testing.T) {
) )
type TestFilter struct { type TestFilter struct {
Alive *bool Alive *bool
Id *int64 `funnytag:"created_at,LT"` Id *int64 `funnytag:"created_at;LT"`
} }
filter := TestFilter{ filter := TestFilter{
Alive: &alive, Alive: &alive,
@ -140,7 +140,7 @@ func TestFilterField(t *testing.T) {
testCases := []TagParseTestCase{ testCases := []TagParseTestCase{
{ {
name: "Parse without spaces", name: "Parse without spaces",
tagValue: "field=field_1,operator=EQ", tagValue: "field=field_1;operator=EQ",
expected: FilterField{ expected: FilterField{
Name: "field_1", Name: "field_1",
Operator: OperatorEQ, Operator: OperatorEQ,
@ -148,7 +148,7 @@ func TestFilterField(t *testing.T) {
}, },
{ {
name: "Parse spaces between pairs", name: "Parse spaces between pairs",
tagValue: " field=field_2 , operator=LT ", tagValue: " field=field_2 ; operator=LT ",
expected: FilterField{ expected: FilterField{
Name: "field_2", Name: "field_2",
Operator: OperatorLT, Operator: OperatorLT,
@ -156,7 +156,7 @@ func TestFilterField(t *testing.T) {
}, },
{ {
name: "Parse spaces between around keys and values", name: "Parse spaces between around keys and values",
tagValue: "operator = LIKE , field = field_3", tagValue: "operator = LIKE ; field = field_3",
expected: FilterField{ expected: FilterField{
Name: "field_3", Name: "field_3",
Operator: OperatorLIKE, Operator: OperatorLIKE,
@ -174,19 +174,19 @@ func TestFilterField(t *testing.T) {
} }
t.Run("Fail on invalid tag value", func(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.Nil(t, filterField)
assert.EqualError(t, err, "invalid tag value: field=field_1=fail") assert.EqualError(t, err, "invalid tag value: field=field_1=fail")
}) })
t.Run("Fail on invalid operator", func(t *testing.T) { 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.Nil(t, filterField)
assert.EqualError(t, err, "unknown operator: FAIL") assert.EqualError(t, err, "unknown operator: FAIL")
}) })
t.Run("Fail on invalid value key", func(t *testing.T) { 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.Nil(t, filterField)
assert.EqualError(t, err, "invalid value key: failkey") assert.EqualError(t, err, "invalid value key: failkey")
}) })