feat : Merge 충돌 제거

CELEBIT · Sep 26, 2024 · 9729990 · 9729990
2 parents 10a3723 + 5caa52d
commit 9729990
Show file tree

Hide file tree

Showing 12 changed files with 141 additions and 45 deletions.
diff --git a/sluv-api/src/main/java/com/sluv/api/alarm/controller/AlarmController.java b/sluv-api/src/main/java/com/sluv/api/alarm/controller/AlarmController.java
@@ -1,5 +1,6 @@
 package com.sluv.api.alarm.controller;
 
+import com.sluv.api.alarm.dto.AlarmCheckResponse;
 import com.sluv.api.alarm.dto.AlarmResponse;
 import com.sluv.api.alarm.service.AlarmService;
 import com.sluv.api.common.response.PaginationResponse;
@@ -46,4 +47,10 @@ public ResponseEntity<SuccessResponse> deleteAllAlarm(@CurrentUserId Long userId
         return ResponseEntity.ok().body(SuccessResponse.create());
     }
 
+    @GetMapping("/check")
+    public ResponseEntity<SuccessDataResponse<AlarmCheckResponse>> checkAlarmAllRead(@CurrentUserId Long userId) {
+        AlarmCheckResponse response = alarmService.checkAlarmAllRead(userId);
+        return ResponseEntity.ok().body(SuccessDataResponse.create(response));
+    }
+
 }
diff --git a/sluv-api/src/main/java/com/sluv/api/alarm/dto/AlarmCheckResponse.java b/sluv-api/src/main/java/com/sluv/api/alarm/dto/AlarmCheckResponse.java
@@ -0,0 +1,19 @@
+package com.sluv.api.alarm.dto;
+
+import lombok.*;
+
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class AlarmCheckResponse {
+
+    private Boolean isAllRead;
+
+    public static AlarmCheckResponse of(Boolean isAllRead) {
+        return AlarmCheckResponse.builder()
+                .isAllRead(isAllRead)
+                .build();
+    }
+
+}
diff --git a/sluv-api/src/main/java/com/sluv/api/alarm/service/AlarmService.java b/sluv-api/src/main/java/com/sluv/api/alarm/service/AlarmService.java
@@ -1,5 +1,6 @@
 package com.sluv.api.alarm.service;
 
+import com.sluv.api.alarm.dto.AlarmCheckResponse;
 import com.sluv.api.alarm.dto.AlarmResponse;
 import com.sluv.api.common.response.PaginationResponse;
 import com.sluv.domain.alarm.dto.AlarmImages;
@@ -70,4 +71,9 @@ public void deleteAllAlarm(Long useId) {
         alarmDomainService.deleteAllAlarm(useId);
     }
 
+    public AlarmCheckResponse checkAlarmAllRead(Long userId) {
+        Boolean isAllRead = alarmDomainService.checkAllRead(userId);
+        return AlarmCheckResponse.of(isAllRead);
+    }
+
 }
diff --git a/sluv-api/src/main/java/com/sluv/api/item/controller/ItemController.java b/sluv-api/src/main/java/com/sluv/api/item/controller/ItemController.java
@@ -236,4 +236,13 @@ public ResponseEntity<SuccessDataResponse<List<ItemSimpleDto>>> getHowAboutItem(
         List<ItemSimpleDto> response = itemService.getHowAboutItem(userId);
         return ResponseEntity.ok().body(SuccessDataResponse.create(response));
     }
+
+    @Operation(summary = "*트랜드 셀럽의 아이템", description = "홈 화면 직접 선정한 셀럽의 아이템 조회")
+    @GetMapping("/trend")
+    public ResponseEntity<SuccessDataResponse<List<ItemSimpleDto>>> getTrendItems(
+            @CurrentUserId Long userId, Pageable pageable) {
+        List<ItemSimpleDto> response = itemService.getTrendItems(userId, pageable);
+        return ResponseEntity.ok().body(SuccessDataResponse.create(response));
+    }
+
 }
diff --git a/sluv-api/src/main/java/com/sluv/api/item/service/ItemService.java b/sluv-api/src/main/java/com/sluv/api/item/service/ItemService.java
@@ -488,4 +488,12 @@ public List<ItemSimpleDto> getTogetherScrapItem(Long userId, Long itemId) {
         List<Item> sameClosetItems = itemDomainService.getSameClosetItems(itemId, recentAddClosets);
         return itemDomainService.getItemSimpleDto(user, sameClosetItems);
     }
+
+    @Transactional(readOnly = true)
+    public List<ItemSimpleDto> getTrendItems(Long userId, Pageable pageable) {
+        User user = userDomainService.findById(userId);
+        Page<Item> itemPage = itemDomainService.getTrendItems(pageable);
+        return itemDomainService.getItemSimpleDto(user, itemPage.getContent());
+    }
+
 }
diff --git a/sluv-domain/src/main/java/com/sluv/domain/alarm/repository/impl/AlarmRepositoryCustom.java b/sluv-domain/src/main/java/com/sluv/domain/alarm/repository/impl/AlarmRepositoryCustom.java
@@ -6,4 +6,6 @@
 
 public interface AlarmRepositoryCustom {
     Page<Alarm> findAllByUserId(Long userId, Pageable pageable);
+
+    Boolean checkAllRead(Long userId);
 }
diff --git a/sluv-domain/src/main/java/com/sluv/domain/alarm/repository/impl/AlarmRepositoryImpl.java b/sluv-domain/src/main/java/com/sluv/domain/alarm/repository/impl/AlarmRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.sluv.domain.alarm.repository.impl;
 
 import static com.sluv.domain.alarm.entity.QAlarm.alarm;
+import static com.sluv.domain.alarm.enums.AlarmStatus.ACTIVE;
 
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -31,4 +32,14 @@ public Page<Alarm> findAllByUserId(Long userId, Pageable pageable) {
 
         return PageableExecutionUtils.getPage(fetch, pageable, () -> countQuery.stream().count());
     }
+
+    @Override
+    public Boolean checkAllRead(Long userId) {
+        List<Alarm> fetch = jpaQueryFactory.selectFrom(alarm)
+                .where(alarm.user.id.eq(userId)
+                        .and(alarm.alarmStatus.eq(ACTIVE))
+                ).fetch();
+        return fetch.isEmpty();
+    }
+
 }
diff --git a/sluv-domain/src/main/java/com/sluv/domain/alarm/service/AlarmDomainService.java b/sluv-domain/src/main/java/com/sluv/domain/alarm/service/AlarmDomainService.java
@@ -8,15 +8,16 @@
 import com.sluv.domain.alarm.exception.AlarmNotFoundException;
 import com.sluv.domain.alarm.repository.AlarmRepository;
 import com.sluv.domain.user.entity.User;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 @Service
 @RequiredArgsConstructor
 public class AlarmDomainService {
@@ -66,4 +67,9 @@ public Page<Alarm> findAllByUserId(Long userId, Pageable pageable) {
         return alarmRepository.findAllByUserId(userId, pageable);
     }
 
+    @Transactional(readOnly = true)
+    public Boolean checkAllRead(Long userId) {
+        return alarmRepository.checkAllRead(userId);
+    }
+
 }
diff --git a/sluv-domain/src/main/java/com/sluv/domain/item/repository/impl/ItemRepositoryCustom.java b/sluv-domain/src/main/java/com/sluv/domain/item/repository/impl/ItemRepositoryCustom.java
@@ -76,4 +76,5 @@ public interface ItemRepositoryCustom {
 
     List<Item> getItemContainKeyword(String keyword);
 
+    Page<Item> getTrendItems(Pageable pageable);
 }