feat: optimize approval & refactor toggle list (#32)

feat: optimize approval & refactor toggle list

Author: jianggang

src/main/java/com/featureprobe/api/base/enums/MetricsCacheTypeEnum.java

@@ -0,0 +1,5 @@
+package com.featureprobe.api.base.enums;
+
+public enum MetricsCacheTypeEnum {
+    METRICS, EVALUATION
+}

src/main/java/com/featureprobe/api/base/enums/ToggleReleaseStatusEnum.java

@@ -0,0 +1,5 @@
+package com.featureprobe.api.base.enums;
+
+public enum ToggleReleaseStatusEnum {
+    PENDING_APPROVAL, PENDING_RELEASE, REJECT, RELEASE
+}

src/main/java/com/featureprobe/api/controller/TargetingController.java

@@ -10,6 +10,7 @@
 import com.featureprobe.api.base.enums.ResponseCodeEnum;
 import com.featureprobe.api.dto.AfterTargetingVersionResponse;
 import com.featureprobe.api.dto.BaseResponse;
+import com.featureprobe.api.dto.CancelSketchRequest;
 import com.featureprobe.api.dto.TargetingDiffResponse;
 import com.featureprobe.api.dto.TargetingRequest;
 import com.featureprobe.api.dto.TargetingResponse;
@@ -69,9 +70,10 @@ public TargetingResponse publishSketch(@PathVariable("projectKey") String projec
     @CreateApiResponse
     @Operation(summary = "Cancel targeting sketch", description = "Cancel targeting sketch.")
     public BaseResponse cancelSketch(@PathVariable("projectKey") String projectKey,
-                                           @PathVariable("environmentKey") String environmentKey,
-                                           @PathVariable("toggleKey") String toggleKey) {
-        targetingService.cancelSketch(projectKey, environmentKey, toggleKey);
+                                     @PathVariable("environmentKey") String environmentKey,
+                                     @PathVariable("toggleKey") String toggleKey,
+                                     @RequestBody @Validated CancelSketchRequest cancelSketchRequest) {
+        targetingService.cancelSketch(projectKey, environmentKey, toggleKey, cancelSketchRequest);
         return new BaseResponse(ResponseCodeEnum.SUCCESS);
     }
 

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

@@ -1,17 +1,18 @@
 package com.featureprobe.api.dto;
 
+import com.featureprobe.api.base.enums.ApprovalStatusEnum;
 import com.featureprobe.api.base.enums.ApprovalTypeEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class ApprovalRecordQueryRequest extends PaginationRequest{
 
     private String keyword;
 
-    @NotNull
-    private String status;
+    private List<ApprovalStatusEnum> status;
 
     @NotNull
     private ApprovalTypeEnum type;

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

@@ -37,10 +37,12 @@ public class ApprovalRecordResponse {
 
     private String comment;
 
-    private Date approvalTime;
+    private Date createdTime;
 
-    private Date sketchTime;
+    private Date modifiedTime;
 
-    private Date cancelTime;
+    private boolean canceled;
+
+    private String cancelReason;
 
 }

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

@@ -0,0 +1,10 @@
+package com.featureprobe.api.dto;
+
+import lombok.Data;
+
+@Data
+public class CancelSketchRequest {
+
+    private String comment;
+
+}

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

@@ -9,6 +9,8 @@ public class EnvironmentResponse {
 
     private String key;
 
+    private boolean enableApproval;
+
     private String serverSdkKey;
     private String clientSdkKey;
 

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

@@ -1,5 +1,6 @@
 package com.featureprobe.api.dto;
 
+import com.featureprobe.api.base.enums.ToggleReleaseStatusEnum;
 import lombok.Data;
 import java.util.Date;
 import java.util.Set;
@@ -30,4 +31,6 @@ public class ToggleItemResponse {
     private String lockedBy;
 
     private Date lockedTime;
+
+    private ToggleReleaseStatusEnum releaseStatus;
 }

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

@@ -1,9 +1,8 @@
 package com.featureprobe.api.dto;
 
+import com.featureprobe.api.base.enums.ToggleReleaseStatusEnum;
 import com.featureprobe.api.base.enums.VisitFilter;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @Data
@@ -21,4 +20,6 @@ public class ToggleSearchRequest extends PaginationRequest {
 
     private boolean archived;
 
+    private List<ToggleReleaseStatusEnum> releaseStatusList;
+
 }

src/main/java/com/featureprobe/api/entity/ApprovalRecord.java

@@ -66,6 +66,12 @@ public class ApprovalRecord  extends AbstractAuditEntity implements TenantSuppor
     @Column(columnDefinition = "TEXT")
     private String comment;
 
+    public String environmentUniqueKey() {
+        return projectKey + "&" + environmentKey;
+    }
 
+    public String toggleUniqueKey() {
+        return projectKey + "&" + toggleKey;
+    }
 
 }