Merge pull request #14 from FeatureProbe/metric_feature

feat: Add variation history for metric

Author: jianggang

src/main/java/com/featureprobe/api/base/constants/MetricType.java

@@ -0,0 +1,12 @@
+package com.featureprobe.api.base.constants;
+
+public enum MetricType {
+
+    VALUE, NAME;
+    
+    
+    public boolean isNameType() {
+        return this == MetricType.NAME;
+        
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.featureprobe.api.controller;
 
+import com.featureprobe.api.base.constants.MetricType;
 import com.featureprobe.api.base.doc.DefaultApiResponses;
 import com.featureprobe.api.base.doc.EnvironmentKeyParameter;
 import com.featureprobe.api.base.doc.GetApiResponse;
@@ -38,8 +39,9 @@ public class MetricController {
     public MetricResponse query(@PathVariable("projectKey") String projectKey,
                                 @PathVariable("environmentKey") String environmentKey,
                                 @PathVariable("toggleKey") String toggleKey,
+                                @RequestParam(value = "metricType", defaultValue = "VALUE") MetricType metricType,
                                 @RequestParam(value = "lastHours", defaultValue = "24") int lastHours) {
 
-        return metricService.query(projectKey, environmentKey, toggleKey, lastHours);
+        return metricService.query(projectKey, environmentKey, toggleKey, metricType, lastHours);
     }
 }

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

@@ -44,7 +44,17 @@ public class Event implements Serializable {
     @Column(name = "toggle_key")
     private String toggleKey;
 
-    private String variation;
+    @Column(name = "environment_key")
+    private String environmentKey;
+
+    @Column(name = "project_key")
+    private String projectKey;
+
+    @Column(name = "toggle_version")
+    private Long toggleVersion;
+
+    @Column(name = "value_index")
+    private Integer valueIndex;
 
     private Long count;
 

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

@@ -0,0 +1,54 @@
+package com.featureprobe.api.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+@EqualsAndHashCode
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@Entity
+@Table(name = "variation_history")
+@DynamicInsert
+@ToString(callSuper = true)
+@EntityListeners(AuditingEntityListener.class)
+public class VariationHistory implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "toggle_key")
+    private String toggleKey;
+
+    @Column(name = "environment_key")
+    private String environmentKey;
+
+    @Column(name = "project_key")
+    private String projectKey;
+
+    @Column(name = "toggle_version")
+    private Long toggleVersion;
+
+    private String value;
+
+    @Column(name = "value_index")
+    private Integer valueIndex;
+
+    private String name;
+
+}

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

@@ -1,11 +1,16 @@
 package com.featureprobe.api.model;
 
 import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;
 
 @Data
 public class BaseRule {
 
     private List<ConditionValue> conditions;
+
+    public boolean isNotEmptyConditions() {
+        return CollectionUtils.isNotEmpty(conditions);
+    }
 }

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

@@ -26,4 +26,8 @@ public Condition toCondition() {
         condition.setObjects(objects);
         return condition;
     }
+
+    public boolean isSegmentType() {
+        return StringUtils.equals(ConditionType.SEGMENT.toValue(), getType());
+    }
 }

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

@@ -17,4 +17,18 @@ public class VariationAccessCounter {
 
     @NotNull
     private Long count;
+
+    @NotNull
+    private Long version;
+
+    @NotNull
+    private Integer index;
+
+
+    public VariationAccessCounter(String value, Long count) {
+        this.value = value;
+        this.count = count;
+    }
+
+
 }

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

@@ -15,7 +15,7 @@ public interface EnvironmentRepository extends JpaRepository<Environment, Long>
 
     List<Environment> findAllByProjectKey(String projectKey);
 
-    Environment findByServerSdkKey(String serverSdkKey);
+    Optional<Environment> findByServerSdkKey(String serverSdkKey);
 
     Optional<Environment> findByServerSdkKeyOrClientSdkKey(String serverSdkKey, String clientSdkKey);
 

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

@@ -0,0 +1,17 @@
+package com.featureprobe.api.repository;
+
+import com.featureprobe.api.entity.VariationHistory;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface VariationHistoryRepository extends JpaRepository<VariationHistory, Long>,
+        JpaSpecificationExecutor<VariationHistory> {
+
+
+    List<VariationHistory> findByProjectKeyAndEnvironmentKeyAndToggleKey(String projectKey,
+                                                                         String environmentKey, String toggleKey);
+}

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

@@ -1,9 +1,13 @@
 package com.featureprobe.api.service;
 
 
+import com.featureprobe.api.base.enums.ResourceType;
+import com.featureprobe.api.base.exception.ResourceNotFoundException;
 import com.featureprobe.api.dto.EventCreateRequest;
+import com.featureprobe.api.entity.Environment;
 import com.featureprobe.api.entity.Event;
 import com.featureprobe.api.model.VariationAccessCounter;
+import com.featureprobe.api.repository.EnvironmentRepository;
 import com.featureprobe.api.repository.EventRepository;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -22,8 +26,12 @@
 public class EventService {
 
     private EventRepository eventRepository;
+    private EnvironmentRepository environmentRepository;
 
     public void create(String serverSdkKey, List<EventCreateRequest> requests) {
+        Environment environment = environmentRepository.findByServerSdkKey(serverSdkKey)
+                .orElseThrow(() -> new ResourceNotFoundException(ResourceType.ENVIRONMENT, serverSdkKey));
+
         requests.forEach(request -> {
             if (request.getAccess() == null) {
                 return;
@@ -33,7 +41,7 @@ public void create(String serverSdkKey, List<EventCreateRequest> requests) {
                     .entrySet()
                     .stream()
                     .flatMap(entry -> createEventEntities(entry).stream())
-                    .map(event -> wrapEvent(event, serverSdkKey, request))
+                    .map(event -> wrapEvent(event, environment, request))
                     .collect(Collectors.toList());
 
             if (!events.isEmpty()) {
@@ -57,16 +65,19 @@ private Event createEventEntity(String toggleKey, VariationAccessCounter accessC
         Event event = new Event();
         event.setToggleKey(toggleKey);
         event.setCount(accessCounter.getCount());
-        event.setVariation(accessCounter.getValue());
+        event.setValueIndex(accessCounter.getIndex());
+        event.setToggleVersion(accessCounter.getVersion());
 
         return event;
     }
 
-    private Event wrapEvent(Event event, String serverSdkKey, EventCreateRequest request) {
+    private Event wrapEvent(Event event, Environment environment, EventCreateRequest request) {
         if (request.getAccess() == null) {
             return event;
         }
-        event.setSdkKey(serverSdkKey);
+        event.setSdkKey(environment.getServerSdkKey());
+        event.setProjectKey(environment.getProject().getKey());
+        event.setEnvironmentKey(environment.getKey());
         event.setType("access");
         event.setStartDate(new Date(request.getAccess().getStartTime()));
         event.setEndDate(new Date(request.getAccess().getEndTime()));