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

feat: user memberships (#537)

Browse Source 
* feat: add search user memberships

* feat: add search user memberships

* feat: read user member ship

* feat: add usergrant search key

* feat: uesrmemberships based on permissions

* feat: merge master

* fix: correct permissions

* fix: update display name on change profile

* fix: merge request converations

* fix: err handling

* Update internal/user/model/user_membership_view.go

Co-authored-by: Silvan <silvan.reusser@gmail.com>

Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
Fabi
2020-07-30 14:37:55 +02:00
committed by GitHub
parent 4dabecd8d4
commit 75f1c4c576
60 changed files with 3773 additions and 2174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/view/repository/query.go
View File

@@ -26,9 +26,9 @@ type ColumnKey interface {
ToColumnName() string
}
func PrepareSearchQuery(table string, request SearchRequest) func(db *gorm.DB, res interface{}) (int, error) {
return func(db *gorm.DB, res interface{}) (int, error) {
count := 0
func PrepareSearchQuery(table string, request SearchRequest) func(db *gorm.DB, res interface{}) (uint64, error) {
return func(db *gorm.DB, res interface{}) (uint64, error) {
var count uint64 = 0
query := db.Table(table)
if column := request.GetSortingColumn(); column != nil {
order := "DESC"

2
internal/view/repository/query_test.go
View File

@@ -13,7 +13,7 @@ func TestPrepareSearchQuery(t *testing.T) {
searchRequest SearchRequest
}
type res struct {
count int
count uint64
wantErr bool
errFunc func(err error) bool
}