From 18669b39c167a74574df829211b8d5e33ba6bb7d Mon Sep 17 00:00:00 2001
From: Silvan <silvan.reusser@gmail.com>
Date: Tue, 7 Jul 2020 11:42:39 +0200
Subject: [PATCH] fix(iam_member): naming, error handling, column name (#355)

---
 .../admin/repository/eventsourcing/view/iam_member.go    | 9 +++++----
 internal/iam/repository/view/iam_member_view.go          | 4 ++--
 internal/iam/repository/view/model/iam_member.go         | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/internal/admin/repository/eventsourcing/view/iam_member.go b/internal/admin/repository/eventsourcing/view/iam_member.go
index 82bed5c2d7..c51efae30a 100644
--- a/internal/admin/repository/eventsourcing/view/iam_member.go
+++ b/internal/admin/repository/eventsourcing/view/iam_member.go
@@ -1,6 +1,7 @@
 package view
 
 import (
+	"github.com/caos/zitadel/internal/errors"
 	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/model"
@@ -31,10 +32,10 @@ func (v *View) PutIamMember(org *model.IamMemberView, sequence uint64) error {
 	return v.ProcessedIamMemberSequence(sequence)
 }
 
-func (v *View) DeleteIamMember(orgID, userID string, eventSequence uint64) error {
-	err := view.DeleteIamMember(v.Db, iamMemberTable, orgID, userID)
-	if err != nil {
-		return nil
+func (v *View) DeleteIamMember(iamID, userID string, eventSequence uint64) error {
+	err := view.DeleteIamMember(v.Db, iamMemberTable, iamID, userID)
+	if err != nil && !errors.IsNotFound(err) {
+		return err
 	}
 	return v.ProcessedIamMemberSequence(eventSequence)
 }
diff --git a/internal/iam/repository/view/iam_member_view.go b/internal/iam/repository/view/iam_member_view.go
index 28eb03a8c6..d0530f0821 100644
--- a/internal/iam/repository/view/iam_member_view.go
+++ b/internal/iam/repository/view/iam_member_view.go
@@ -12,9 +12,9 @@ import (
 func IamMemberByIDs(db *gorm.DB, table, orgID, userID string) (*model.IamMemberView, error) {
 	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}
-	query := repository.PrepareGetByQuery(table, orgIDQuery, userIDQuery)
+	query := repository.PrepareGetByQuery(table, iamIDQuery, userIDQuery)
 	err := query(db, member)
 	if caos_errs.IsNotFound(err) {
 		return nil, caos_errs.ThrowNotFound(nil, "VIEW-Ahq2s", "Errors.Iam.MemberNotExisting")
diff --git a/internal/iam/repository/view/model/iam_member.go b/internal/iam/repository/view/model/iam_member.go
index 66e9f6f1eb..752230dc04 100644
--- a/internal/iam/repository/view/model/iam_member.go
+++ b/internal/iam/repository/view/model/iam_member.go
@@ -2,9 +2,10 @@ package model
 
 import (
 	"encoding/json"
-	es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	"time"
 
+	es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
+
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/models"
@@ -14,7 +15,7 @@ import (
 
 const (
 	IamMemberKeyUserID    = "user_id"
-	IamMemberKeyIamID     = "org_id"
+	IamMemberKeyIamID     = "iam_id"
 	IamMemberKeyUserName  = "user_name"
 	IamMemberKeyEmail     = "email"
 	IamMemberKeyFirstName = "first_name"