♻️ Refactor - Random Photo 응답시 중복되는 사진이 없도록 리팩토링한다

♻️ Refactor - Random Photo 응답시 중복되는 사진이 없도록 리팩토링한다

Author: oOccasio

src/main/java/sopt/comfit/company/domain/ERandomPhoto.java

@@ -3,6 +3,9 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static sopt.comfit.global.constants.Constants.BASE_URL;
@@ -26,7 +29,15 @@ public enum ERandomPhoto {
 
     private static final ERandomPhoto[] VALUES = values();
 
-    public static ERandomPhoto random() {
-        return VALUES[ThreadLocalRandom.current().nextInt(VALUES.length)];
+    public static List<ERandomPhoto> randomDistinct(int count) {
+        if (count > VALUES.length) {
+            throw new IllegalArgumentException("count is greater than total photos");
+        }
+
+        List<ERandomPhoto> shuffled = new ArrayList<>(List.of(VALUES));
+        Collections.shuffle(shuffled);
+
+        return shuffled.subList(0, count);
     }
+
 }

src/main/java/sopt/comfit/company/dto/response/FeaturedCompanyResponseDto.java

@@ -10,12 +10,12 @@ public record FeaturedCompanyResponseDto(
         String scale,
         String photoUrl
 ) {
-    public static FeaturedCompanyResponseDto from(Company company) {
+    public static FeaturedCompanyResponseDto of(Company company, String randomPhotoUrl) {
         return new FeaturedCompanyResponseDto(
                 company.getId(),
                 company.getName(),
                 company.getScale().name(),
-                ERandomPhoto.random().getPhotoUrl()
+                randomPhotoUrl
         );
     }
 }

src/main/java/sopt/comfit/company/service/CompanyService.java

@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @Service
 @RequiredArgsConstructor
@@ -111,9 +112,16 @@ public List<GetSuggestionCompanyResponseDto> getSuggestionCompany(Long companyId
     private List<FeaturedCompanyResponseDto> getFeaturedCompany(List<Long> ids){
         Collections.shuffle(ids);
         List<Long> randomIds = ids.subList(0, Math.min(3, ids.size()));
+        List<Company> companies = companyRepository.findAllById(randomIds);
 
-        return companyRepository.findAllById(randomIds).stream()
-                .map(FeaturedCompanyResponseDto::from)
-                .collect(Collectors.toList());
+        List<ERandomPhoto> randomPhotos =
+                ERandomPhoto.randomDistinct(companies.size());
+
+        return IntStream.range(0, companies.size())
+                .mapToObj(i -> FeaturedCompanyResponseDto.of(
+                        companies.get(i),
+                        randomPhotos.get(i).getPhotoUrl()
+                ))
+                .toList();
     }
 }