feat: targeting version (#10)

* feat: targeting version

* feat: targeting version

* feat: targeting version

* feat: targeting version

Co-authored-by: jianggang <jianggang@didiglobal.com>

Author: jianggang

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

@@ -8,12 +8,15 @@
 import com.featureprobe.api.base.doc.ToggleKeyParameter;
 import com.featureprobe.api.dto.TargetingRequest;
 import com.featureprobe.api.dto.TargetingResponse;
+import com.featureprobe.api.dto.TargetingVersionRequest;
+import com.featureprobe.api.dto.TargetingVersionResponse;
 import com.featureprobe.api.service.TargetingService;
 import com.featureprobe.api.validate.ResourceExistsValidate;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -58,5 +61,13 @@ public TargetingResponse query(
         return targetingService.queryByKey(projectKey, environmentKey, toggleKey);
     }
 
-
+    @GetApiResponse
+    @GetMapping("/versions")
+    @Operation(summary = "Get targeting versions", description = "Get targeting version history.")
+    public Page<TargetingVersionResponse> versions(
+            @PathVariable("projectKey") String projectKey,
+            @PathVariable("environmentKey") String environmentKey,
+            TargetingVersionRequest targetingVersionRequest) {
+        return targetingService.queryVersions(projectKey, environmentKey, targetingVersionRequest);
+    }
 }

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

@@ -6,4 +6,6 @@
 public class SegmentSearchRequest extends PaginationRequest {
 
     private String keyword;
+
+    private Boolean includeDeleted = false;
 }

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

@@ -3,10 +3,14 @@
 import com.featureprobe.api.model.TargetingContent;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class TargetingRequest {
 
     private TargetingContent content;
 
+    private String comment;
+
     private Boolean disabled;
 }

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

@@ -0,0 +1,7 @@
+package com.featureprobe.api.dto;
+
+import lombok.Data;
+
+@Data
+public class TargetingVersionRequest extends PaginationRequest{
+}

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

@@ -0,0 +1,24 @@
+package com.featureprobe.api.dto;
+
+import com.featureprobe.api.model.TargetingContent;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TargetingVersionResponse {
+
+    private String projectKey;
+
+    private String environmentKey;
+
+    private String comment;
+
+    private TargetingContent content;
+
+    private Long version;
+
+    private Date createdTime;
+
+    private String createdBy;
+}

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

@@ -32,6 +32,9 @@ public class Segment extends AbstractAuditEntity {
     @Column(name = "[key]")
     private String key;
 
+    @Column(name = "unique_Key")
+    private String uniqueKey;
+
     private String description;
 
     @Column(name = "project_key")

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

@@ -0,0 +1,44 @@
+package com.featureprobe.api.entity;
+
+import com.featureprobe.api.base.entity.AbstractAuditEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@Builder
+@Entity
+@Table(name = "targeting_version")
+@Where(clause = "deleted = 0")
+@DynamicInsert
+@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;
+
+    private String comment;
+
+    private String content;
+
+    private Long version;
+
+}

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

@@ -0,0 +1,27 @@
+package com.featureprobe.api.mapper;
+
+import com.featureprobe.api.dto.TargetingVersionResponse;
+import com.featureprobe.api.entity.TargetingVersion;
+import com.featureprobe.api.model.TargetingContent;
+import org.apache.commons.lang3.StringUtils;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface TargetingVersionMapper {
+
+    TargetingVersionMapper INSTANCE = Mappers.getMapper(TargetingVersionMapper.class);
+
+    @Mapping(target = "content",
+            expression = "java(toTargetingContent(targetingVersion.getContent()))")
+    TargetingVersionResponse entityToResponse(TargetingVersion targetingVersion);
+
+    default TargetingContent toTargetingContent(String content) {
+        if (StringUtils.isNotBlank(content)) {
+            return JsonMapper.toObject(content, TargetingContent.class);
+        }
+        return null;
+    }
+
+}

src/main/java/com/featureprobe/api/model/ServerSegmentBuilder.java

@@ -22,8 +22,8 @@ public ServerSegmentBuilder builder() {
         return this;
     }
 
-    public ServerSegmentBuilder uniqueId(String projectKey, String segmentKey) {
-        this.segment.setUniqueId(StringUtils.join(projectKey, '$', segmentKey));
+    public ServerSegmentBuilder uniqueId(String uniqueId) {
+        this.segment.setUniqueId(uniqueId);
         return this;
     }
 

src/main/java/com/featureprobe/api/model/ServerToggleBuilder.java

@@ -1,14 +1,15 @@
 package com.featureprobe.api.model;
 
 import com.featureprobe.api.base.exception.ServerToggleBuildException;
+import com.featureprobe.api.entity.Segment;
 import com.featureprobe.api.mapper.JsonMapper;
+import com.featureprobe.sdk.server.model.Condition;
 import com.featureprobe.sdk.server.model.ConditionType;
 import com.featureprobe.sdk.server.model.Rule;
 import com.featureprobe.sdk.server.model.Toggle;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -21,9 +22,11 @@ public class ServerToggleBuilder {
     private Toggle toggle;
     private Variation.ValueConverter variationValueConverter;
     private TargetingContent targetingContent;
+    private Map<String, Segment> segments;
 
     private static Map<String, Variation.ValueConverter<?>> converters = Maps.newHashMap();
 
+
     static {
         converters.put("string", value -> value);
         converters.put("boolean", value -> Boolean.valueOf(value));
@@ -62,6 +65,11 @@ public ServerToggleBuilder rules(String rules) {
         return this;
     }
 
+    public ServerToggleBuilder segments(Map<String, Segment> segments) {
+        this.segments = segments;
+        return this;
+    }
+
     public ServerToggleBuilder returnType(String returnType) {
         this.variationValueConverter = getReturnTypeConverter(returnType);
         return this;
@@ -74,12 +82,11 @@ private Variation.ValueConverter<?> getReturnTypeConverter(String type) {
         throw new ServerToggleBuildException("return type is unknown:" + type);
     }
 
-    public Toggle build(String projectKey) {
+    public Toggle build() {
         this.setDisabledServe();
         this.setDefaultServe();
         this.setVariations();
-        this.setRules(projectKey);
-
+        this.setRules();
         return toggle;
     }
 
@@ -113,7 +120,7 @@ private void setVariations() {
         toggle.setVariations(variations);
     }
 
-    private void setRules(String projectKey) {
+    private void setRules() {
         if (CollectionUtils.isEmpty(targetingContent.getRules())) {
             toggle.setRules(Collections.emptyList());
             return;
@@ -122,10 +129,14 @@ private void setRules(String projectKey) {
                 rule.toRule()).collect(Collectors.toList());
         rules.forEach(rule -> rule.getConditions().forEach(condition -> {
             if (condition.getType() != ConditionType.SEGMENT) return;
-            condition.setObjects(condition.getObjects().stream().map(segmentKey ->
-                    StringUtils.join(projectKey, '$', segmentKey)).collect(Collectors.toList()));
+            replaceSegmentKeyToUniqueKey(condition);
         }));
         toggle.setRules(rules);
     }
 
+    private void replaceSegmentKeyToUniqueKey(Condition condition) {
+        condition.setObjects(condition.getObjects().stream().map(segmentKey ->
+                segments.get(segmentKey).getUniqueKey()).collect(Collectors.toList()));
+    }
+
 }