fix: mysql >= 5.7 sql_mode=only_full_group_by compatible

Author: jianggang

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

@@ -54,7 +54,7 @@ public List<MemberResponse> create(@Validated @RequestBody MemberCreateRequest c
     @Operation(summary = "List Member", description = "Get a list of all member")
     @PreAuthorize("hasAnyAuthority('OWNER', 'WRITER')")
     public Page<MemberResponse> list(MemberSearchRequest searchRequest) {
-        return memberService.query(searchRequest);
+        return memberService.list(searchRequest);
     }
 
     @PatchMapping

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

@@ -3,10 +3,12 @@
 import com.featureprobe.api.entity.Event;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 @Repository
 public interface EventRepository extends JpaRepository<Event, Long>, JpaSpecificationExecutor<Event> {
@@ -18,4 +20,13 @@ List<Event> findBySdkKeyAndToggleKeyAndStartDateGreaterThanEqualAndEndDateLessTh
 
     boolean existsBySdkKeyAndToggleKey(String sdkKey, String toggleKey);
 
+    @Query(value = "SELECT toggle_key from event WHERE sdk_key = ?1 OR sdk_key = ?2 GROUP BY toggle_key",
+            nativeQuery = true)
+    Set<String> findAllAccessedToggleKey(String serverSdkKey, String clientSdkKey);
+
+    @Query(value = "SELECT toggle_key from event WHERE ( sdk_key = ?1 OR sdk_key = ?2 ) " +
+            "AND end_date >= ?3 GROUP BY toggle_key", nativeQuery = true)
+    Set<String> findAllAccessedToggleKeyGreaterThanOrEqualToEndDate(String serverSdkKey, String clientSdkKey,
+                                                                    Date time);
+
 }

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

@@ -143,13 +143,12 @@ private void verifyAdminPrivileges() {
         }
     }
 
-    public Page<MemberResponse> query(MemberSearchRequest searchRequest) {
+    public Page<MemberResponse> list(MemberSearchRequest searchRequest) {
         Pageable pageable = PageRequestUtil.toPageable(searchRequest, Sort.Direction.DESC, "createdTime");
         Specification<OrganizationMember> spec = (root, query, cb) -> {
             Predicate p1 = cb.equal(root.get("organizationId"), TenantContext.getCurrentOrganization()
                     .getOrganizationId());
-            return query.where(cb.and(p1)).groupBy(root.get("memberId"))
-                    .getRestriction();
+            return query.where(cb.and(p1)).getRestriction();
         };
         Page<OrganizationMember> organizationMembers = organizationMemberRepository.findAll(spec, pageable);
         List<Long> memberIds = organizationMembers.getContent().stream().map(OrganizationMember::getMemberId)

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

@@ -42,7 +42,6 @@
 import com.featureprobe.api.util.PageRequestUtil;
 import com.featureprobe.sdk.server.FPUser;
 import com.featureprobe.sdk.server.FeatureProbe;
-import com.google.common.collect.Sets;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -60,9 +59,7 @@
 import javax.persistence.criteria.Predicate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -381,27 +378,13 @@ private Set<String> queryToggleKeysByVisited(VisitFilter visitFilter, String pro
     }
 
     private Set<String> allVisitedToggleKeys(Environment environment) {
-        Specification<Event> spec = (root, query, cb) -> {
-            Predicate p1 = cb.equal(root.get("sdkKey"), environment.getServerSdkKey());
-            Predicate p2 = cb.equal(root.get("sdkKey"), environment.getClientSdkKey());
-            return query.where(cb.or(p1, p2)).groupBy(root.get("toggleKey"))
-                    .getRestriction();
-        };
-        List<Event> events = eventRepository.findAll(spec);
-        return events.stream().map(Event::getToggleKey).collect(Collectors.toSet());
+        return eventRepository.findAllAccessedToggleKey(environment.getServerSdkKey(), environment.getClientSdkKey());
     }
 
     private Set<String> weekVisitedToggleKeys(Environment environment) {
         Date lastWeek = Date.from(LocalDateTime.now().minusDays(7).atZone(ZoneId.systemDefault()).toInstant());
-        Specification<Event> spec = (root, query, cb) -> {
-            Predicate p1 = cb.equal(root.get("sdkKey"), environment.getServerSdkKey());
-            Predicate p2 = cb.equal(root.get("sdkKey"), environment.getClientSdkKey());
-            Predicate p3 = cb.greaterThanOrEqualTo(root.get("endDate"), lastWeek);
-            return query.where(cb.or(p1, p2), cb.and(p3)).groupBy(root.get("toggleKey"))
-                    .getRestriction();
-        };
-        List<Event> events = eventRepository.findAll(spec);
-        return events.stream().map(Event::getToggleKey).collect(Collectors.toSet());
+        return eventRepository.findAllAccessedToggleKeyGreaterThanOrEqualToEndDate(
+                environment.getServerSdkKey(), environment.getClientSdkKey(), lastWeek);
     }
 
     private Set<String> lastVisitBeforeWeekToggleKeys(Environment environment) {

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

@@ -166,7 +166,7 @@ class MemberServiceSpec extends Specification {
 
     def "query member list"() {
         when:
-        def list = memberService.query(new MemberSearchRequest(keyword: "root",
+        def list = memberService.list(new MemberSearchRequest(keyword: "root",
                 pageIndex: 0, pageSize: 10))
 
         then:

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

@@ -70,6 +70,8 @@ class ToggleServiceSpec extends Specification {
 
     IncludeArchivedToggleService includeArchivedToggleService
 
+    Set<String> toggleKeys = new HashSet();
+
     def projectKey
     def environmentKey
     def toggleKey
@@ -102,6 +104,7 @@ class ToggleServiceSpec extends Specification {
         toggleKey = "feature_toggle_unit_test"
         toggleName = "test_toggle"
         sdkKey = "server-123456"
+        toggleKeys.add(toggleKey)
         rules = "{\"rules\":[{\"conditions\":[{\"type\":\"string\",\"subject\":\"city\",\"predicate\":\"is one of\"," +
                 "\"objects\":[\"Paris\"]},{\"type\":\"segment\",\"subject\":\"\",\"predicate\":\"is in\"," +
                 "\"objects\":[\"test_segment\"]},{\"type\":\"number\",\"subject\":\"age\",\"predicate\":\"=\"," +
@@ -142,7 +145,7 @@ class ToggleServiceSpec extends Specification {
                 false) >> [new Targeting(toggleKey: toggleKey)]
         1 * tagRepository.findByNameIn(["test"]) >> [new Tag(name: "test", toggles: [new Toggle(key: toggleKey)])]
         1 * toggleTagRepository.findByTagIdIn(_) >> [new ToggleTagRelation(toggleKey: toggleKey)]
-        1 * eventRepository.findAll(_) >> [new Event(toggleKey: toggleKey)]
+        1 * eventRepository.findAllAccessedToggleKeyGreaterThanOrEqualToEndDate(_, _, _) >> toggleKeys
         1 * toggleRepository.findAll(_, _) >> new PageImpl<>([new Toggle(key: toggleKey, projectKey: projectKey)],
                 Pageable.ofSize(1), 1)
         1 * targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKeyIn(projectKey, environmentKey, [toggleKey]) >>
@@ -176,7 +179,8 @@ class ToggleServiceSpec extends Specification {
                 false) >> [new Targeting(toggleKey: toggleKey)]
         1 * tagRepository.findByNameIn(["test"]) >> [new Tag(name: "test", toggles: [new Toggle(key: toggleKey)])]
         1 * toggleTagRepository.findByTagIdIn(_) >> [new ToggleTagRelation(toggleKey: toggleKey)]
-        2 * eventRepository.findAll(_) >> [new Event(toggleKey: toggleKey)]
+        1 * eventRepository.findAllAccessedToggleKey(_, _) >> toggleKeys
+        1 * eventRepository.findAllAccessedToggleKeyGreaterThanOrEqualToEndDate(_, _, _) >> toggleKeys
         1 * toggleRepository.findAll(_, _) >> new PageImpl<>([new Toggle(key: toggleKey, projectKey: projectKey)],
                 Pageable.ofSize(1), 1)
         1 * targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKeyIn(projectKey, environmentKey, [toggleKey]) >>
@@ -210,7 +214,7 @@ class ToggleServiceSpec extends Specification {
                 false) >> [new Targeting(toggleKey: toggleKey)]
         1 * tagRepository.findByNameIn(["test"]) >> [new Tag(name: "test", toggles: [new Toggle(key: toggleKey)])]
         1 * toggleTagRepository.findByTagIdIn(_) >> [new ToggleTagRelation(toggleKey: toggleKey)]
-        1 * eventRepository.findAll(_) >> [new Event(toggleKey: toggleKey)]
+        1 * eventRepository.findAllAccessedToggleKey(_, _) >> toggleKeys
         1 * toggleRepository.findAll(_) >> [new Toggle(key: toggleKey, projectKey: projectKey)]
         1 * toggleRepository.findAll(_, _) >> new PageImpl<>([new Toggle(key: toggleKey, projectKey: projectKey)],
                 Pageable.ofSize(1), 1)
@@ -245,7 +249,7 @@ class ToggleServiceSpec extends Specification {
                 false) >> [new Targeting(toggleKey: toggleKey)]
         1 * tagRepository.findByNameIn(["test"]) >> [new Tag(name: "test", toggles: [new Toggle(key: toggleKey)])]
         1 * toggleTagRepository.findByTagIdIn(_) >> [new ToggleTagRelation(toggleKey: toggleKey)]
-        1 * eventRepository.findAll(_) >> [new Event(toggleKey: toggleKey)]
+        1 * eventRepository.findAllAccessedToggleKeyGreaterThanOrEqualToEndDate(_, _, _) >> toggleKeys
         1 * toggleRepository.findAll(_, _) >> new PageImpl<>([new Toggle(key: toggleKey, projectKey: projectKey)],
                 Pageable.ofSize(1), 1)
         1 * targetingRepository.findByProjectKeyAndEnvironmentKeyAndToggleKeyIn(projectKey, environmentKey, [toggleKey]) >>