Merge pull request #1169 from Moadong/develop/be

[Release] BE

Author: lepitaaar

backend/src/main/java/moadong/club/payload/dto/ClubDetailedResult.java

@@ -3,12 +3,10 @@
 import lombok.Builder;
 import moadong.club.entity.Club;
 import moadong.club.entity.ClubRecruitmentInformation;
-import moadong.media.resolver.ImageDisplayUrlResolver;
 
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Builder
 public record ClubDetailedResult(
@@ -35,10 +33,6 @@ public record ClubDetailedResult(
 ) {
 
     public static ClubDetailedResult of(Club club) {
-        return of(club, null);
-    }
-
-    public static ClubDetailedResult of(Club club, ImageDisplayUrlResolver resolver) {
         ClubRecruitmentInformation clubRecruitmentInformation = club.getClubRecruitmentInformation();
 
         String start = "미정";
@@ -54,30 +48,18 @@ public static ClubDetailedResult of(Club club, ImageDisplayUrlResolver resolver)
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm");
             lastModifiedDate = club.getClubRecruitmentInformation().getLastModifiedDate().format(formatter);
         }
-
-        String logo = clubRecruitmentInformation.getLogo() == null ? ""
-                : clubRecruitmentInformation.getLogo();
-        String cover = clubRecruitmentInformation.getCover() == null ? ""
-                : clubRecruitmentInformation.getCover();
-        List<String> feeds = clubRecruitmentInformation.getFeedImages() == null ? List.of()
-                : clubRecruitmentInformation.getFeedImages();
-        if (resolver != null) {
-            logo = resolver.resolveDisplayUrl(logo);
-            cover = resolver.resolveDisplayUrl(cover);
-            feeds = feeds.stream()
-                    .map(resolver::resolveDisplayUrl)
-                    .collect(Collectors.toList());
-        }
-
         return ClubDetailedResult.builder()
                 .id(club.getId() == null ? "" : club.getId())
                 .name(club.getName() == null ? "" : club.getName())
-                .logo(logo)
-                .cover(cover)
+                .logo(clubRecruitmentInformation.getLogo() == null ? ""
+                        : clubRecruitmentInformation.getLogo())
+                .cover(clubRecruitmentInformation.getCover() == null ? ""
+                        : clubRecruitmentInformation.getCover())
                 .tags(clubRecruitmentInformation.getTags() == null ? List.of()
                         : clubRecruitmentInformation.getTags())
                 .state(club.getState() == null ? "" : club.getState().getDesc())
-                .feeds(feeds)
+                .feeds(clubRecruitmentInformation.getFeedImages() == null ? List.of()
+                        : clubRecruitmentInformation.getFeedImages())
                 .category(club.getCategory() == null ? "" : club.getCategory())
                 .division(club.getDivision() == null ? "" : club.getDivision())
                 .introduction(clubRecruitmentInformation.getIntroduction() == null ? ""

backend/src/main/java/moadong/club/service/ClubImageUrlPersistenceService.java

@@ -6,7 +6,6 @@
 import moadong.club.entity.ClubRecruitmentInformation;
 import moadong.club.payload.dto.ClubDetailedResult;
 import moadong.club.payload.request.ClubInfoRequest;
-import moadong.media.resolver.ImageDisplayUrlResolver;
 import moadong.club.payload.request.ClubRecruitmentInfoUpdateRequest;
 import moadong.club.payload.response.ClubDetailedResponse;
 import moadong.club.repository.ClubRepository;
@@ -33,8 +32,6 @@ public class ClubProfileService {
     private final ClubSearchRepository clubSearchRepository;
     private final RecruitmentStateCalculator recruitmentStateCalculator;
     private final Javers javers;
-    private final ImageDisplayUrlResolver imageDisplayUrlResolver;
-    private final ClubImageUrlPersistenceService clubImageUrlPersistenceService;
 
     @Transactional
     public void updateClubInfo(ClubInfoRequest request, CustomUserDetails user) {
@@ -65,12 +62,9 @@ public ClubDetailedResponse getClubDetail(String clubId) {
         Club club = clubRepository.findClubById(objectId)
                 .orElseThrow(() -> new RestApiException(ErrorCode.CLUB_NOT_FOUND));
 
-        ClubDetailedResult clubDetailedResult = ClubDetailedResult.of(club, imageDisplayUrlResolver);
-        clubImageUrlPersistenceService.schedulePersistResolvedUrls(
-                club.getId(),
-                clubDetailedResult.logo(),
-                clubDetailedResult.cover(),
-                clubDetailedResult.feeds());
+        ClubDetailedResult clubDetailedResult = ClubDetailedResult.of(
+                club
+        );
         return new ClubDetailedResponse(clubDetailedResult);
     }
 }

backend/src/main/java/moadong/club/service/ClubProfileService.java

@@ -9,20 +9,16 @@
 import moadong.club.payload.dto.ClubSearchResult;
 import moadong.club.payload.response.ClubSearchResponse;
 import moadong.club.repository.ClubSearchRepository;
-import moadong.media.resolver.ImageDisplayUrlResolver;
 import org.springframework.stereotype.Service;
 
 import static java.util.Arrays.*;
-import java.util.Objects;
 
 @Service
 @AllArgsConstructor
 @Slf4j
 public class ClubSearchService {
 
     private final ClubSearchRepository clubSearchRepository;
-    private final ImageDisplayUrlResolver imageDisplayUrlResolver;
-    private final ClubImageUrlPersistenceService clubImageUrlPersistenceService;
 
     public ClubSearchResponse searchClubsByKeyword(String keyword,
                                                    String recruitmentStatus,
@@ -57,22 +53,6 @@ private ClubSearchResponse sortAndBuildResponse(List<ClubSearchResult> result) {
                                                 Integer.MAX_VALUE))
                                 .thenComparing(ClubSearchResult::name)
                 )
-                .map(r -> {
-                    String resolvedLogo = imageDisplayUrlResolver.resolveDisplayUrl(r.logo());
-                    if (!Objects.equals(resolvedLogo, r.logo())) {
-                        clubImageUrlPersistenceService.schedulePersistResolvedUrls(r.id(), resolvedLogo, null, null);
-                    }
-                    return new ClubSearchResult(
-                            r.id(),
-                            r.name(),
-                            resolvedLogo,
-                            r.tags(),
-                            r.state(),
-                            r.category(),
-                            r.division(),
-                            r.introduction(),
-                            r.recruitmentStatus());
-                })
                 .collect(Collectors.toList());
 
         return ClubSearchResponse.builder()

backend/src/main/java/moadong/club/service/ClubSearchService.java

@@ -13,7 +13,7 @@
 public class AsyncConfig {
 
     @Bean(name = "fcmAsync")
-    public TaskExecutor fcmAsyncExecutor() {
+    public TaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(4);
         executor.setMaxPoolSize(8);
@@ -23,17 +23,5 @@ public TaskExecutor fcmAsyncExecutor() {
         executor.initialize();
         return executor;
     }
-
-    @Bean(name = "imageUrlAsync")
-    public TaskExecutor imageUrlAsyncExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(4);
-        executor.setMaxPoolSize(8);
-        executor.setQueueCapacity(100);
-        executor.setThreadNamePrefix("moadong-image-url-async-");
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        executor.initialize();
-        return executor;
-    }
-
+    
 }