Feat: Add targeting version history (#18)

Feat: Add targeting version history

Author: jianggang

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

@@ -52,6 +52,14 @@ public EnvironmentResponse update(@PathVariable("projectKey") String projectKey,
         return environmentService.update(projectKey, environmentKey, updateRequest);
     }
 
+    @GetMapping("/{environmentKey}")
+    @GetApiResponse
+    @Operation(summary = "Query environment", description = "Query a environment.")
+    public EnvironmentResponse query(@PathVariable("projectKey") String projectKey,
+                                     @PathVariable("environmentKey") String environmentKey) {
+        return environmentService.query(projectKey, environmentKey);
+    }
+
     @GetMapping("/exists")
     @GetApiResponse
     @Operation(summary = "Check environment exist", description = "Check environment exist")
@@ -62,6 +70,4 @@ public BaseResponse exists(@PathVariable("projectKey") String projectKey,
         return new BaseResponse(ResponseCodeEnum.SUCCESS);
     }
 
-
-
 }

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

@@ -6,6 +6,7 @@
 import com.featureprobe.api.base.doc.GetApiResponse;
 import com.featureprobe.api.base.doc.ProjectKeyParameter;
 import com.featureprobe.api.base.doc.ToggleKeyParameter;
+import com.featureprobe.api.dto.AccessStatusResponse;
 import com.featureprobe.api.dto.MetricResponse;
 import com.featureprobe.api.service.MetricService;
 import com.featureprobe.api.validate.ResourceExistsValidate;
@@ -22,7 +23,7 @@
 @Slf4j
 @AllArgsConstructor
 @RestController
-@RequestMapping("/projects/{projectKey}/environments/{environmentKey}/toggles/{toggleKey}/metrics")
+@RequestMapping("/projects/{projectKey}/environments/{environmentKey}/toggles/{toggleKey}")
 @DefaultApiResponses
 @ProjectKeyParameter
 @ToggleKeyParameter
@@ -34,7 +35,7 @@ public class MetricController {
     private MetricService metricService;
 
     @GetApiResponse
-    @GetMapping
+    @GetMapping("/metrics")
     @Operation(summary = "Query Metrics", description = "")
     public MetricResponse query(@PathVariable("projectKey") String projectKey,
                                 @PathVariable("environmentKey") String environmentKey,
@@ -44,4 +45,14 @@ public MetricResponse query(@PathVariable("projectKey") String projectKey,
 
         return metricService.query(projectKey, environmentKey, toggleKey, metricType, lastHours);
     }
+
+    @GetApiResponse
+    @GetMapping("/access")
+    @Operation(summary = "Query access status", description = "")
+    public AccessStatusResponse query(@PathVariable("projectKey") String projectKey,
+                                      @PathVariable("environmentKey") String environmentKey,
+                                      @PathVariable("toggleKey") String toggleKey) {
+        return metricService.isAccess(projectKey, environmentKey, toggleKey);
+    }
+
 }

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

@@ -6,6 +6,7 @@
 import com.featureprobe.api.base.doc.PatchApiResponse;
 import com.featureprobe.api.base.doc.ProjectKeyParameter;
 import com.featureprobe.api.base.doc.ToggleKeyParameter;
+import com.featureprobe.api.dto.AfterTargetingVersionResponse;
 import com.featureprobe.api.dto.TargetingRequest;
 import com.featureprobe.api.dto.TargetingResponse;
 import com.featureprobe.api.dto.TargetingVersionRequest;
@@ -67,7 +68,19 @@ public TargetingResponse query(
     public Page<TargetingVersionResponse> versions(
             @PathVariable("projectKey") String projectKey,
             @PathVariable("environmentKey") String environmentKey,
+            @PathVariable("toggleKey") String toggleKey,
             TargetingVersionRequest targetingVersionRequest) {
-        return targetingService.queryVersions(projectKey, environmentKey, targetingVersionRequest);
+        return targetingService.queryVersions(projectKey, environmentKey, toggleKey, targetingVersionRequest);
+    }
+
+    @GetApiResponse
+    @GetMapping("/versions/{version}")
+    @Operation(summary = "Get all targeting versions larger than the version。",
+            description = "Get all targeting versions larger than the version.")
+    public AfterTargetingVersionResponse allAfterVersions(@PathVariable("projectKey") String projectKey,
+                                                          @PathVariable("environmentKey") String environmentKey,
+                                                          @PathVariable("toggleKey") String toggleKey,
+                                                          @PathVariable("version") Long version) {
+        return targetingService.queryAfterVersion(projectKey, environmentKey, toggleKey, version);
     }
 }

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

@@ -0,0 +1,12 @@
+package com.featureprobe.api.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@AllArgsConstructor
+@Data
+public class AccessStatusResponse {
+
+    private Boolean isAccess;
+
+}

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

@@ -0,0 +1,17 @@
+package com.featureprobe.api.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AfterTargetingVersionResponse {
+
+    private Long total;
+
+    private List<TargetingVersionResponse> versions;
+}

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

@@ -11,6 +11,7 @@
 @AllArgsConstructor
 public class MetricResponse {
 
+    private Boolean isAccess;
     private List<AccessEventPoint> metrics;
     private List<VariationAccessCounter> summary;
 

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

@@ -12,6 +12,8 @@ public class TargetingResponse {
 
     private TargetingContent content;
 
+    private Long version;
+
     private Date modifiedTime;
 
     private String modifiedBy;

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

@@ -12,10 +12,14 @@ public class TargetingVersionResponse {
 
     private String environmentKey;
 
+    private String toggleKey;
+
     private String comment;
 
     private TargetingContent content;
 
+    private Boolean disabled;
+
     private Long version;
 
     private Date createdTime;

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

@@ -26,19 +26,21 @@
 @ToString(callSuper = true)
 public class TargetingVersion extends AbstractAuditEntity {
 
-    @Column(name = "targeting_id")
-    private Long targetingId;
-
     @Column(name = "project_key")
     private String projectKey;
 
     @Column(name = "environment_key")
     private String environmentKey;
 
+    @Column(name = "toggle_key")
+    private String toggleKey;
+
     private String comment;
 
     private String content;
 
+    private Boolean disabled;
+
     private Long version;
 
 }

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

@@ -16,4 +16,6 @@ List<Event> findBySdkKeyAndToggleKeyAndStartDateGreaterThanEqualAndEndDateLessTh
                                                                                             Date startDate,
                                                                                             Date endDate);
 
+    boolean existsBySdkKeyAndToggleKey(String sdkKey, String toggleKey);
+
 }