Merge branch 'main' into refactor/#555

backend/src/main/java/shook/shook/auth/config/AuthConfig.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -12,6 +13,7 @@
 import shook.shook.auth.ui.interceptor.PathMethod;
 import shook.shook.auth.ui.interceptor.TokenInterceptor;
 
+@Profile("!local")
 @Configuration
 public class AuthConfig implements WebMvcConfigurer {
 

backend/src/main/java/shook/shook/auth/config/LocalAuthConfig.java

@@ -0,0 +1,33 @@
+package shook.shook.auth.config;
+
+import java.util.List;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import shook.shook.auth.ui.argumentresolver.AuthArgumentResolver;
+import shook.shook.auth.ui.interceptor.LocalInterceptor;
+
+@Profile("local")
+@Configuration
+public class LocalAuthConfig implements WebMvcConfigurer {
+
+ private final AuthArgumentResolver authArgumentResolver;
+ private final LocalInterceptor localInterceptor;
+
+ public LocalAuthConfig(final AuthArgumentResolver authArgumentResolver, final LocalInterceptor localInterceptor) {
+ this.authArgumentResolver = authArgumentResolver;
+ this.localInterceptor = localInterceptor;
+ }
+
+ @Override
+ public void addInterceptors(final InterceptorRegistry registry) {
+ registry.addInterceptor(localInterceptor);
+ }
+
+ @Override
+ public void addArgumentResolvers(final List<HandlerMethodArgumentResolver> resolvers) {
+ resolvers.add(authArgumentResolver);
+ }
+}

backend/src/main/java/shook/shook/auth/ui/interceptor/LocalInterceptor.java

@@ -0,0 +1,28 @@
+package shook.shook.auth.ui.interceptor;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import shook.shook.auth.ui.AuthContext;
+
+@Profile("local")
+@Component
+public class LocalInterceptor implements HandlerInterceptor {
+
+ private final AuthContext authContext;
+
+ public LocalInterceptor(final AuthContext authContext) {
+ this.authContext = authContext;
+ }
+
+ @Override
+ public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler)
+ throws Exception {
+ final long memberId = Long.parseLong(request.getHeader("Authorization"));
+ authContext.setAuthenticatedMember(memberId);
+
+ return true;
+ }
+}

backend/src/main/java/shook/shook/song/application/InMemorySongsScheduler.java

@@ -1,12 +1,16 @@
 package shook.shook.song.application;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.persistence.EntityManager;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import shook.shook.song.domain.InMemorySongs;
+import shook.shook.song.domain.Song;
+import shook.shook.song.domain.killingpart.KillingPart;
 import shook.shook.song.domain.repository.SongRepository;
 
 @RequiredArgsConstructor
@@ -17,6 +21,7 @@ public class InMemorySongsScheduler {
 
  private final SongRepository songRepository;
  private final InMemorySongs inMemorySongs;
+ private final EntityManager entityManager;
 
  @PostConstruct
  public void initialize() {
@@ -26,6 +31,25 @@ public void initialize() {
  @Scheduled(cron = "${schedules.in-memory-song.cron}")
  public void recreateCachedSong() {
  log.info("InMemorySongsScheduler worked");
- inMemorySongs.recreate(songRepository.findAllWithKillingParts());
+ final List<Song> songs = songRepository.findAllWithKillingPartsAndLikes();
+ detachSongs(songs);
+ inMemorySongs.refreshSongs(songs);
+ }
+
+ private void detachSongs(final List<Song> songs) {
+ songs.stream()
+ .peek(entityManager::detach)
+ .flatMap(song -> song.getKillingParts().stream())
+ .forEach(entityManager::detach);
+ }
+
+ @Transactional
+ @Scheduled(cron = "${schedules.in-memory-song.update-cron}")
+ public void updateCachedSong() {
+ log.info("InMemorySongsScheduler LikeCount update progressed");
+ final List<KillingPart> killingParts = inMemorySongs.getSongs().stream()
+ .flatMap(song -> song.getKillingParts().stream())
+ .toList();
+ killingParts.forEach(entityManager::merge);
  }
 }

backend/src/main/java/shook/shook/song/application/SongService.java

@@ -14,7 +14,6 @@
 import shook.shook.member.domain.Member;
 import shook.shook.member.domain.repository.MemberRepository;
 import shook.shook.member.exception.MemberException;
-import shook.shook.song.application.dto.RecentSongCarouselResponse;
 import shook.shook.member_part.domain.MemberPart;
 import shook.shook.member_part.domain.repository.MemberPartRepository;
 import shook.shook.song.application.dto.RecentSongCarouselResponse;

backend/src/main/java/shook/shook/song/application/killingpart/KillingPartLikeService.java

@@ -8,6 +8,7 @@
 import shook.shook.member.domain.repository.MemberRepository;
 import shook.shook.member.exception.MemberException;
 import shook.shook.song.application.killingpart.dto.KillingPartLikeRequest;
+import shook.shook.song.domain.InMemorySongs;
 import shook.shook.song.domain.killingpart.KillingPart;
 import shook.shook.song.domain.killingpart.KillingPartLike;
 import shook.shook.song.domain.killingpart.repository.KillingPartLikeRepository;
@@ -22,6 +23,7 @@ public class KillingPartLikeService {
  private final KillingPartRepository killingPartRepository;
  private final MemberRepository memberRepository;
  private final KillingPartLikeRepository likeRepository;
+ private final InMemorySongs inMemorySongs;
 
  @Transactional
  public void updateLikeStatus(
@@ -54,8 +56,8 @@ private void create(final KillingPart killingPart, final Member member) {
  final KillingPartLike likeOnKillingPart = likeRepository.findByKillingPartAndMember(killingPart, member)
  .orElseGet(() -> createNewLike(killingPart, member));
  if (likeOnKillingPart.isDeleted()) {
+ inMemorySongs.like(killingPart, likeOnKillingPart);
  likeRepository.pressLike(likeOnKillingPart.getId());
- killingPartRepository.increaseLikeCount(killingPart.getId());
  }
  }
 
@@ -68,8 +70,8 @@ private KillingPartLike createNewLike(final KillingPart killingPart, final Membe
  private void delete(final KillingPart killingPart, final Member member) {
  killingPart.findLikeByMember(member)
  .ifPresent(likeOnKillingPart -> {
+ inMemorySongs.unlike(killingPart, likeOnKillingPart);
  likeRepository.cancelLike(likeOnKillingPart.getId());
- killingPartRepository.decreaseLikeCount(killingPart.getId());
  });
  }
 }