Merge pull request #1528 from nobodyiam/optimize-my-projects

optimize my-projects view to show projets which the user has admin permissions

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java

@@ -2,6 +2,7 @@ package com.ctrip.framework.apollo.portal.controller;
 
 
 import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.portal.entity.po.Role;
 import com.ctrip.framework.apollo.portal.service.RoleInitializationService;
 
 import com.ctrip.framework.apollo.common.entity.App;
@@ -71,7 +72,19 @@ public class AppController {
 
   @RequestMapping(value = "/by-owner", method = RequestMethod.GET)
   public List<App> findAppsByOwner(@RequestParam("owner") String owner, Pageable page) {
-    return appService.findByOwnerName(owner, page);
+    Set<String> appIds = Sets.newHashSet();
+
+    List<Role> userRoles = rolePermissionService.findUserRoles(owner);
+
+    for (Role role : userRoles) {
+      String appId = RoleUtils.extractAppIdFromMasterRoleName(role.getRoleName());
+
+      if (appId != null) {
+        appIds.add(appId);
+      }
+    }
+
+    return appService.findByAppIds(appIds, page);
   }
 
   @RequestMapping(value = "", method = RequestMethod.POST)

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/AppRepository.java

@@ -19,6 +19,8 @@ public interface AppRepository extends PagingAndSortingRepository<App, Long> {
 
   List<App> findByAppIdIn(Set<String> appIds);
 
+  List<App> findByAppIdIn(Set<String> appIds, Pageable pageable);
+
   @Modifying
   @Query("UPDATE App SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1")
   int deleteApp(String appId, String operator);

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/AppService.java

@@ -60,6 +60,10 @@ public class AppService {
     return appRepository.findByAppIdIn(appIds);
   }
 
+  public List<App> findByAppIds(Set<String> appIds, Pageable pageable) {
+    return appRepository.findByAppIdIn(appIds, pageable);
+  }
+
   public List<App> findByOwnerName(String ownerName, Pageable page) {
     return appRepository.findByOwnerName(ownerName, page);
   }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/RolePermissionService.java

@@ -4,6 +4,7 @@ import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
 import com.ctrip.framework.apollo.portal.entity.po.Permission;
 import com.ctrip.framework.apollo.portal.entity.po.Role;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -44,6 +45,11 @@ public interface RolePermissionService {
    */
   public boolean userHasPermission(String userId, String permissionType, String targetId);
 
+  /**
+   * Find the user's roles
+   */
+  public List<Role> findUserRoles(String userId);
+
   public boolean isSuperAdmin(String userId);
 
   /**

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultRolePermissionService.java

@@ -15,14 +15,19 @@ import com.ctrip.framework.apollo.portal.service.RolePermissionService;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
-
 /**
  * Created by timothy on 2017/4/26.
  */
@@ -180,6 +185,18 @@ public class DefaultRolePermissionService implements RolePermissionService {
         return false;
     }
 
+    @Override
+    public List<Role> findUserRoles(String userId) {
+        List<UserRole> userRoles = userRoleRepository.findByUserId(userId);
+        if (CollectionUtils.isEmpty(userRoles)) {
+            return Collections.emptyList();
+        }
+
+        Set<Long> roleIds = userRoles.stream().map(UserRole::getRoleId).collect(Collectors.toSet());
+
+        return Lists.newLinkedList(roleRepository.findAllById(roleIds));
+    }
+
     public boolean isSuperAdmin(String userId) {
         return portalConfig.superAdmins().contains(userId);
     }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/util/RoleUtils.java

 package com.ctrip.framework.apollo.portal.util;
 
-import com.google.common.base.Joiner;
-
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.portal.constant.RoleType;
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import java.util.Iterator;
 
 public class RoleUtils {
 
   private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).skipNulls();
+  private static final Splitter STRING_SPLITTER = Splitter.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
+      .omitEmptyStrings().trimResults();
 
   public static String buildAppMasterRoleName(String appId) {
     return STRING_JOINER.join(RoleType.MASTER, appId);
   }
 
+  public static String extractAppIdFromMasterRoleName(String masterRoleName) {
+    Iterator<String> parts = STRING_SPLITTER.split(masterRoleName).iterator();
+
+    // skip role type
+    if (parts.hasNext() && parts.next().equals(RoleType.MASTER) && parts.hasNext()) {
+      return parts.next();
+    }
+
+    return null;
+  }
+
   public static String buildAppRoleName(String appId, String roleType) {
     return STRING_JOINER.join(roleType, appId);
   }

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/util/RoleUtilsTest.java

+package com.ctrip.framework.apollo.portal.util;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class RoleUtilsTest {
+
+  @Test
+  public void testExtractAppIdFromMasterRoleName() throws Exception {
+    assertEquals("someApp", RoleUtils.extractAppIdFromMasterRoleName("Master+someApp"));
+    assertEquals("someApp", RoleUtils.extractAppIdFromMasterRoleName("Master+someApp+xx"));
+
+
+    assertNull(RoleUtils.extractAppIdFromMasterRoleName("ReleaseNamespace+app1+application"));
+  }
+}