From 47beff752c6ad47a8ac0768f5cf4ce27785230e3 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 26 Jun 2024 02:14:12 +0100 Subject: [PATCH] fix guild and user caching --- src/main/java/cc/fascinated/bat/service/CommandService.java | 2 -- src/main/java/cc/fascinated/bat/service/GuildService.java | 4 ++++ src/main/java/cc/fascinated/bat/service/UserService.java | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/cc/fascinated/bat/service/CommandService.java b/src/main/java/cc/fascinated/bat/service/CommandService.java index 2cc478b..606e602 100644 --- a/src/main/java/cc/fascinated/bat/service/CommandService.java +++ b/src/main/java/cc/fascinated/bat/service/CommandService.java @@ -11,10 +11,8 @@ import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.dv8tion.jda.internal.entities.channel.concrete.PrivateChannelImpl; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; diff --git a/src/main/java/cc/fascinated/bat/service/GuildService.java b/src/main/java/cc/fascinated/bat/service/GuildService.java index 9f2b400..13d11e4 100644 --- a/src/main/java/cc/fascinated/bat/service/GuildService.java +++ b/src/main/java/cc/fascinated/bat/service/GuildService.java @@ -7,6 +7,8 @@ import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.events.guild.GuildJoinEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Service; @@ -35,6 +37,7 @@ public class GuildService extends ListenerAdapter { * @param id The ID of the guild * @return The guild */ + @Cacheable(cacheNames = {"guilds"}, key = "#id") public BatGuild getGuild(@NonNull String id) { long start = System.currentTimeMillis(); Optional optionalGuild = guildRepository.findById(id); @@ -51,6 +54,7 @@ public class GuildService extends ListenerAdapter { * * @param guild The guild to save */ + @CachePut(cacheNames = {"guilds"}, key = "#id") public void saveGuild(@NonNull BatGuild guild) { guildRepository.save(guild); } diff --git a/src/main/java/cc/fascinated/bat/service/UserService.java b/src/main/java/cc/fascinated/bat/service/UserService.java index aaec511..ca43b41 100644 --- a/src/main/java/cc/fascinated/bat/service/UserService.java +++ b/src/main/java/cc/fascinated/bat/service/UserService.java @@ -5,6 +5,8 @@ import cc.fascinated.bat.repository.UserRepository; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Service; @@ -32,6 +34,7 @@ public class UserService { * @param id The ID of the user * @return The user */ + @Cacheable(cacheNames = {"users"}, key = "#id") public BatUser getUser(@NonNull String id) { long start = System.currentTimeMillis(); Optional optionalUser = userRepository.findById(id); @@ -48,6 +51,7 @@ public class UserService { * * @param user The user to save */ + @CachePut(cacheNames = {"users"}, key = "#id") public void saveUser(@NonNull BatUser user) { userRepository.save(user); }