TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: refactor system api (#3500)

Browse Source 
* fix: refactor system api

* fix: search domains on get instance

* fix: search domains on get instance

* fix: return instance detail

* fix: implement user sorting column (#3469)

* fix: implement user sorting column

* fix: implement user sorting column

* fix: string column

* isOrderByLower

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

* fix: user converter import

* Update instance.go

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2022-04-27 17:18:34 +02:00
committed by GitHub
parent fd1150f628
commit 70e98460ab
12 changed files with 422 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
internal/query/search_query_test.go
View File

@@ -19,6 +19,11 @@ var (
name: "test_col",
table: testTable,
}
testLowerCol = Column{
name: "test_lower_col",
table: testTable,
isOrderByLower: true,
}
testNoCol = Column{
name: "",
table: testTable,
@@ -34,7 +39,6 @@ func TestSearchRequest_ToQuery(t *testing.T) {
}
type want struct {
stmtAddition string
args []interface{}
}
tests := []struct {
name string
@@ -46,7 +50,6 @@ func TestSearchRequest_ToQuery(t *testing.T) {
fields: fields{},
want: want{
stmtAddition: "",
args: nil,
},
},
{
@@ -56,7 +59,6 @@ func TestSearchRequest_ToQuery(t *testing.T) {
},
want: want{
stmtAddition: "OFFSET 5",
args: nil,
},
},
{
@@ -66,7 +68,6 @@ func TestSearchRequest_ToQuery(t *testing.T) {
},
want: want{
stmtAddition: "LIMIT 5",
args: nil,
},
},
{
@@ -76,8 +77,7 @@ func TestSearchRequest_ToQuery(t *testing.T) {
Asc: true,
},
want: want{
stmtAddition: "ORDER BY LOWER(?)",
args: []interface{}{"test_table.test_col"},
stmtAddition: "ORDER BY test_table.test_col",
},
},
{
@@ -86,8 +86,17 @@ func TestSearchRequest_ToQuery(t *testing.T) {
SortingColumn: testCol,
},
want: want{
stmtAddition: "ORDER BY LOWER(?) DESC",
args: []interface{}{"test_table.test_col"},
stmtAddition: "ORDER BY test_table.test_col DESC",
},
},
{
name: "sort lower asc",
fields: fields{
SortingColumn: testLowerCol,
Asc: true,
},
want: want{
stmtAddition: "ORDER BY LOWER(test_table.test_lower_col)",
},
},
{
@@ -99,8 +108,7 @@ func TestSearchRequest_ToQuery(t *testing.T) {
Asc: true,
},
want: want{
stmtAddition: "ORDER BY LOWER(?) LIMIT 10 OFFSET 5",
args: []interface{}{"test_table.test_col"},
stmtAddition: "ORDER BY test_table.test_col LIMIT 10 OFFSET 5",
},
},
}
@@ -116,7 +124,7 @@ func TestSearchRequest_ToQuery(t *testing.T) {
query := sq.Select((testCol).identifier()).From(testTable.identifier())
expectedQuery, _, _ := query.ToSql()
stmt, args, err := req.toQuery(query).ToSql()
stmt, _, err := req.toQuery(query).ToSql()
if len(tt.want.stmtAddition) > 0 {
expectedQuery += " " + tt.want.stmtAddition
}
@@ -124,10 +132,6 @@ func TestSearchRequest_ToQuery(t *testing.T) {
t.Errorf("stmt = %q, want %q", stmt, expectedQuery)
}
if !reflect.DeepEqual(args, tt.want.args) {
t.Errorf("args = %v, want %v", args, tt.want.stmtAddition)
}
if err != nil {
t.Errorf("no error expected but got %v", err)
}