From 0186fed3cebcb5ffc6a935f3ba25e4d175bb153c Mon Sep 17 00:00:00 2001
From: George <me@georgemac.com>
Date: Wed, 20 May 2020 15:10:09 +0100
Subject: [PATCH] refactor!(notifications): drop URM and Org services from
 NotificationRuleService interface definition (#18131)

---
 notification.go              |  6 ------
 testing/notification_rule.go | 19 -------------------
 2 files changed, 25 deletions(-)

diff --git a/notification.go b/notification.go
index fc26195d08..a5a139c787 100644
--- a/notification.go
+++ b/notification.go
@@ -35,12 +35,6 @@ type NotificationRule interface {
 
 // NotificationRuleStore represents a service for managing notification rule.
 type NotificationRuleStore interface {
-	// UserResourceMappingService must be part of all NotificationRuleStore service,
-	// for create, search, delete.
-	UserResourceMappingService
-	// OrganizationService is needed for search filter
-	OrganizationService
-
 	// FindNotificationRuleByID returns a single notification rule by ID.
 	FindNotificationRuleByID(ctx context.Context, id ID) (NotificationRule, error)
 
diff --git a/testing/notification_rule.go b/testing/notification_rule.go
index a7226a3ffb..3001445c0c 100644
--- a/testing/notification_rule.go
+++ b/testing/notification_rule.go
@@ -346,14 +346,6 @@ func CreateNotificationRule(
 			if diff := cmp.Diff(nrs, tt.wants.notificationRules, notificationRuleCmpOptions...); diff != "" {
 				t.Errorf("notificationRules are different -got/+want\ndiff %s", diff)
 			}
-
-			urms, _, err := s.FindUserResourceMappings(ctx, urmFilter)
-			if err != nil {
-				t.Fatalf("failed to retrieve user resource mappings: %v", err)
-			}
-			if diff := cmp.Diff(urms, tt.wants.userResourceMapping, userResourceMappingCmpOptions...); diff != "" {
-				t.Errorf("user resource mappings are different -got/+want\ndiff %s", diff)
-			}
 		})
 	}
 }
@@ -2710,17 +2702,6 @@ func DeleteNotificationRule(
 			if diff := cmp.Diff(nrs, tt.wants.notificationRules, notificationRuleCmpOptions...); diff != "" {
 				t.Errorf("notification rules are different -got/+want\ndiff %s", diff)
 			}
-
-			urms, _, err := s.FindUserResourceMappings(ctx, influxdb.UserResourceMappingFilter{
-				UserID:       tt.args.userID,
-				ResourceType: influxdb.NotificationRuleResourceType,
-			})
-			if err != nil {
-				t.Fatalf("failed to retrieve user resource mappings: %v", err)
-			}
-			if diff := cmp.Diff(urms, tt.wants.userResourceMappings, userResourceMappingCmpOptions...); diff != "" {
-				t.Errorf("user resource mappings are different -got/+want\ndiff %s", diff)
-			}
 		})
 	}
 }