修复客户端获取decision时，将已删除的decision也查询到并返回的bug

Author: saleson

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/GrayPolicyModule.java

@@ -25,8 +25,6 @@ public interface GrayPolicyModule {
 
     List<GrayPolicy> listEnabledGrayPoliciesByNamespace(String namespace);
 
-    Page<GrayDecision> listGrayDecisionsByPolicyId(Long policyId, Pageable pageable);
-
     GrayPolicy saveGrayPolicy(GrayPolicy grayPolicy);
 
     void deleteGrayPolicy(Long policyId, String userId);
@@ -43,7 +41,7 @@ public interface GrayPolicyModule {
 
     GrayDecision getGrayDecision(Long id);
 
-    List<GrayDecision> listGrayDecisionsByPolicyId(Long policyId);
+    List<GrayDecision> listEnabledGrayDecisionsByPolicyId(Long policyId);
 
     GrayPolicyDecision newGrayPolicy(GrayPolicyDecision policyDecision);
 

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/SimpleGrayModule.java

@@ -219,7 +219,7 @@ public PolicyDefinition ofGrayPolicy(GrayPolicy grayPolicy) {
 
     @Override
     public List<DecisionDefinition> ofGrayDecisionByPolicyId(Long policyId) {
-        List<GrayDecision> grayDecisions = grayPolicyModule.listGrayDecisionsByPolicyId(policyId);
+        List<GrayDecision> grayDecisions = grayPolicyModule.listEnabledGrayDecisionsByPolicyId(policyId);
         List<DecisionDefinition> decisionDefinitions = new ArrayList<>(grayDecisions.size());
         grayDecisions.forEach(grayDecision -> {
             try {

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/module/gray/jpa/JPAGrayPolicyModule.java

@@ -59,11 +59,6 @@ public List<GrayPolicy> listEnabledGrayPoliciesByNamespace(String namespace) {
         return grayPolicyService.listEnabledGrayPoliciesByNamespace(namespace);
     }
 
-    @Override
-    public Page<GrayDecision> listGrayDecisionsByPolicyId(Long policyId, Pageable pageable) {
-        return grayDecisionService.listGrayDecisionsByPolicyId(policyId, pageable);
-    }
-
     @Transactional
     @Override
     public GrayPolicy saveGrayPolicy(GrayPolicy grayPolicy) {
@@ -145,8 +140,8 @@ public GrayDecision getGrayDecision(Long id) {
     }
 
     @Override
-    public List<GrayDecision> listGrayDecisionsByPolicyId(Long policyId) {
-        return grayDecisionService.findByPolicyId(policyId);
+    public List<GrayDecision> listEnabledGrayDecisionsByPolicyId(Long policyId) {
+        return grayDecisionService.findAllEnabledByPolicyId(policyId);
     }
 
     @Transactional

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/resources/rest/GrayDecisionResource.java

@@ -49,7 +49,7 @@ public ApiRes<List<GrayDecision>> list(@RequestParam("policyId") Long policyId)
         }
         return ApiRes.<List<GrayDecision>>builder()
                 .code(CODE_SUCCESS)
-                .data(grayPolicyModule.listGrayDecisionsByPolicyId(policyId))
+                .data(grayPolicyModule.listEnabledGrayDecisionsByPolicyId(policyId))
                 .build();
     }
 

spring-cloud-gray-server/src/main/java/cn/springcloud/gray/server/service/GrayDecisionService.java

@@ -40,8 +40,8 @@ protected ModelMapper<GrayDecision, GrayDecisionDO> getModelMapper() {
         return grayDecisionMapper;
     }
 
-    public List<GrayDecision> findByPolicyId(Long policyId) {
-        return grayDecisionMapper.dos2models(repository.findByPolicyId(policyId));
+    public List<GrayDecision> findAllEnabledByPolicyId(Long policyId) {
+        return grayDecisionMapper.dos2models(repository.findByPolicyIdAndDelFlag(policyId, false));
 
     }