Merge pull request #194 from Att-ies/Feature/193-add-response-data

Feature/193-add-response-data

Author: ChooSeoyeon

src/main/java/com/sptp/backend/art_work/web/dto/response/BiddingListResponse.java

@@ -28,6 +28,7 @@ public static class ArtWorkDto {
         private Long beginPrice;
         private Long topPrice;
         private String image;
+        private Long artist;
 
         public static ArtWorkDto of(ArtWork artWork, Long topPrice, String image) {
             return ArtWorkDto.builder()
@@ -38,6 +39,7 @@ public static ArtWorkDto of(ArtWork artWork, Long topPrice, String image) {
                     .beginPrice(Long.valueOf(artWork.getPrice()))
                     .topPrice(topPrice)
                     .image(image)
+                    .artist(artWork.getMember().getId())
                     .build();
         }
     }

src/main/java/com/sptp/backend/notification/service/NotificationService.java

@@ -1,15 +1,20 @@
 package com.sptp.backend.notification.service;
 
+import com.sptp.backend.common.exception.CustomException;
+import com.sptp.backend.common.exception.ErrorCode;
 import com.sptp.backend.member.repository.Member;
+import com.sptp.backend.member.repository.MemberRepository;
 import com.sptp.backend.notification.repository.Notification;
 import com.sptp.backend.notification.repository.NotificationRepository;
+import com.sptp.backend.notification.web.dto.response.NotificationNewResponse;
 import com.sptp.backend.notification.web.dto.response.NotificationResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -18,6 +23,7 @@
 public class NotificationService {
 
     private final NotificationRepository notificationRepository;
+    private final MemberRepository memberRepository;
 
     @Transactional
     public List<NotificationResponse> getNotificationList(Long loginMember){
@@ -44,10 +50,23 @@ public void deleteNotification(Long notificationId) {
     }
 
     @Transactional(readOnly = true)
-    public Boolean getNotificationNew(Member member) {
+    public NotificationNewResponse getNotificationNew(Member member) {
 
-        long count = notificationRepository.countByMemberAndChecked(member, false);
+        Member findMember = memberRepository.findById(member.getId())
+                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER));
 
-        return (count > 0);
+        Long count = notificationRepository.countByMemberAndChecked(member, false);
+
+        Boolean isArtist = false;
+        if(Objects.equals(findMember.getRoles().get(0), "ROLE_ARTIST")) {
+            isArtist = true;
+        }
+
+        NotificationNewResponse notificationNewResponse = NotificationNewResponse.builder()
+                .newNotification(count > 0)
+                .isArtist(isArtist)
+                .build();
+
+        return notificationNewResponse;
     }
 }

src/main/java/com/sptp/backend/notification/web/NotificationController.java

@@ -45,11 +45,7 @@ public ResponseEntity<Void> deleteNotification(@PathVariable(value="notification
     @GetMapping("/notifications/new")
     public ResponseEntity<NotificationNewResponse> getNotificationNew(@AuthenticationPrincipal CustomUserDetails userDetails){
 
-        Boolean checked = notificationService.getNotificationNew(userDetails.getMember());
-
-        NotificationNewResponse notificationNewResponse = NotificationNewResponse.builder()
-                .newNotification(checked)
-                .build();
+        NotificationNewResponse notificationNewResponse = notificationService.getNotificationNew(userDetails.getMember());
 
         return ResponseEntity.status(HttpStatus.OK).body(notificationNewResponse);
     }

src/main/java/com/sptp/backend/notification/web/dto/response/NotificationNewResponse.java

@@ -10,4 +10,5 @@
 public class NotificationNewResponse {
 
     private Boolean newNotification;
+    private Boolean isArtist;
 }

src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     properties:
       hibernate:
 #        show_sql: true