fix: modify variations sorting (#17)

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

Author: dengfeige

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

@@ -29,7 +29,6 @@ public class VariationAccessCounter {
     public VariationAccessCounter(String value, Long count) {
         this.value = value;
         this.count = count;
-        this.deleted = false;
     }
 
 

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

@@ -21,13 +21,16 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -66,7 +69,7 @@ public MetricResponse query(String projectKey, String environmentKey, String tog
                 environmentKey, toggleKey).get();
         appendLatestVariations(accessCounters, latestTargeting, metricType);
 
-        return new MetricResponse(accessEventPoints, accessCounters);
+        return new MetricResponse(accessEventPoints, sortAccessCounters(accessCounters));
     }
 
     private Map<String, VariationHistory> buildVariationVersionMap(String projectKey, String environmentKey,
@@ -243,11 +246,11 @@ protected void appendLatestVariations(List<VariationAccessCounter> accessCounter
         appendVariationIfInLatest(accessCounters, latestVariations);
     }
 
+
     private void setVariationDeletedIfNotInLatest(List<VariationAccessCounter> accessCounters,
                                                   List<String> namesOrValues) {
         accessCounters.stream()
-                .filter(accessCounter -> !namesOrValues.contains(accessCounter.getValue()))
-                .forEach(accessCounter -> accessCounter.setDeleted(true));
+                .forEach(accessCounter -> accessCounter.setDeleted(!namesOrValues.contains(accessCounter.getValue())));
     }
 
     private void appendVariationIfInLatest(List<VariationAccessCounter> accessCounters, List<String> namesOrValues) {
@@ -261,6 +264,21 @@ private void appendVariationIfInLatest(List<VariationAccessCounter> accessCounte
         });
     }
 
+    protected List<VariationAccessCounter> sortAccessCounters(List<VariationAccessCounter> accessCounters) {
+        Collections.sort(accessCounters, Comparator.comparingLong(VariationAccessCounter::getCount).reversed());
+
+        List<VariationAccessCounter> deletedCounters = Lists.newArrayList();
+        new ArrayList<>(accessCounters).forEach(accessCounter -> {
+            if (BooleanUtils.isTrue(accessCounter.getDeleted())) {
+                deletedCounters.add(accessCounter);
+                accessCounters.remove(accessCounter);
+            }
+        });
+        accessCounters.addAll(deletedCounters);
+        return accessCounters;
+    }
+
+
     private String queryEnvironmentServerSdkKey(String projectKey, String environmentKey) {
         Environment environment = this.environmentRepository.findByProjectKeyAndKey(projectKey, environmentKey).get();
         return environment.getServerSdkKey();

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

@@ -120,6 +120,20 @@ class MetricServiceSpec extends Specification {
         20 == accessEventPoints[0].values[0].count
     }
 
+    def "test sort access counters"() {
+        when:
+        def counters = metricService.sortAccessCounters([new VariationAccessCounter(count: 15),
+                                                         new VariationAccessCounter(count: 100),
+                                                         new VariationAccessCounter(count: 19, deleted: true),
+                                                         new VariationAccessCounter(count: 99, deleted: true),
+                                                         new VariationAccessCounter(count: 129)])
+
+        then:
+        129 == counters.get(0).count
+        19 == counters.get(counters.size() - 1).count
+        99 == counters.get(counters.size() - 2).count
+    }
+
     def "test `isGroupByDay`"() {
         expect:
         groupByDay == metricService.isGroupByDay(lastHours)