修正移除授权的逻辑

Author: little3201

hypervisor/src/main/java/io/leafage/basic/hypervisor/controller/GroupController.java

@@ -212,4 +212,22 @@ public ResponseEntity<Mono<GroupPrivileges>> relation(@PathVariable Long id, @Pa
         }
         return ResponseEntity.ok(mono);
     }
+
+    /**
+     * 关联权限
+     *
+     * @param id 组id
+     * @return 查询到的数据集，异常时返回204状态码
+     */
+    @DeleteMapping("/{id}/privileges/{privilegeId}")
+    public ResponseEntity<Mono<Void>> removeRelation(@PathVariable Long id, @PathVariable Long privilegeId, Set<String> actions) {
+        Mono<Void> voidMono;
+        try {
+            voidMono = groupPrivilegesService.removeRelation(id, privilegeId, actions);
+        } catch (Exception e) {
+            logger.error("Remove group privileges occurred an error: ", e);
+            return ResponseEntity.noContent().build();
+        }
+        return ResponseEntity.ok(voidMono);
+    }
 }

hypervisor/src/main/java/io/leafage/basic/hypervisor/repository/GroupAuthoritiesRepository.java

@@ -20,7 +20,7 @@
 import io.leafage.basic.hypervisor.domain.GroupAuthorities;
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * group authorities repository
@@ -31,11 +31,11 @@
 public interface GroupAuthoritiesRepository extends R2dbcRepository<GroupAuthorities, Long> {
 
     /**
-     * 根据group查member
+     * 根据group删除
      *
-     * @param groupId group主键
-     * @return 关联数据集
+     * @param groupId   group 主键
+     * @param authority 权限
      */
-    Flux<GroupAuthorities> findByGroupId(Long groupId);
+    Mono<Void> deleteByGroupIdAndAuthority(Long groupId, String authority);
 
 }

hypervisor/src/main/java/io/leafage/basic/hypervisor/repository/GroupPrivilegesRepository.java

@@ -21,6 +21,7 @@
 import org.springframework.data.r2dbc.repository.R2dbcRepository;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * group privileges repository
@@ -38,6 +39,15 @@ public interface GroupPrivilegesRepository extends R2dbcRepository<GroupPrivileg
      */
     Flux<GroupPrivileges> findByGroupId(Long groupId);
 
+    /**
+     * 根据group和privilege查
+     *
+     * @param groupId     group主键
+     * @param privilegeId privilege主键
+     * @return 关联数据集
+     */
+    Mono<GroupPrivileges> findByGroupIdAndPrivilegeId(Long groupId, Long privilegeId);
+
     /**
      * 根据privilege查
      *

hypervisor/src/main/java/io/leafage/basic/hypervisor/service/GroupPrivilegesService.java

@@ -47,12 +47,22 @@ public interface GroupPrivilegesService {
     Mono<List<GroupPrivileges>> groups(Long privilegeId);
 
     /**
-     * group-privileges关系
+     * group-privileges关联
      *
      * @param groupId     group 主键
      * @param privilegeId privilege 主键
      * @param actions     按钮
      * @return 数据集
      */
     Mono<GroupPrivileges> relation(Long groupId, Long privilegeId, Set<String> actions);
+
+    /**
+     * 移除group-privileges关系
+     *
+     * @param groupId     group 主键
+     * @param privilegeId privilege 主键
+     * @param actions     按钮
+     * @return 数据集
+     */
+    Mono<Void> removeRelation(Long groupId, Long privilegeId, Set<String> actions);
 }

hypervisor/src/main/java/io/leafage/basic/hypervisor/service/impl/GroupPrivilegesServiceImpl.java

@@ -25,6 +25,7 @@
 import io.leafage.basic.hypervisor.service.GroupPrivilegesService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
@@ -104,4 +105,22 @@ public Mono<GroupPrivileges> relation(Long groupId, Long privilegeId, Set<String
                             .then(groupPrivilegesRepository.save(groupPrivileges));
                 });
     }
+
+    @Override
+    public Mono<Void> removeRelation(Long groupId, Long privilegeId, Set<String> actions) {
+        Assert.notNull(groupId, "groupId must not be null.");
+        Assert.notNull(privilegeId, "privilegeId must not be null.");
+
+        return groupPrivilegesRepository.findByGroupIdAndPrivilegeId(groupId, privilegeId)
+                .flatMap(groupPrivileges -> {
+                    // 删除 GroupAuthorities
+                    if (CollectionUtils.isEmpty(actions) || groupPrivileges.getActions().containsAll(actions)) {
+                        return groupPrivilegesRepository.deleteById(groupPrivileges.getId());
+                    }
+                    return privilegeRepository.findById(privilegeId).map(privilege -> actions.stream().map(action ->
+                                    groupAuthoritiesRepository.deleteByGroupIdAndAuthority(groupId, privilege.getName() + ":" + action)))
+                            .then(groupPrivilegesRepository.delete(groupPrivileges));
+
+                });
+    }
 }