1 files changed, 11 insertions, 15 deletions

diff --git a/plugins/org.eclipse.osee.account.admin/src/org/eclipse/osee/account/admin/ds/SubscriptionStorage.java b/plugins/org.eclipse.osee.account.admin/src/org/eclipse/osee/account/admin/ds/SubscriptionStorage.java
index 173404e4023..07dd8ee75d0 100644
--- a/plugins/org.eclipse.osee.account.admin/src/org/eclipse/osee/account/admin/ds/SubscriptionStorage.java
+++ b/plugins/org.eclipse.osee.account.admin/src/org/eclipse/osee/account/admin/ds/SubscriptionStorage.java
@@ -13,6 +13,8 @@ package org.eclipse.osee.account.admin.ds;
 import org.eclipse.osee.account.admin.Account;
 import org.eclipse.osee.account.admin.Subscription;
 import org.eclipse.osee.account.admin.SubscriptionGroup;
+import org.eclipse.osee.account.rest.model.SubscriptionGroupId;
+import org.eclipse.osee.framework.core.data.ArtifactId;
 import org.eclipse.osee.framework.jdk.core.type.ResultSet;
 
 /**
@@ -20,30 +22,24 @@ import org.eclipse.osee.framework.jdk.core.type.ResultSet;
  */
 public interface SubscriptionStorage {
 
-   ResultSet<Subscription> getSubscriptionsByAccountLocalId(long accountId);
+   ResultSet<Subscription> getSubscriptionsByAccountId(ArtifactId accountId);
 
-   Subscription getSubscription(String subscriptionUuid);
+   SubscriptionGroup getSubscriptionGroupById(SubscriptionGroupId subscriptionId);
 
-   void updateSubscription(long accountId, long groupId, boolean activate);
+   Subscription getSubscriptionByEncodedId(String encodedId);
 
-   ResultSet<SubscriptionGroup> getSubscriptionGroups();
-
-   ResultSet<SubscriptionGroup> getSubscriptionGroupByLocalId(long groupId);
-
-   ResultSet<SubscriptionGroup> getSubscriptionGroupByName(String name);
+   void updateSubscription(Subscription subscription, boolean activate);
 
-   ResultSet<SubscriptionGroup> getSubscriptionGroupByGuid(String guid);
+   ResultSet<SubscriptionGroup> getSubscriptionGroups();
 
    boolean subscriptionGroupNameExists(String groupName);
 
-   SubscriptionGroup createSubscriptionGroup(String name);
-
-   void deleteSubscriptionGroup(SubscriptionGroup group);
+   SubscriptionGroupId createSubscriptionGroup(String name);
 
-   ResultSet<Account> getSubscriptionGroupMembersByLocalId(long groupId);
+   ResultSet<Account> getMembersOfSubscriptionGroupById(SubscriptionGroupId subscriptionId);
 
-   ResultSet<Account> getSubscriptionGroupMembersByName(String name);
+   boolean deleteSubscriptionGroup(SubscriptionGroupId subscriptionId);
 
-   ResultSet<Account> getSubscriptionGroupMembersByGuid(String guid);
+   ResultSet<Account> getSubscriptionMembersById(SubscriptionGroupId subscriptionId);
 
 }