feat: refactor approval settings

Author: jianggang

src/main/java/com/featureprobe/api/dto/ApprovalSettings.java

@@ -9,8 +9,12 @@ public class ApprovalSettings {
 
     private String environmentKey;
 
+    private String environmentName;
+
     private Boolean enable;
 
     private List<String> reviewers;
 
+    private boolean locked;
+
 }

src/main/java/com/featureprobe/api/mapper/EnvironmentMapper.java

@@ -25,6 +25,7 @@ public interface EnvironmentMapper {
     Environment requestToEntity(EnvironmentCreateRequest createRequest);
 
     @Mapping(target = "environmentKey", source = "key")
+    @Mapping(target = "environmentName", source = "name")
     @Mapping(target = "enable", source = "enableApproval")
     @Mapping(target = "reviewers", expression = "java(toReviewerList(environment.getReviewers()))")
     ApprovalSettings entityToApprovalSettings(Environment environment);

src/main/java/com/featureprobe/api/repository/TargetingSketchRepository.java

@@ -5,22 +5,21 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
-
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 @Repository
 public interface TargetingSketchRepository extends JpaRepository<TargetingSketch, Long>,
         JpaSpecificationExecutor<TargetingSketch> {
 
-    Optional<TargetingSketch> findByApprovalId(Long approvalId);
-
     List<TargetingSketch> findByApprovalIdIn(Set<Long> approvalIds);
 
     List<TargetingSketch> findByProjectKeyAndEnvironmentKeyAndStatusAndToggleKeyIn(String projectKey,
                                                                                    String environmentKey,
                                                                                    SketchStatusEnum status,
                                                                                    List<String> toggleKeys);
+
+    boolean existsByProjectKeyAndEnvironmentKeyAndStatus(String projectKey, String environmentKey,
+                                                         SketchStatusEnum status);
 
 }

src/main/java/com/featureprobe/api/service/MetricService.java

@@ -54,7 +54,7 @@
 @AllArgsConstructor
 public class MetricService {
 
-    private static final ExecutorService taskExecutor = new ThreadPoolExecutor(12, 50,
+    private static final ExecutorService taskExecutor = new ThreadPoolExecutor(3, 50,
             30, TimeUnit.SECONDS, new ArrayBlockingQueue<>(1000));
 
     private EnvironmentRepository environmentRepository;
@@ -89,11 +89,8 @@ public MetricResponse query(String projectKey, String environmentKey, String tog
                 queryLastHours);
         List<AccessEventPoint> aggregatedAccessEventPoints = aggregatePointByMetricType(variationVersionMap,
                 accessEventPoints, metricType);
-
         List<VariationAccessCounter> accessCounters = summaryAccessEvents(aggregatedAccessEventPoints);
-        Targeting latestTargeting = targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKey(projectKey,
-                environmentKey, toggleKey).get();
-        appendLatestVariations(accessCounters, latestTargeting, metricType);
+        appendLatestVariations(accessCounters, targeting, metricType);
         boolean isAccess = eventRepository.existsBySdkKeyAndToggleKey(serverSdkKey, toggleKey);
         return new MetricResponse(isAccess, accessEventPoints, sortAccessCounters(accessCounters));
     }

src/main/java/com/featureprobe/api/service/ProjectService.java

@@ -2,6 +2,7 @@
 
 import com.featureprobe.api.auth.TokenHelper;
 import com.featureprobe.api.base.enums.ResourceType;
+import com.featureprobe.api.base.enums.SketchStatusEnum;
 import com.featureprobe.api.base.enums.ValidateTypeEnum;
 import com.featureprobe.api.base.exception.ResourceConflictException;
 import com.featureprobe.api.base.exception.ResourceNotFoundException;
@@ -18,6 +19,7 @@
 import com.featureprobe.api.mapper.ProjectMapper;
 import com.featureprobe.api.repository.EnvironmentRepository;
 import com.featureprobe.api.repository.ProjectRepository;
+import com.featureprobe.api.repository.TargetingSketchRepository;
 import com.featureprobe.api.util.SdkKeyGenerateUtil;
 import com.featureprobe.sdk.server.FPUser;
 import com.featureprobe.sdk.server.FeatureProbe;
@@ -45,6 +47,8 @@ public class ProjectService {
 
     private EnvironmentRepository environmentRepository;
 
+    private TargetingSketchRepository targetingSketchRepository;
+
     private FeatureProbe featureProbe;
 
     @PersistenceContext
@@ -90,8 +94,14 @@ public void createPreference(String projectKey, PreferenceCreateRequest createRe
 
     public List<ApprovalSettings> approvalSettingsList(String projectKey) {
         List<Environment> environments = environmentRepository.findAllByProjectKey(projectKey);
-        return environments.stream().map(environment ->
+        List<ApprovalSettings> approvalSettingsList = environments.stream().map(environment ->
                 EnvironmentMapper.INSTANCE.entityToApprovalSettings(environment)).collect(Collectors.toList());
+        for (ApprovalSettings approvalSettings : approvalSettingsList) {
+            boolean locked = targetingSketchRepository.existsByProjectKeyAndEnvironmentKeyAndStatus(projectKey,
+                    approvalSettings.getEnvironmentKey(), SketchStatusEnum.PENDING);
+            approvalSettings.setLocked(locked);
+        }
+        return approvalSettingsList;
     }
 
     private void archiveAllEnvironments(List<Environment> environments) {

src/test/groovy/com/featureprobe/api/service/GuestServiceSpec.groovy

@@ -9,9 +9,9 @@ import com.featureprobe.api.entity.Project
 import com.featureprobe.api.repository.EnvironmentRepository
 import com.featureprobe.api.repository.MemberRepository
 import com.featureprobe.api.repository.ProjectRepository
+import com.featureprobe.api.repository.TargetingSketchRepository
 import com.featureprobe.sdk.server.FeatureProbe
 import org.hibernate.internal.SessionImpl
-import org.hibernate.query.internal.QueryImpl
 import org.hibernate.query.spi.NativeQueryImplementor
 import spock.lang.Specification
 
@@ -28,6 +28,8 @@ class GuestServiceSpec extends Specification{
 
     EnvironmentRepository environmentRepository
 
+    TargetingSketchRepository targetingSketchRepository
+
     EntityManager entityManager
 
     ProjectService projectService
@@ -41,8 +43,9 @@ class GuestServiceSpec extends Specification{
         entityManager = Mock(SessionImpl)
         projectRepository = Mock(ProjectRepository)
         environmentRepository = Mock(EnvironmentRepository)
+        targetingSketchRepository = Mock(TargetingSketchRepository)
         FeatureProbe featureProbe = new FeatureProbe("_")
-        projectService = new ProjectService(projectRepository, environmentRepository, featureProbe, entityManager)
+        projectService = new ProjectService(projectRepository, environmentRepository, targetingSketchRepository, featureProbe, entityManager)
         guestService = new GuestService(appConfig, memberRepository, entityManager, projectService)
     }
 

src/test/groovy/com/featureprobe/api/service/MetricServiceSpec.groovy

@@ -70,12 +70,11 @@ class MetricServiceSpec extends Specification {
 
         then:
         1 * environmentRepository.findByProjectKeyAndKey(projectKey, envKey) >> Optional.of(new Environment(serverSdkKey: serverSdkKey))
-        1 * targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKey(projectKey, envKey, toggleKey) >> Optional.of(new Targeting(id: 1))
+        1 * targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKey(projectKey, envKey, toggleKey) >> Optional.of(new Targeting(id: 1, content: "{}"))
         2 * metricsCacheRepository.findBySdkKeyAndToggleKeyAndStartDateAndEndDateAndType(serverSdkKey, toggleKey, _, _, MetricsCacheTypeEnum.METRICS) >> Optional.empty()
         3 * eventRepository.findBySdkKeyAndToggleKeyAndStartDateGreaterThanEqualAndEndDateLessThanEqual(serverSdkKey, toggleKey,
                 _, _) >> []
         1 * variationHistoryRepository.findByProjectKeyAndEnvironmentKeyAndToggleKey(projectKey, envKey, toggleKey) >> []
-        1 * targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKey(projectKey, envKey, toggleKey) >> Optional.of(new Targeting(content: "{}"))
         1 * eventRepository.existsBySdkKeyAndToggleKey(serverSdkKey, toggleKey) >> true
         0 == response.summary.size()
         response.isAccess

src/test/groovy/com/featureprobe/api/service/ProjectServiceSpec.groovy

@@ -11,6 +11,7 @@ import com.featureprobe.api.entity.Environment
 import com.featureprobe.api.entity.Project
 import com.featureprobe.api.repository.EnvironmentRepository
 import com.featureprobe.api.repository.ProjectRepository
+import com.featureprobe.api.repository.TargetingSketchRepository
 import com.featureprobe.sdk.server.FeatureProbe
 import org.hibernate.internal.SessionImpl
 import org.springframework.security.core.context.SecurityContextHolder
@@ -29,6 +30,8 @@ class ProjectServiceSpec extends Specification {
 
     EnvironmentRepository environmentRepository
 
+    TargetingSketchRepository targetingSketchRepository
+
     ProjectQueryRequest queryRequest
 
     ProjectCreateRequest createRequest
@@ -49,9 +52,10 @@ class ProjectServiceSpec extends Specification {
         keyword = "feature"
         projectRepository = Mock(ProjectRepository)
         environmentRepository = Mock(EnvironmentRepository)
+        targetingSketchRepository = Mock(TargetingSketchRepository)
         entityManager = Mock(SessionImpl)
         featureProbe = new FeatureProbe("_")
-        projectService = new ProjectService(projectRepository, environmentRepository, featureProbe, entityManager)
+        projectService = new ProjectService(projectRepository, environmentRepository, targetingSketchRepository, featureProbe, entityManager)
         queryRequest = new ProjectQueryRequest(keyword: keyword)
         createRequest = new ProjectCreateRequest(name: projectName, key: projectKey)
         projectUpdateRequest = new ProjectUpdateRequest(name: "project_test_update", description: projectKey, archived: true)
@@ -155,6 +159,7 @@ class ProjectServiceSpec extends Specification {
         def list = projectService.approvalSettingsList(projectKey)
         then:
         1 * environmentRepository.findAllByProjectKey(projectKey) >> [new Environment(key: "dev", enableApproval: true, reviewers: "[\"Admin\"]")]
+        1 * targetingSketchRepository.existsByProjectKeyAndEnvironmentKeyAndStatus(_, _, _) >> true
         1 == list.size()
     }
 

src/test/groovy/com/featureprobe/api/service/UserPasswordAuthenticationSpec.groovy

@@ -4,21 +4,20 @@ import com.featureprobe.api.auth.UserPasswordAuthenticationProvider
 import com.featureprobe.api.auth.UserPasswordAuthenticationToken
 import com.featureprobe.api.base.enums.RoleEnum
 import com.featureprobe.api.entity.Member
-import com.featureprobe.api.repository.MemberRepository
 import com.featureprobe.api.repository.OperationLogRepository
 import spock.lang.Specification
 
 class UserPasswordAuthenticationSpec extends Specification{
 
-    def MemberService memberService
+    MemberService memberService
 
     OperationLogService operationLogService
 
     OperationLogRepository operationLogRepository
 
-    def UserPasswordAuthenticationProvider userPasswordAuthenticationProvider
+    UserPasswordAuthenticationProvider userPasswordAuthenticationProvider
 
-    def UserPasswordAuthenticationToken token
+    UserPasswordAuthenticationToken token
 
     def setup() {
         this.memberService = Mock(MemberService)