release: 1.3.5 (#267)

Author: devxb

src/main/kotlin/org/gitanimals/guild/domain/GuildRepository.kt

@@ -51,6 +51,50 @@ interface GuildRepository : JpaRepository<Guild, Long> {
     )
     fun search(@Param("text") text: String, pageable: Pageable): Page<Guild>
 
-    @Query(value = "select g from Guild as g")
-    fun search(pageable: Pageable): Page<Guild>
+    @Query(
+        value = """
+            select g from Guild as g
+            order by case 
+              when :filter = org.gitanimals.guild.domain.SearchFilter.PEOPLE_ASC then '%' 
+              else :personaType 
+            end
+        """
+    )
+    fun search(pageable: Pageable, @Param("filter") filter: SearchFilter): Page<Guild>
+
+    @Query(
+        """
+            select g from Guild as g 
+            left join g.members as m group by g.id 
+            order by count(m) asc
+        """
+    )
+    fun searchByPeopleCountAsc(pageable: Pageable): Page<Guild>
+
+    @Query(
+        """
+            select g from Guild as g 
+            left join g.members as m group by g.id 
+            order by count(m) desc
+        """
+    )
+    fun searchByPeopleCountDesc(pageable: Pageable): Page<Guild>
+
+    @Query(
+        """
+            select g from Guild as g
+            left join g.members as m group by g.id
+            order by (g.leader.contributions + coalesce(sum(m.contributions), 0)) asc
+        """
+    )
+    fun searchByContributionCountAsc(pageable: Pageable): Page<Guild>
+
+    @Query(
+        """
+            select g from Guild as g
+            left join g.members as m group by g.id
+            order by (g.leader.contributions + coalesce(sum(m.contributions), 0)) desc
+        """
+    )
+    fun searchByContributionCountDesc(pageable: Pageable): Page<Guild>
 }

src/main/kotlin/org/gitanimals/guild/domain/GuildService.kt

@@ -6,7 +6,11 @@ import org.gitanimals.guild.domain.request.ChangeGuildRequest
 import org.gitanimals.guild.domain.request.CreateLeaderRequest
 import org.hibernate.Hibernate
 import org.springframework.data.domain.Page
+import org.springframework.data.domain.PageRequest
 import org.springframework.data.domain.Pageable
+import org.springframework.data.domain.Sort
+import org.springframework.data.domain.Sort.Direction.ASC
+import org.springframework.data.domain.Sort.Direction.DESC
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.orm.ObjectOptimisticLockingFailureException
 import org.springframework.retry.annotation.Retryable
@@ -143,7 +147,21 @@ class GuildService(
 
     fun search(text: String, pageNumber: Int, filter: SearchFilter): Page<Guild> {
         return if (text.isBlank()) {
-            guildRepository.search(Pageable.ofSize(PAGE_SIZE).withPage(pageNumber))
+            when (filter) {
+                SearchFilter.RANDOM,
+                SearchFilter.PEOPLE_ASC ->
+                    guildRepository.searchByPeopleCountAsc(PageRequest.of(pageNumber, PAGE_SIZE))
+
+                SearchFilter.PEOPLE_DESC ->
+                    guildRepository.searchByPeopleCountDesc(PageRequest.of(pageNumber, PAGE_SIZE))
+
+                SearchFilter.CONTRIBUTION_ASC ->
+                    guildRepository.searchByContributionCountAsc(PageRequest.of(pageNumber, PAGE_SIZE))
+
+                SearchFilter.CONTRIBUTION_DESC ->
+                    guildRepository.searchByContributionCountDesc(PageRequest.of(pageNumber, PAGE_SIZE))
+
+            }
         } else {
             guildRepository.search(text, Pageable.ofSize(PAGE_SIZE).withPage(pageNumber))
         }.onEach {