Skip to content

Commit

Permalink
style: reformat code
Browse files Browse the repository at this point in the history
  • Loading branch information
JadeKim042386 committed Aug 13, 2024
1 parent 53e2d81 commit 6655200
Show file tree
Hide file tree
Showing 84 changed files with 289 additions and 233 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ public class DeadLetterConsumer {
"#{dlqAuctionPayQueue.name}",
"#{dlqReviewQueue.name}"
})
public void handleFailedMessage(
Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag, Message message) {
public void handleFailedMessage(Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag, Message message) {
log.debug("consume from dead letter queue");
log.debug("message: {}", message);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,14 @@ private void channelSend(ProceedingJoinPoint pjp, boolean ack) throws IOExceptio
long tag = (long) args[1];
if (ack) {
channel.basicAck(tag, false);
log.debug("Successfully sent ack after \"{}\" method", pjp.getSignature().getName());
log.debug(
"Successfully sent ack after \"{}\" method",
pjp.getSignature().getName());
} else {
channel.basicReject(tag, false);
log.warn("Sent reject after \"{}\" method due to error", pjp.getSignature().getName());
log.warn(
"Sent reject after \"{}\" method due to error",
pjp.getSignature().getName());
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package freshtrash.freshtrashbackend.domain.alarm.controller;

import freshtrash.freshtrashbackend.domain.alarm.dto.response.AlarmResponse;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.alarm.service.AlarmService;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public enum AlarmMessage {
// 경매
NOT_COMPLETED_AUCTION_MESSAGE("🌫️경매 [%s]가 입찰된 내역이 없습니다."),
COMPLETE_BID_AUCTION_MESSAGE("🎉경매 [%s]가 낙찰되었습니다."),
REQUEST_PAY_AUCTION_MESSAGE("🎉축하합니다! 경매 [%s]가 낙찰되었습니다. 이 알림 메시지를 클릭하여 결제 페이지로 이동해 결제를 진행해주세요. 24시간 이내에 결제를 완료해주세요."),
REQUEST_PAY_AUCTION_MESSAGE(
"🎉축하합니다! 경매 [%s]가 낙찰되었습니다. 이 알림 메시지를 클릭하여 결제 페이지로 이동해 결제를 진행해주세요. 24시간 이내에 결제를 완료해주세요."),
CANCEL_AUCTION_MESSAGE("❌경매 [%s]가 취소되었습니다."),
REVIEW_FROM_BUYER_MESSAGE("📦작성된 상품 리뷰가 있습니다."),
// 경매 - 결제
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package freshtrash.freshtrashbackend.domain.alarm.dto.request;

import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import lombok.Builder;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package freshtrash.freshtrashbackend.domain.alarm.dto.request;

import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import freshtrash.freshtrashbackend.domain.alarm.dto.request.BaseAlarmPayload;
import freshtrash.freshtrashbackend.domain.alarm.dto.response.AlarmResponse;
import freshtrash.freshtrashbackend.domain.alarm.entity.Alarm;
import freshtrash.freshtrashbackend.global.exception.AlarmException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import freshtrash.freshtrashbackend.domain.alarm.repository.AlarmRepository;
import freshtrash.freshtrashbackend.domain.alarm.repository.EmitterRepository;
import freshtrash.freshtrashbackend.global.exception.AlarmException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package freshtrash.freshtrashbackend.domain.alarm.service;

import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.domain.alarm.service.template.AuctionAlarmTemplate;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package freshtrash.freshtrashbackend.domain.alarm.service;

import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.alarm.service.template.AuctionAlarmTemplate;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.domain.auction.service.BiddingHistoryService;
import freshtrash.freshtrashbackend.domain.alarm.service.template.AuctionAlarmTemplate;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package freshtrash.freshtrashbackend.domain.alarm.service;

import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.alarm.service.template.BiddingHistoryAlarmTemplate;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package freshtrash.freshtrashbackend.domain.alarm.service;

import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.member.entity.Member;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.alarm.service.template.BiddingHistoryAlarmTemplate;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.domain.auction.service.BiddingHistoryService;
import freshtrash.freshtrashbackend.domain.member.entity.Member;
import freshtrash.freshtrashbackend.domain.member.service.MemberService;
import freshtrash.freshtrashbackend.domain.alarm.service.template.BiddingHistoryAlarmTemplate;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package freshtrash.freshtrashbackend.domain.alarm.service;

import freshtrash.freshtrashbackend.domain.member.entity.Member;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.member.service.MemberService;
import freshtrash.freshtrashbackend.domain.alarm.service.template.ChatAlarmTemplate;
import freshtrash.freshtrashbackend.domain.member.entity.Member;
import freshtrash.freshtrashbackend.domain.member.service.MemberService;
import freshtrash.freshtrashbackend.producer.ChatProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package freshtrash.freshtrashbackend.domain.alarm.service.adapter;

import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.global.exception.AlarmException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AuctionAlarmParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.BiddingHistoryAlarmParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.ChatAlarmParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.ProductAlarmParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.template.AlarmTemplate;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.global.exception.AlarmException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.context.ApplicationContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
package freshtrash.freshtrashbackend.domain.alarm.service.parameter;

public interface AlarmTemplateParameter {
}
public interface AlarmTemplateParameter {}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

public interface AlarmTemplate {
void sendAlarm(AlarmTemplateParameter param);

boolean supports(AlarmType alarmType);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package freshtrash.freshtrashbackend.domain.alarm.service.template;

import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AlarmTemplateParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AuctionAlarmParameter;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package freshtrash.freshtrashbackend.domain.alarm.service.template;

import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AlarmTemplateParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.BiddingHistoryAlarmParameter;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package freshtrash.freshtrashbackend.domain.alarm.service.template;

import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.member.service.MemberService;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AlarmTemplateParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.ChatAlarmParameter;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.member.service.MemberService;
import freshtrash.freshtrashbackend.producer.ChatProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package freshtrash.freshtrashbackend.domain.alarm.service.template;

import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AlarmTemplateParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.ProductAlarmParameter;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.chatRoom.service.ChatRoomService;
import freshtrash.freshtrashbackend.domain.product.service.ProductDealService;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.AlarmTemplateParameter;
import freshtrash.freshtrashbackend.domain.alarm.service.parameter.ProductAlarmParameter;
import freshtrash.freshtrashbackend.producer.ProductDealProducer;
import lombok.RequiredArgsConstructor;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import freshtrash.freshtrashbackend.domain.auction.dto.request.AuctionRequest;
import freshtrash.freshtrashbackend.domain.auction.dto.request.BiddingRequest;
import freshtrash.freshtrashbackend.domain.auction.dto.response.AuctionResponse;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionEventService;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionService;
import freshtrash.freshtrashbackend.domain.auction.service.BiddingHistoryService;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import freshtrash.freshtrashbackend.domain.auction.dto.request.AuctionReviewRequest;
import freshtrash.freshtrashbackend.domain.auction.dto.response.AuctionReviewResponse;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.auction.service.AuctionReviewService;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package freshtrash.freshtrashbackend.domain.auction.dto.request;

import freshtrash.freshtrashbackend.domain.alarm.dto.request.BaseAlarmPayload;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package freshtrash.freshtrashbackend.domain.auction.dto.response;

import freshtrash.freshtrashbackend.domain.member.dto.response.MemberResponse;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.entity.constants.AuctionStatus;
import freshtrash.freshtrashbackend.domain.member.dto.response.MemberResponse;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.product.entity.constants.ProductCategory;
import freshtrash.freshtrashbackend.domain.product.entity.constants.ProductStatus;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package freshtrash.freshtrashbackend.domain.auction.service;

import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.member.entity.constants.UserRole;
import freshtrash.freshtrashbackend.domain.alarm.service.adapter.AlarmMappingHandlerAdapter;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.member.entity.constants.UserRole;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import freshtrash.freshtrashbackend.domain.auction.dto.request.AuctionReviewRequest;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.entity.AuctionReview;
import freshtrash.freshtrashbackend.domain.auction.repository.AuctionReviewRepository;
import freshtrash.freshtrashbackend.global.exception.ReviewException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import freshtrash.freshtrashbackend.domain.auction.repository.AuctionReviewRepository;
import freshtrash.freshtrashbackend.producer.AuctionProducer;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
import freshtrash.freshtrashbackend.domain.auction.controller.constants.AuctionMemberType;
import freshtrash.freshtrashbackend.domain.auction.dto.request.AuctionRequest;
import freshtrash.freshtrashbackend.domain.auction.dto.response.AuctionResponse;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.auction.entity.Auction;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.auction.repository.AuctionRepository;
import freshtrash.freshtrashbackend.domain.member.dto.security.MemberPrincipal;
import freshtrash.freshtrashbackend.domain.member.entity.constants.UserRole;
import freshtrash.freshtrashbackend.global.exception.AuctionException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import freshtrash.freshtrashbackend.domain.auction.repository.AuctionRepository;
import freshtrash.freshtrashbackend.global.infra.file.FileService;
import freshtrash.freshtrashbackend.global.utils.FileUtils;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package freshtrash.freshtrashbackend.domain.auction.service;

import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.alarm.entity.constants.AlarmType;
import freshtrash.freshtrashbackend.domain.alarm.service.adapter.AlarmMappingHandlerAdapter;
import freshtrash.freshtrashbackend.domain.auction.entity.BiddingHistory;
import freshtrash.freshtrashbackend.domain.auction.repository.BiddingHistoryRepository;
import freshtrash.freshtrashbackend.global.exception.BiddingHistoryException;
import freshtrash.freshtrashbackend.global.exception.constants.ErrorCode;
import freshtrash.freshtrashbackend.domain.auction.repository.BiddingHistoryRepository;
import freshtrash.freshtrashbackend.domain.alarm.service.adapter.AlarmMappingHandlerAdapter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
package freshtrash.freshtrashbackend.domain.chatMessage.dto.request;

public record ChatMessageRequest(
String message
) {
}
public record ChatMessageRequest(String message) {}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@

import java.time.LocalDateTime;

public record ChatMessageResponse(String message, Long sentMemberId, String sentMemberNickname, LocalDateTime createdAt) {
public record ChatMessageResponse(
String message, Long sentMemberId, String sentMemberNickname, LocalDateTime createdAt) {
public static ChatMessageResponse fromEntity(ChatMessage chatMessage) {
return new ChatMessageResponse(chatMessage.getMessage(), chatMessage.getMember().getId(), chatMessage.getMember().getNickname(), chatMessage.getCreatedAt());
return new ChatMessageResponse(
chatMessage.getMessage(),
chatMessage.getMember().getId(),
chatMessage.getMember().getNickname(),
chatMessage.getCreatedAt());
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package freshtrash.freshtrashbackend.domain.chatMessage.entity;

import freshtrash.freshtrashbackend.domain.member.entity.Member;
import freshtrash.freshtrashbackend.domain.chatRoom.entity.ChatRoom;
import freshtrash.freshtrashbackend.domain.member.entity.Member;
import freshtrash.freshtrashbackend.global.common.audit.CreatedAt;
import lombok.*;

Expand Down
Loading

0 comments on commit 6655200

Please sign in to comment.