Order guilds by identifier

Alf-Melmac · Jul 24, 2022 · 4d1bc65 · 4d1bc65
1 parent a5af327
commit 4d1bc65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/de/webalf/slotbot/repository/GuildRepository.java b/src/main/java/de/webalf/slotbot/repository/GuildRepository.java
@@ -12,5 +12,7 @@
 public interface GuildRepository extends DiscordIdEntityJpaRepository<Guild> {
 	Optional<Guild> findByGroupIdentifier(String name);
 
+	List<Guild> findAllByOrderByGroupIdentifier();
+
 	List<Guild> findByUrlPatternIsNotNull();
 }
diff --git a/src/main/java/de/webalf/slotbot/service/GuildService.java b/src/main/java/de/webalf/slotbot/service/GuildService.java
@@ -38,7 +38,7 @@ public List<Guild> findAll() {
 	}
 
 	public List<Guild> findAllExceptDefault() {
-		return findAll().stream().filter(guild -> guild.getId() != GUILD_PLACEHOLDER).collect(Collectors.toUnmodifiableList());
+		return guildRepository.findAllByOrderByGroupIdentifier().stream().filter(guild -> guild.getId() != GUILD_PLACEHOLDER).collect(Collectors.toUnmodifiableList());
 	}
 
 	private List<Guild> findAllWithUrlPattern() {