From 5e39a5f81364c0bedfc6445832297f9290e58bee Mon Sep 17 00:00:00 2001
From: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Date: Wed, 17 Jun 2020 17:23:39 +0200
Subject: [PATCH] fix: delete org domain (#234)

---
 .../repository/eventsourcing/handler/org_domain.go         | 2 +-
 .../management/repository/eventsourcing/view/org_domain.go | 4 ++--
 internal/org/repository/view/org_domain_view.go            | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/internal/management/repository/eventsourcing/handler/org_domain.go b/internal/management/repository/eventsourcing/handler/org_domain.go
index 9ecceb794..35760d02f 100644
--- a/internal/management/repository/eventsourcing/handler/org_domain.go
+++ b/internal/management/repository/eventsourcing/handler/org_domain.go
@@ -84,7 +84,7 @@ func (d *OrgDomain) processOrgDomain(event *models.Event) (err error) {
 		if err != nil {
 			return err
 		}
-		return d.view.DeleteOrgDomain(domain.Domain, event.Sequence)
+		return d.view.DeleteOrgDomain(event.AggregateID, domain.Domain, event.Sequence)
 	default:
 		return d.view.ProcessedOrgDomainSequence(event.Sequence)
 	}
diff --git a/internal/management/repository/eventsourcing/view/org_domain.go b/internal/management/repository/eventsourcing/view/org_domain.go
index e007e91f5..facb8a2eb 100644
--- a/internal/management/repository/eventsourcing/view/org_domain.go
+++ b/internal/management/repository/eventsourcing/view/org_domain.go
@@ -38,8 +38,8 @@ func (v *View) PutOrgDomain(org *model.OrgDomainView, sequence uint64) error {
 	return nil
 }
 
-func (v *View) DeleteOrgDomain(domain string, eventSequence uint64) error {
-	err := view.DeleteOrgDomain(v.Db, orgDomainTable, domain)
+func (v *View) DeleteOrgDomain(orgID, domain string, eventSequence uint64) error {
+	err := view.DeleteOrgDomain(v.Db, orgDomainTable, orgID, domain)
 	if err != nil {
 		return nil
 	}
diff --git a/internal/org/repository/view/org_domain_view.go b/internal/org/repository/view/org_domain_view.go
index 388585875..a9b3c39ad 100644
--- a/internal/org/repository/view/org_domain_view.go
+++ b/internal/org/repository/view/org_domain_view.go
@@ -58,7 +58,10 @@ func PutOrgDomain(db *gorm.DB, table string, role *model.OrgDomainView) error {
 	return save(db, role)
 }
 
-func DeleteOrgDomain(db *gorm.DB, table, domain string) error {
-	delete := view.PrepareDeleteByKey(table, model.OrgSearchKey(org_model.ORGDOMAINSEARCHKEY_DOMAIN), domain)
+func DeleteOrgDomain(db *gorm.DB, table, orgID, domain string) error {
+	delete := view.PrepareDeleteByKeys(table,
+		view.Key{Key: model.OrgDomainSearchKey(org_model.ORGDOMAINSEARCHKEY_DOMAIN), Value: domain},
+		view.Key{Key: model.OrgDomainSearchKey(org_model.ORGDOMAINSEARCHKEY_ORG_ID), Value: orgID},
+	)
 	return delete(db)
 }