TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-16 01:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(iam_member): naming, error handling, column name (#355)

Browse Source
This commit is contained in:
Silvan 2020-07-07 11:42:39 +02:00 committed by GitHub
parent 9c277e2efb
commit 18669b39c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/admin/repository/eventsourcing/view/iam_member.go
View File

@ -1,6 +1,7 @@
package view package view
import ( import (
"github.com/caos/zitadel/internal/errors"
iam_model "github.com/caos/zitadel/internal/iam/model" iam_model "github.com/caos/zitadel/internal/iam/model"
"github.com/caos/zitadel/internal/iam/repository/view" "github.com/caos/zitadel/internal/iam/repository/view"
"github.com/caos/zitadel/internal/iam/repository/view/model" "github.com/caos/zitadel/internal/iam/repository/view/model"
@ -31,10 +32,10 @@ func (v *View) PutIamMember(org *model.IamMemberView, sequence uint64) error {
return v.ProcessedIamMemberSequence(sequence) return v.ProcessedIamMemberSequence(sequence)
} }
func (v *View) DeleteIamMember(orgID, userID string, eventSequence uint64) error { func (v *View) DeleteIamMember(iamID, userID string, eventSequence uint64) error {
err := view.DeleteIamMember(v.Db, iamMemberTable, orgID, userID) err := view.DeleteIamMember(v.Db, iamMemberTable, iamID, userID)
if err != nil { if err != nil && !errors.IsNotFound(err) {
return nil return err
} }
return v.ProcessedIamMemberSequence(eventSequence) return v.ProcessedIamMemberSequence(eventSequence)
} }

4
internal/iam/repository/view/iam_member_view.go
View File

@ -12,9 +12,9 @@ import (
func IamMemberByIDs(db *gorm.DB, table, orgID, userID string) (*model.IamMemberView, error) { func IamMemberByIDs(db *gorm.DB, table, orgID, userID string) (*model.IamMemberView, error) {
member := new(model.IamMemberView) member := new(model.IamMemberView)
orgIDQuery := &model.IamMemberSearchQuery{Key: iam_model.IamMemberSearchKeyIamID, Value: orgID, Method: global_model.SearchMethodEquals} iamIDQuery := &model.IamMemberSearchQuery{Key: iam_model.IamMemberSearchKeyIamID, Value: orgID, Method: global_model.SearchMethodEquals}
userIDQuery := &model.IamMemberSearchQuery{Key: iam_model.IamMemberSearchKeyUserID, Value: userID, Method: global_model.SearchMethodEquals} userIDQuery := &model.IamMemberSearchQuery{Key: iam_model.IamMemberSearchKeyUserID, Value: userID, Method: global_model.SearchMethodEquals}
query := repository.PrepareGetByQuery(table, orgIDQuery, userIDQuery) query := repository.PrepareGetByQuery(table, iamIDQuery, userIDQuery)
err := query(db, member) err := query(db, member)
if caos_errs.IsNotFound(err) { if caos_errs.IsNotFound(err) {
return nil, caos_errs.ThrowNotFound(nil, "VIEW-Ahq2s", "Errors.Iam.MemberNotExisting") return nil, caos_errs.ThrowNotFound(nil, "VIEW-Ahq2s", "Errors.Iam.MemberNotExisting")

5
internal/iam/repository/view/model/iam_member.go
View File

@ -2,9 +2,10 @@ package model
import ( import (
"encoding/json" "encoding/json"
es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
"time" "time"
es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
"github.com/caos/logging" "github.com/caos/logging"
caos_errs "github.com/caos/zitadel/internal/errors" caos_errs "github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/eventstore/models" "github.com/caos/zitadel/internal/eventstore/models"
@ -14,7 +15,7 @@ import (
const ( const (
IamMemberKeyUserID = "user_id" IamMemberKeyUserID = "user_id"
IamMemberKeyIamID = "org_id" IamMemberKeyIamID = "iam_id"
IamMemberKeyUserName = "user_name" IamMemberKeyUserName = "user_name"
IamMemberKeyEmail = "email" IamMemberKeyEmail = "email"
IamMemberKeyFirstName = "first_name" IamMemberKeyFirstName = "first_name"