[COLAB-2518] Re-order method parameters

CCI-MIT · Nov 13, 2018 · 848f62b · 848f62b
1 parent d40031c
commit 848f62b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...lients/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClient.java b/...lients/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClient.java
@@ -180,10 +180,10 @@ public List<ActivitySubscription> getActivitySubscriptionsForMember(Long userId)
         return getActivitySubscriptions(null, null, userId);
     }
 
-    public List<ActivityEntry> getActivitiesByCategoryId(Long categoryId, String activityCategory) {
+    public List<ActivityEntry> getActivitiesByCategoryId(String activityCategory, Long categoryId) {
         return activityEntryResource.list()
-                .queryParam("categoryId", categoryId)
                 .queryParam("activityCategory", activityCategory)
+                .queryParam("categoryId", categoryId)
                 .execute();
     }
 

diff --git a/...ts/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClientUtil.java b/...ts/activities-client/src/main/java/org/xcolab/client/activities/ActivitiesClientUtil.java
@@ -100,8 +100,8 @@ public static List<ActivitySubscription> getActivitySubscriptions(ActivityCatego
                 receiverId);
     }
 
-    public static List<ActivityEntry> getActivitiesByCategoryId(Long categoryId, String activityCategory) {
-        return activitiesClient.getActivitiesByCategoryId(categoryId, activityCategory);
+    public static List<ActivityEntry> getActivitiesByCategoryId(String activityCategory, Long categoryId) {
+        return activitiesClient.getActivitiesByCategoryId(activityCategory, categoryId);
     }
 
     public static List<ActivitySubscription> getActivitySubscriptionsForMember(Long userId) {

diff --git a/view/src/main/java/org/xcolab/view/pages/profile/wrappers/UserProfileWrapper.java b/view/src/main/java/org/xcolab/view/pages/profile/wrappers/UserProfileWrapper.java
@@ -257,7 +257,7 @@ public List<UserActivityWrapper> getSubscribedActivities() {
             for (ActivitySubscriptionWrapper subscription: userSubscriptions.getSubscriptions()) {
                 Long categoryId = subscription.getSubscription().getCategoryId();
                 String activityCategory = subscription.getSubscription().getActivityCategory();
-                List<ActivityEntry> activities = ActivitiesClientUtil.getActivitiesByCategoryId(categoryId, activityCategory);
+                List<ActivityEntry> activities = ActivitiesClientUtil.getActivitiesByCategoryId(activityCategory, categoryId);
                 for (ActivityEntry activity: activities) {
                     UserActivityWrapper a = new UserActivityWrapper(activity, activityEntryHelper);
                     if (StringUtils.isNotBlank(a.getBody())) {