Merge branch 'develop' into fix/GH-382-voucher-share-password-return

src/main/java/org/swmaestro/repl/gifthub/notifications/controller/NotificationController.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -121,4 +122,24 @@ public ResponseEntity<Message> denyExpirationNotification(
 						.path(request.getRequestURI())
 						.build());
 	}
+
+	@DeleteMapping("/{notificationId}")
+	@Operation(summary = "Notification 삭제 메서드", description = "클라이언트에서 요청한 알림을 삭제하기 위한 메서드입니다.")
+	@ApiResponses({
+			@ApiResponse(responseCode = "200", description = "알림 삭제 성공"),
+			@ApiResponse(responseCode = "400(404)", description = "존재하지 않는 알림"),
+			@ApiResponse(responseCode = "400(404)", description = "존재하지 않는 회원"),
+			@ApiResponse(responseCode = "400(403)", description = "알림 삭제 권한 없음")
+	})
+	public ResponseEntity<Message> deleteNotification(
+			HttpServletRequest request,
+			@RequestHeader("Authorization") String accessToken,
+			@PathVariable Long notificationId) {
+		String username = jwtProvider.getUsername(accessToken.substring(7));
+		notificationService.delete(notificationId, username);
+		return ResponseEntity.ok(
+				SuccessMessage.builder()
+						.path(request.getRequestURI())
+						.build());
+	}
 }

src/main/java/org/swmaestro/repl/gifthub/notifications/entity/Notification.java

@@ -69,4 +69,8 @@ public Notification(Long id, User receiver, Voucher voucher, NotificationType ty
 	public void setCheckedAt(LocalDateTime checkedAt) {
 		this.checkedAt = checkedAt;
 	}
+
+	public void setDeletedAt(LocalDateTime deletedAt) {
+		this.deletedAt = deletedAt;
+	}
 }

src/main/java/org/swmaestro/repl/gifthub/notifications/repository/NotificationRepository.java

@@ -6,5 +6,5 @@
 import org.swmaestro.repl.gifthub.notifications.entity.Notification;
 
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
-	List<Notification> findAllByReceiverUsername(String username);
+	List<Notification> findAllByReceiverUsernameAndDeletedAtIsNull(String username);
 }

src/main/java/org/swmaestro/repl/gifthub/notifications/service/NotificationService.java

@@ -27,7 +27,7 @@ public List<NotificationReadResponseDto> list(String username) {
 		if (userService.read(username) == null) {
 			throw new BusinessException("존재하지 않는 회원입니다.", StatusEnum.NOT_FOUND);
 		}
-		List<Notification> notifications = notificationRepository.findAllByReceiverUsername(username);
+		List<Notification> notifications = notificationRepository.findAllByReceiverUsernameAndDeletedAtIsNull(username);
 
 		List<NotificationReadResponseDto> notificationReadResponseDtos = new ArrayList<>();
 
@@ -56,29 +56,6 @@ public NotificationReadResponseDto mapToDto(Notification notification) {
 		return notificationReadResponseDto;
 	}
 
-	// /**
-	//  * 디바이스 토큰을 저장하는 메서드
-	//  */
-	// public boolean saveDeviceToken(String username, String deviceToken) {
-	// 	try {
-	// 		deviceTokenService.save(username, deviceToken);
-	//
-	// 		return true;
-	// 	} catch (Exception e) {
-	// 		throw new BusinessException("디바이스 토큰 저장에 실패하였습니다.", StatusEnum.BAD_REQUEST);
-	// 	}
-	//
-	// }
-	//
-	// public boolean deleteDeviceToken(User user, String deviceToken) {
-	// 	try {
-	// 		deviceTokenService.delete(user, deviceToken);
-	// 		return true;
-	// 	} catch (Exception e) {
-	// 		throw new BusinessException("디바이스 토큰 삭제에 실패하였습니다.", StatusEnum.BAD_REQUEST);
-	// 	}
-	// }
-
 	/**
 	 * Notification 저장 메서드
 	 */
@@ -109,4 +86,20 @@ public NotificationReadResponseDto read(Long id, String username) {
 		notificationRepository.save(notification);
 		return notificationReadResponseDto;
 	}
+
+	/**
+	 * Notification 삭제 메서드
+	 */
+	public void delete(Long id, String username) {
+		if (userService.read(username) == null) {
+			throw new BusinessException("존재하지 않는 회원입니다.", StatusEnum.NOT_FOUND);
+		}
+		Notification notification = notificationRepository.findById(id).orElseThrow(() -> new BusinessException("존재하지 않는 알림입니다.", StatusEnum.NOT_FOUND));
+
+		if (!notification.getReceiver().getUsername().equals(username)) {
+			throw new BusinessException("알림을 삭제할 권한이 없습니다.", StatusEnum.FORBIDDEN);
+		}
+		notification.setDeletedAt(LocalDateTime.now());
+		notificationRepository.save(notification);
+	}
 }

src/main/java/org/swmaestro/repl/gifthub/notifications/service/ScheduledTasks.java

@@ -39,11 +39,18 @@ public void sendExpirationNotification() {
 			long daysDifference = ChronoUnit.DAYS.between(today, voucher.getExpiresAt());
 
 			if (daysDifference <= 3) {
+				String message;
+				if (daysDifference == 0) {
+					message = voucher.getBrand().getName() + "에서 사용할 수 있는 기프티콘이 오늘 만료됩니다.";
+				} else {
+					message = voucher.getBrand().getName() + "에서 사용할 수 있는 기프티콘 기한이 " + daysDifference + "일 남았습니다.";
+				}
+
 				FCMNotificationRequestDto requestDto = FCMNotificationRequestDto.builder()
 						.targetUser(voucher.getUser())
 						.targetVoucher(voucher)
 						.title(NotificationType.EXPIRATION.getDescription())
-						.body(voucher.getBrand().getName() + "에서 사용할 수 있는 기프티콘 기한이 " + daysDifference + "일 남았습니다.")
+						.body(message)
 						.build();
 
 				fcmNotificationService.sendNotificationByToken(requestDto);

src/main/java/org/swmaestro/repl/gifthub/vouchers/dto/VoucherReadResponseDto.java

@@ -1,20 +1,18 @@
 package org.swmaestro.repl.gifthub.vouchers.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
 import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 @Getter
-@Builder
 @ToString
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@AllArgsConstructor
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 public class VoucherReadResponseDto {
 	private Long id;
@@ -24,4 +22,19 @@ public class VoucherReadResponseDto {
 	private Integer price;
 	private Integer balance;
 	private String imageUrl;
+	@JsonProperty("is_accessible")
+	private boolean accessible;
+
+	@Builder
+	public VoucherReadResponseDto(Long id, Long productId, String barcode, String expiresAt, Integer price,
+			Integer balance, String imageUrl, boolean accessible) {
+		this.id = id;
+		this.productId = productId;
+		this.barcode = barcode;
+		this.expiresAt = expiresAt;
+		this.price = price;
+		this.balance = balance;
+		this.imageUrl = imageUrl;
+		this.accessible = accessible;
+	}
 }

src/main/java/org/swmaestro/repl/gifthub/vouchers/entity/Voucher.java

@@ -36,7 +36,7 @@ public class Voucher extends BaseTimeEntity {
 	@JoinColumn(name = "product_id", nullable = false)
 	private Product product;
 
-	@Column(length = 12, nullable = false)
+	@Column(length = 12)
 	private String barcode;
 
 	@Column

src/main/java/org/swmaestro/repl/gifthub/vouchers/service/VoucherSaveService.java

@@ -90,8 +90,10 @@ public Mono<VoucherSaveRequestDto> handleGptResponse(OCRDto ocrDto, String usern
 				System.out.println("GPT response");
 				System.out.println(voucherSaveRequestDto.getBrandName());
 				System.out.println(voucherSaveRequestDto.getProductName());
-
-				if (voucherSaveRequestDto.getBrandName() == "" || voucherSaveRequestDto.getProductName() == "") {
+				System.out.println(voucherSaveRequestDto.getBarcode());
+				System.out.println(voucherSaveRequestDto.getExpiresAt());
+				if (voucherSaveRequestDto.getBrandName() == "" || voucherSaveRequestDto.getProductName() == ""
+						|| voucherSaveRequestDto.getBarcode() == "" || voucherSaveRequestDto.getExpiresAt() == "") {
 					throw new GptResponseException("GPT 응답이 올바르지 않습니다.", StatusEnum.NOT_FOUND);
 				}
 				return Mono.just(voucherSaveRequestDto);

src/main/java/org/swmaestro/repl/gifthub/vouchers/service/VoucherService.java

@@ -108,9 +108,9 @@ public VoucherReadResponseDto read(Long id, String username) {
 		if (!vouchers.contains(voucher.get())) {
 			throw new BusinessException("상품권을 조회할 권한이 없습니다.", StatusEnum.FORBIDDEN);
 		}
-		if (voucher.get().isDeleted()) {
-			throw new BusinessException("삭제된 상품권 입니다.", StatusEnum.BAD_REQUEST);
-		}
+		// if (voucher.get().isDeleted()) {
+		// 	throw new BusinessException("삭제된 상품권 입니다.", StatusEnum.BAD_REQUEST);
+		// }
 
 		VoucherReadResponseDto voucherReadResponseDto = mapToDto(voucher.get());
 		return voucherReadResponseDto;
@@ -246,6 +246,7 @@ public boolean delete(String username, Long voucherId) {
 
 		try {
 			voucher.get().setDeletedAt(LocalDateTime.now());
+			voucher.get().setBarcode(null);
 			voucherRepository.save(voucher.get());
 			return true;
 		} catch (Exception e) {
@@ -265,6 +266,7 @@ public VoucherReadResponseDto mapToDto(Voucher voucher) {
 				.balance(voucher.getBalance())
 				.expiresAt(voucher.getExpiresAt().toString())
 				.imageUrl(voucher.getImageUrl())
+				.accessible(voucher.getDeletedAt() == null)
 				.build();
 		return voucherReadResponseDto;
 	}