Merge branch 'develop' into refactor/image-upload-notify-seperation

BCSDLab · Dec 7, 2024 · ca4c6de · ca4c6de
2 parents d8b9964 + d874940
commit ca4c6de
Show file tree

Hide file tree

Showing 48 changed files with 805 additions and 183 deletions.
diff --git a/src/main/java/in/koreatech/koin/admin/abtest/controller/AbtestApi.java b/src/main/java/in/koreatech/koin/admin/abtest/controller/AbtestApi.java
@@ -18,6 +18,7 @@
 import in.koreatech.koin.admin.abtest.dto.request.AbtestAssignRequest;
 import in.koreatech.koin.admin.abtest.dto.request.AbtestCloseRequest;
 import in.koreatech.koin.admin.abtest.dto.request.AbtestRequest;
+import in.koreatech.koin.admin.abtest.dto.response.AbtestAccessHistoryResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestAssignResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestDevicesResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestResponse;
@@ -179,6 +180,20 @@ ResponseEntity<Void> assignAbtestVariableByAdmin(
         @RequestBody @Valid AbtestAdminAssignRequest abtestAdminAssignRequest
     );
 
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "400", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true)))
+        }
+    )
+    @Operation(summary = "(NORMAL) AB테스트 토큰(access_history_id) 발급")
+    @PostMapping("/assign/token")
+    ResponseEntity<AbtestAccessHistoryResponse> issueAccessHistoryId(
+        @UserAgent UserAgentInfo userAgentInfo,
+        @UserId Integer userId
+    );
+
     @ApiResponses(
         value = {
             @ApiResponse(responseCode = "200"),

diff --git a/src/main/java/in/koreatech/koin/admin/abtest/controller/AbtestController.java b/src/main/java/in/koreatech/koin/admin/abtest/controller/AbtestController.java
@@ -19,6 +19,7 @@
 import in.koreatech.koin.admin.abtest.dto.request.AbtestAssignRequest;
 import in.koreatech.koin.admin.abtest.dto.request.AbtestCloseRequest;
 import in.koreatech.koin.admin.abtest.dto.request.AbtestRequest;
+import in.koreatech.koin.admin.abtest.dto.response.AbtestAccessHistoryResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestAssignResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestDevicesResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestResponse;
@@ -125,6 +126,15 @@ public ResponseEntity<Void> assignAbtestVariableByAdmin(
         return ResponseEntity.ok().build();
     }
 
+    @PostMapping("/assign/token")
+    public ResponseEntity<AbtestAccessHistoryResponse> issueAccessHistoryId(
+        @UserAgent UserAgentInfo userAgentInfo,
+        @UserId Integer userId
+    ) {
+        AbtestAccessHistoryResponse response = abtestService.issueAccessHistoryId(userAgentInfo, userId);
+        return ResponseEntity.ok(response);
+    }
+
     @PostMapping("/assign")
     public ResponseEntity<AbtestAssignResponse> assignOrGetAbtestVariable(
         @RequestHeader(value = "access_history_id", required = false) Integer accessHistoryId,

diff --git a/src/main/java/in/koreatech/koin/admin/abtest/dto/response/AbtestAccessHistoryResponse.java b/src/main/java/in/koreatech/koin/admin/abtest/dto/response/AbtestAccessHistoryResponse.java
@@ -0,0 +1,14 @@
+package in.koreatech.koin.admin.abtest.dto.response;
+
+import in.koreatech.koin.admin.abtest.model.AccessHistory;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record AbtestAccessHistoryResponse(
+    @Schema(description = "기기 식별자")
+    Integer accessHistoryId
+) {
+
+    public static AbtestAccessHistoryResponse from(AccessHistory accessHistory) {
+        return new AbtestAccessHistoryResponse(accessHistory.getId());
+    }
+}
diff --git a/src/main/java/in/koreatech/koin/admin/abtest/dto/response/AbtestDevicesResponse.java b/src/main/java/in/koreatech/koin/admin/abtest/dto/response/AbtestDevicesResponse.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
+import in.koreatech.koin.admin.abtest.model.AccessHistory;
 import in.koreatech.koin.admin.abtest.model.Device;
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -37,11 +38,12 @@ private record InnerDeviceResponse(
     ) {
 
         public static InnerDeviceResponse from(Device device) {
+            AccessHistory accessHistory = device.getAccessHistory();
             return new InnerDeviceResponse(
                 device.getId(),
                 device.getType(),
                 device.getModel(),
-                device.getAccessHistory().getLastAccessedAt().toLocalDate());
+                accessHistory != null ? accessHistory.getLastAccessedAt().toLocalDate() : null);
         }
     }
 }
diff --git a/src/main/java/in/koreatech/koin/admin/abtest/model/AccessHistory.java b/src/main/java/in/koreatech/koin/admin/abtest/model/AccessHistory.java
@@ -69,6 +69,12 @@ private AccessHistory(
         this.lastAccessedAt = lastAccessedAt;
     }
 
+    public static AccessHistory create() {
+        return AccessHistory.builder()
+            .lastAccessedAt(LocalDateTime.now())
+            .build();
+    }
+
     public void connectDevice(Device device) {
         this.device = device;
         device.setAccessHistory(this);

diff --git a/src/main/java/in/koreatech/koin/admin/abtest/service/AbtestService.java b/src/main/java/in/koreatech/koin/admin/abtest/service/AbtestService.java
@@ -14,6 +14,7 @@
 import in.koreatech.koin.admin.abtest.dto.request.AbtestAssignRequest;
 import in.koreatech.koin.admin.abtest.dto.request.AbtestCloseRequest;
 import in.koreatech.koin.admin.abtest.dto.request.AbtestRequest;
+import in.koreatech.koin.admin.abtest.dto.response.AbtestAccessHistoryResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestAssignResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestDevicesResponse;
 import in.koreatech.koin.admin.abtest.dto.response.AbtestResponse;
@@ -139,8 +140,7 @@ public void closeAbtest(Integer abtestId, AbtestCloseRequest request) {
 
     @Transactional
     public AbtestAssignResponse assignOrGetVariable(Integer accessHistoryId, UserAgentInfo userAgentInfo,
-        Integer userId,
-        AbtestAssignRequest request) {
+        Integer userId, AbtestAssignRequest request) {
         Abtest abtest = abtestRepository.getByTitle(request.title());
         AccessHistory accessHistory = findOrCreateAccessHistory(accessHistoryId);
         Optional<AbtestVariable> winnerResponse = returnWinnerIfClosed(abtest);
@@ -312,31 +312,42 @@ private static Optional<AbtestVariable> returnWinnerIfClosed(Abtest abtest) {
 
     public AccessHistory findOrCreateAccessHistory(Integer id) {
         if (id == null) {
-            return accessHistoryRepository.save(AccessHistory.builder().build());
+            return accessHistoryRepository.save(AccessHistory.create());
         }
         return accessHistoryRepository.getById(id);
     }
 
+    @Transactional
+    public AbtestAccessHistoryResponse issueAccessHistoryId(UserAgentInfo userAgentInfo, Integer userId) {
+        AccessHistory accessHistory = accessHistoryRepository.save(AccessHistory.create());
+        if (userId != null) {
+            createDeviceIfNotExists(userId, userAgentInfo, accessHistory, null);
+        }
+        return AbtestAccessHistoryResponse.from(accessHistory);
+    }
+
     private void createDeviceIfNotExists(Integer userId, UserAgentInfo userAgentInfo,
         AccessHistory accessHistory, Abtest abtest) {
-        userRepository.getById(userId);
-        if (accessHistory.getDevice() == null) {
-            Device device = deviceRepository.save(
+        User user = userRepository.getById(userId);
+        Device device = accessHistory.getDevice();
+        if (device == null) {
+            device = deviceRepository.save(
                 Device.builder()
-                    .user(userRepository.getById(userId))
+                    .user(user)
                     .model(userAgentInfo.getModel())
                     .type(userAgentInfo.getType())
                     .build()
             );
             accessHistory.connectDevice(device);
         }
-        Device device = accessHistory.getDevice();
         if (device.getModel() == null || device.getType() == null) {
             device.setModelInfo(userAgentInfo.getModel(), userAgentInfo.getType());
         }
         if (!Objects.equals(device.getUser().getId(), userId)) {
-            device.changeUser(userRepository.getById(userId));
-            removeBeforeUserCache(accessHistory, abtest);
+            device.changeUser(user);
+            if (abtest != null) {
+                removeBeforeUserCache(accessHistory, abtest);
+            }
         }
     }
 }
diff --git a/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitApi.java b/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitApi.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoryResponse;
+import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoriesResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminBenefitShopsResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryRequest;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryResponse;
@@ -44,7 +44,7 @@ public interface AdminBenefitApi {
     )
     @Operation(summary = "상점 혜택 카테고리를 모두 조회한다.")
     @GetMapping("/categories")
-    ResponseEntity<AdminBenefitCategoryResponse> getBenefitCategories(
+    ResponseEntity<AdminBenefitCategoriesResponse> getBenefitCategories(
         @Auth(permit = {ADMIN}) Integer adminId
     );
 

diff --git a/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitController.java b/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitController.java
@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoryResponse;
+import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoriesResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminBenefitShopsResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryRequest;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryResponse;
@@ -36,10 +36,10 @@ public class AdminBenefitController implements AdminBenefitApi {
     private final AdminBenefitService adminBenefitService;
 
     @GetMapping("/categories")
-    public ResponseEntity<AdminBenefitCategoryResponse> getBenefitCategories(
+    public ResponseEntity<AdminBenefitCategoriesResponse> getBenefitCategories(
         @Auth(permit = {ADMIN}) Integer adminId
     ) {
-        AdminBenefitCategoryResponse response = adminBenefitService.getBenefitCategories();
+        AdminBenefitCategoriesResponse response = adminBenefitService.getBenefitCategories();
         return ResponseEntity.ok(response);
     }
 

diff --git a/...fit/dto/AdminBenefitCategoryResponse.java → ...t/dto/AdminBenefitCategoriesResponse.java b/...fit/dto/AdminBenefitCategoryResponse.java → ...t/dto/AdminBenefitCategoriesResponse.java
@@ -9,13 +9,13 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @JsonNaming(SnakeCaseStrategy.class)
-public record AdminBenefitCategoryResponse(
+public record AdminBenefitCategoriesResponse(
     @Schema(description = "혜택 카테고리 리스트")
     List<InnerBenefitResponse> benefits
 ) {
 
-    public static AdminBenefitCategoryResponse from(List<BenefitCategory> benefitCategories) {
-        return new AdminBenefitCategoryResponse(
+    public static AdminBenefitCategoriesResponse from(List<BenefitCategory> benefitCategories) {
+        return new AdminBenefitCategoriesResponse(
             benefitCategories.stream().map(InnerBenefitResponse::from).toList()
         );
     }

diff --git a/src/main/java/in/koreatech/koin/admin/benefit/service/AdminBenefitService.java b/src/main/java/in/koreatech/koin/admin/benefit/service/AdminBenefitService.java
@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoryResponse;
+import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoriesResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminBenefitShopsResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryRequest;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryResponse;
@@ -36,9 +36,9 @@ public class AdminBenefitService {
     private final AdminBenefitCategoryMapRepository adminBenefitCategoryMapRepository;
     private final AdminShopRepository adminShopRepository;
 
-    public AdminBenefitCategoryResponse getBenefitCategories() {
+    public AdminBenefitCategoriesResponse getBenefitCategories() {
         List<BenefitCategory> categories = adminBenefitCategoryRepository.findAllByOrderByTitleAsc();
-        return AdminBenefitCategoryResponse.from(categories);
+        return AdminBenefitCategoriesResponse.from(categories);
     }
 
     @Transactional

diff --git a/src/main/java/in/koreatech/koin/admin/history/aop/AdminActivityHistoryAspect.java b/src/main/java/in/koreatech/koin/admin/history/aop/AdminActivityHistoryAspect.java
@@ -49,7 +49,8 @@ private void excludeGetMapping() {
         + "!execution(* in.koreatech.koin.admin.user.controller.AdminUserController.refresh(..)) && "
         + "!execution(* in.koreatech.koin.admin.user.controller.AdminUserController.createAdmin(..)) && "
         + "!execution(* in.koreatech.koin.admin.user.controller.AdminUserController.adminPasswordChange(..)) && "
-        + "!execution(* in.koreatech.koin.admin.abtest.controller.AbtestController.assignOrGetAbtestVariable(..))")
+        + "!execution(* in.koreatech.koin.admin.abtest.controller.AbtestController.assignOrGetAbtestVariable(..)) &&"
+        + "!execution(* in.koreatech.koin.admin.abtest.controller.AbtestController.issueAccessHistoryId(..))")
     private void excludeSpecificMethods() {
     }
 

diff --git a/src/main/java/in/koreatech/koin/domain/benefit/dto/BenefitShopsResponse.java b/src/main/java/in/koreatech/koin/domain/benefit/dto/BenefitShopsResponse.java
@@ -7,6 +7,7 @@
 import java.time.LocalTime;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
@@ -67,7 +68,10 @@ public record InnerShopResponse(
         double averageRate,
 
         @Schema(example = "10", description = "리뷰 개수", requiredMode = REQUIRED)
-        long reviewCount
+        long reviewCount,
+
+        @Schema(example = "콜라 서비스", description = "혜택 설명", requiredMode = NOT_REQUIRED)
+        String benefitDetail
     ) {
 
         public static Comparator<InnerShopResponse> getComparator() {
@@ -80,7 +84,8 @@ public static Comparator<InnerShopResponse> getComparator() {
         public static InnerShopResponse from(
             Shop shop,
             boolean isEvent,
-            boolean isOpen
+            boolean isOpen,
+            String benefitDetail
         ) {
             return new InnerShopResponse(
                 shop.getShopCategories().stream().map(shopCategoryMap ->
@@ -102,7 +107,8 @@ public static InnerShopResponse from(
                     .orElse(0.0) * 10) / 10.0,
                 shop.getReviews().stream()
                     .filter(review -> !review.isDeleted())
-                    .count()
+                    .count(),
+                benefitDetail
             );
         }
 

diff --git a/src/main/java/in/koreatech/koin/domain/benefit/model/BenefitCategoryMap.java b/src/main/java/in/koreatech/koin/domain/benefit/model/BenefitCategoryMap.java
@@ -5,13 +5,15 @@
 
 import in.koreatech.koin.domain.shop.model.shop.Shop;
 import in.koreatech.koin.global.domain.BaseEntity;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import jakarta.validation.constraints.Size;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -34,9 +36,14 @@ public class BenefitCategoryMap extends BaseEntity {
     @JoinColumn(name = "benefit_id", referencedColumnName = "id", nullable = false)
     private BenefitCategory benefitCategory;
 
+    @Size(min = 2, max = 20)
+    @Column(name = "detail")
+    private String detail;
+
     @Builder
-    public BenefitCategoryMap(Shop shop, BenefitCategory benefitCategory) {
+    public BenefitCategoryMap(Shop shop, BenefitCategory benefitCategory, String detail) {
         this.shop = shop;
         this.benefitCategory = benefitCategory;
+        this.detail = detail;
     }
 }
diff --git a/src/main/java/in/koreatech/koin/domain/benefit/repository/BenefitCategoryMapRepository.java b/src/main/java/in/koreatech/koin/domain/benefit/repository/BenefitCategoryMapRepository.java
@@ -2,13 +2,21 @@
 
 import java.util.List;
 
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
 
 import in.koreatech.koin.domain.benefit.model.BenefitCategoryMap;
 
 public interface BenefitCategoryMapRepository extends Repository<BenefitCategoryMap, Integer> {
 
-    List<BenefitCategoryMap> findAllByBenefitCategoryId(Integer benefitCategoryId);
+    List<BenefitCategoryMap> findByBenefitCategoryId(Integer benefitCategoryId);
+
+    @Query("""
+            SELECT bcm FROM BenefitCategoryMap bcm
+            JOIN FETCH bcm.shop s
+            JOIN FETCH bcm.benefitCategory bc
+            """)
+    List<BenefitCategoryMap> findAllWithFetchJoin();
 
     BenefitCategoryMap save(BenefitCategoryMap benefitCategoryMap);
 }
diff --git a/src/main/java/in/koreatech/koin/domain/benefit/service/ShopBenefitService.java b/src/main/java/in/koreatech/koin/domain/benefit/service/ShopBenefitService.java
@@ -35,18 +35,24 @@ public BenefitCategoryResponse getBenefitCategories() {
     }
 
     public BenefitShopsResponse getBenefitShops(Integer benefitId) {
-        List<BenefitCategoryMap> benefitCategoryMaps = benefitCategoryMapRepository
-            .findAllByBenefitCategoryId(benefitId);
+        List<BenefitCategoryMap> benefitCategoryMaps = benefitCategoryMapRepository.findByBenefitCategoryId(benefitId);
         LocalDateTime now = LocalDateTime.now(clock);
+
         List<InnerShopResponse> innerShopResponses = benefitCategoryMaps.stream()
             .map(benefitCategoryMap -> {
                 Shop shop = benefitCategoryMap.getShop();
+                String benefitDetail = benefitCategoryMap.getDetail();
                 boolean isDurationEvent = eventArticleRepository.isDurationEvent(shop.getId(), now.toLocalDate());
-                return InnerShopResponse.from(shop, isDurationEvent, shop.isOpen(now));
+                return InnerShopResponse.from(
+                    shop,
+                    isDurationEvent,
+                    shop.isOpen(now),
+                    benefitDetail
+                );
             })
             .sorted(InnerShopResponse.getComparator())
             .toList();
-        BenefitShopsResponse shopsResponse = BenefitShopsResponse.from(innerShopResponses);
-        return shopsResponse;
+
+        return BenefitShopsResponse.from(innerShopResponses);
     }
 }