[BE] 로그 중복 작성 제거, 비즈니스 로직 내 로그 추가(#608)

backend/src/main/java/corea/auth/service/LoginService.java

@@ -8,12 +8,14 @@
 import corea.member.domain.Member;
 import corea.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import static corea.exception.ExceptionType.INVALID_TOKEN;
 import static corea.exception.ExceptionType.TOKEN_EXPIRED;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -35,7 +37,12 @@ public TokenInfo login(GithubUserInfo userInfo) {
     }
 
     private Member register(GithubUserInfo userInfo) {
-        return memberRepository.save(new Member(userInfo.login(), userInfo.avatarUrl(), userInfo.name(), userInfo.email(), true, userInfo.id()));
+        Member member = memberRepository.save(new Member(userInfo.login(), userInfo.avatarUrl(), userInfo.name(), userInfo.email(), true, userInfo.id()));
+        createLog(member);
+        return member;
+    }
+    private static void createLog(Member member){
+        log.info("멤버를 생성했습니다. 멤버 id={}, 멤버 이름={},깃허브 id={}, 닉네임={}",member.getId(),member.getName(),member.getGithubUserId(),member.getUsername());
     }
 
     private String extendAuthorization(Member member) {

backend/src/main/java/corea/feedback/service/DevelopFeedbackService.java

@@ -27,7 +27,7 @@ public class DevelopFeedbackService {
     @Transactional
     public DevelopFeedbackResponse create(long roomId, long deliverId, DevelopFeedbackRequest request) {
         validateAlreadyExist(roomId, deliverId, request.receiverId());
-        log.debug("개발 피드백 작성[작성자({}), 요청값({})", deliverId, request);
+        log.info("개발 피드백 작성[작성자({}), 요청값({})", deliverId, request);
 
         MatchResult matchResult = matchResultRepository.findByRoomIdAndReviewerIdAndRevieweeId(roomId, deliverId, request.receiverId())
                 .orElseThrow(() -> new CoreaException(ExceptionType.NOT_MATCHED_MEMBER));
@@ -50,7 +50,7 @@ private DevelopFeedback saveDevelopFeedback(long roomId, DevelopFeedbackRequest
 
     @Transactional
     public DevelopFeedbackResponse update(long feedbackId, long deliverId, DevelopFeedbackRequest request) {
-        log.debug("개발 피드백 업데이트[작성자({}), 피드백 ID({}), 요청값({})", deliverId, feedbackId, request);
+        log.info("개발 피드백 업데이트[작성자({}), 피드백 ID({}), 요청값({})", deliverId, feedbackId, request);
 
         DevelopFeedback feedback = developFeedbackRepository.findById(feedbackId)
                 .orElseThrow(() -> new CoreaException(ExceptionType.FEEDBACK_NOT_FOUND));

backend/src/main/java/corea/feedback/service/SocialFeedbackService.java

@@ -27,7 +27,7 @@ public class SocialFeedbackService {
     @Transactional
     public SocialFeedbackResponse create(long roomId, long deliverId, SocialFeedbackRequest request) {
         validateAlreadyExist(roomId, deliverId, request.receiverId());
-        log.debug("소설 피드백 작성[작성자({}), 요청값({})", deliverId, request);
+        log.info("소설 피드백 작성[작성자({}), 요청값({})", deliverId, request);
 
         MatchResult matchResult = matchResultRepository.findByRoomIdAndReviewerIdAndRevieweeId(roomId, request.receiverId(), deliverId)
                 .orElseThrow(() -> new CoreaException(ExceptionType.NOT_MATCHED_MEMBER));
@@ -50,7 +50,7 @@ private SocialFeedback saveSocialFeedback(long roomId, SocialFeedbackRequest req
 
     @Transactional
     public SocialFeedbackResponse update(long feedbackId, long deliverId, SocialFeedbackRequest request) {
-        log.debug("소설 피드백 업데이트[작성자({}), 피드백 ID({}), 요청값({})", deliverId, feedbackId, request);
+        log.info("소설 피드백 업데이트[작성자({}), 피드백 ID({}), 요청값({})", deliverId, feedbackId, request);
 
         SocialFeedback feedback = socialFeedbackRepository.findById(feedbackId)
                 .orElseThrow(() -> new CoreaException(ExceptionType.FEEDBACK_NOT_FOUND));

backend/src/main/java/corea/matching/domain/ParticipationFilter.java

@@ -3,10 +3,12 @@
 import corea.exception.CoreaException;
 import corea.exception.ExceptionType;
 import corea.participation.domain.Participation;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 public class ParticipationFilter {
 
     private final List<Participation> participations;
@@ -51,6 +53,7 @@ private List<Participation> findPRSubmittedParticipation(PullRequestInfo pullReq
 
     private void invalidateIfNotSubmitPR(PullRequestInfo pullRequestInfo, Participation participation) {
         if (!hasSubmittedPR(pullRequestInfo, participation)) {
+            log.warn("매칭에 실패 했습니다. 방 id={},사용자 id={},사용자 깃허브 닉네임={}",participation.getRoomsId(),participation.getMembersId(),participation.getMember().getUsername());
             participation.invalidate();
         }
     }

backend/src/main/java/corea/matching/service/MatchingService.java

@@ -38,6 +38,7 @@ public List<MatchResult> match(long roomId, PullRequestInfo pullRequestInfo) {
         room.updateStatusToProgress();
 
         List<MatchResult> matchResults = matchPairs(room, pullRequestInfo);
+        logMatchResults(roomId,matchResults);
         return matchResultRepository.saveAll(matchResults);
     }
 
@@ -54,6 +55,19 @@ private List<MatchResult> matchPairs(Room room, PullRequestInfo pullRequestInfo)
                 .toList();
     }
 
+    private void logMatchResults(long roomId, List<MatchResult> matchResults) {
+        StringBuilder logMessage = new StringBuilder();
+        logMessage.append("매칭 결과 [방 번호: ").append(roomId).append("]\n");
+
+        matchResults.forEach(result ->
+                logMessage.append("리뷰어: ").append(result.getReviewer().getUsername())
+                        .append(", 리뷰이: ").append(result.getReviewee().getUsername())
+                        .append(", PR 링크: ").append(result.getPrLink()).append("\n")
+        );
+
+        log.info(logMessage.toString());
+    }
+
     private List<Participation> findPRSubmittedParticipation(Room room, PullRequestInfo pullRequestInfo) {
         List<Participation> participations = participationRepository.findAllByRoom(room)
                 .stream()

backend/src/main/java/corea/member/domain/MemberRole.java

@@ -2,6 +2,7 @@
 
 import corea.exception.CoreaException;
 import corea.exception.ExceptionType;
+import corea.participation.domain.ParticipationStatus;
 
 public enum MemberRole {
 
@@ -22,4 +23,11 @@ public static MemberRole from(String role) {
     public boolean isReviewer() {
         return this == REVIEWER;
     }
+
+    public ParticipationStatus getParticipationStatus() {
+        return switch (this) {
+            case REVIEWER,REVIEWEE,BOTH -> ParticipationStatus.PARTICIPATED;
+            case NONE -> ParticipationStatus.NOT_PARTICIPATED;
+        };
+    }
 }

backend/src/main/java/corea/participation/domain/Participation.java

@@ -40,14 +40,16 @@ public class Participation extends BaseTimeEntity {
 
     private int matchingSize;
 
+    public Participation(Room room, Member member, MemberRole memberRole, ParticipationStatus status, int matchingSize) {
+        this(null,room,member,memberRole,status,matchingSize);
+    }
+
     public Participation(Room room, Member member, MemberRole role, int matchingSize) {
         this(null, room, member, role, ParticipationStatus.PARTICIPATED, matchingSize);
-        debug(room.getId(), member.getId());
     }
 
     public Participation(Room room, Member member) {
         this(null, room, member, MemberRole.REVIEWER, ParticipationStatus.MANAGER, room.getMatchingSize());
-        debug(room.getId(), member.getId());
     }
 
     public boolean isNotMatchingMemberId(long memberId) {
@@ -90,7 +92,4 @@ public String getMemberGithubId() {
         return member.getGithubUserId();
     }
 
-    private static void debug(long roomId, long memberId) {
-        log.debug("참가자 생성[방 ID={}, 멤버 ID={}", roomId, memberId);
-    }
 }

backend/src/main/java/corea/participation/service/ParticipationService.java

@@ -21,6 +21,7 @@
 public class ParticipationService {
 
     private final ParticipationRepository participationRepository;
+    private final ParticipationWriter participationWriter;
     private final RoomRepository roomRepository;
     private final MemberRepository memberRepository;
 
@@ -34,23 +35,16 @@ private Participation saveParticipation(ParticipationRequest request) {
         Member member = memberRepository.findById(request.memberId())
                 .orElseThrow(() -> new CoreaException(ExceptionType.MEMBER_NOT_FOUND));
         MemberRole memberRole = MemberRole.from(request.role());
+        Room room = getRoom(request.roomId());
 
-        Participation participation = new Participation(getRoom(request.roomId()), member, memberRole, request.matchingSize());
-        participation.participate();
+        Participation participation = participationWriter.create(room,member, memberRole,request.matchingSize());
         return participationRepository.save(participation);
     }
 
     @Transactional
     public void cancel(long roomId, long memberId) {
         validateMemberExist(memberId);
-        deleteParticipation(roomId, memberId);
-    }
-
-    private void deleteParticipation(long roomId, long memberId) {
-        Participation participation = participationRepository.findByRoomIdAndMemberId(roomId, memberId)
-                .orElseThrow(() -> new CoreaException(ExceptionType.NOT_ALREADY_APPLY));
-        participation.cancel();
-        participationRepository.delete(participation);
+        participationWriter.delete(roomId, memberId);
     }
 
     private void validateIdExist(long roomId, long memberId) {

backend/src/main/java/corea/participation/service/ParticipationWriter.java

@@ -0,0 +1,57 @@
+package corea.participation.service;
+
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
+import corea.member.domain.Member;
+import corea.member.domain.MemberRole;
+import corea.participation.domain.Participation;
+import corea.participation.domain.ParticipationStatus;
+import corea.participation.repository.ParticipationRepository;
+import corea.room.domain.Room;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+@Transactional
+public class ParticipationWriter {
+
+    private final ParticipationRepository participationRepository;
+
+    public Participation create(Room room, Member member, MemberRole memberRole,ParticipationStatus participationStatus) {
+
+        return create(room, member, memberRole,participationStatus, room.getMatchingSize());
+    }
+
+    public Participation create(Room room, Member member, MemberRole memberRole, int matchingSize) {
+        return create(room, member, memberRole,memberRole.getParticipationStatus(),matchingSize);
+    }
+
+    private Participation create(Room room, Member member, MemberRole memberRole, ParticipationStatus participationStatus, int matchingSize) {
+        Participation participation = participationRepository.save(new Participation(room, member, memberRole, participationStatus, matchingSize));
+        participation.participate();
+        createLog(participation);
+        return participation;
+    }
+
+    // TODO 객체 두개를 넣어서 삭제하는 방향으로 변경 해야합니다.
+    // 현재, 로직상 cancel 호출 시, 의도하지 않는 room 조회문 발생
+    public void delete(long roomId, long memberId) {
+        Participation participation = participationRepository.findByRoomIdAndMemberId(roomId, memberId)
+                .orElseThrow(() -> new CoreaException(ExceptionType.NOT_ALREADY_APPLY));
+        participation.cancel();
+        deleteLog(participation);
+        participationRepository.delete(participation);
+    }
+
+    private static void createLog(Participation participation) {
+        log.info("방에 참가했습니다. id={}, 방 id={}, 참가한 사용자 id={}, 역할={}, 원하는 매칭 인원={}", participation.getId(), participation.getRoomsId(), participation.getMembersId(), participation.getMemberRole(), participation.getMatchingSize());
+    }
+
+    private static void deleteLog(Participation participation) {
+        log.info("참여를 취소했습니다. 방 id={}, 참가한 사용자 id={}", participation.getRoomsId(), participation.getMembersId());
+    }
+}

backend/src/main/java/corea/room/service/RoomService.java

@@ -10,9 +10,8 @@
 import corea.participation.domain.Participation;
 import corea.participation.domain.ParticipationStatus;
 import corea.participation.repository.ParticipationRepository;
+import corea.participation.service.ParticipationWriter;
 import corea.room.domain.Room;
-import corea.room.domain.RoomClassification;
-import corea.room.domain.RoomStatus;
 import corea.room.dto.*;
 import corea.room.repository.RoomRepository;
 import corea.scheduler.domain.AutomaticMatching;
@@ -21,8 +20,6 @@
 import corea.scheduler.repository.AutomaticUpdateRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +45,7 @@ public class RoomService {
     private final FailedMatchingRepository failedMatchingRepository;
     private final AutomaticMatchingRepository automaticMatchingRepository;
     private final AutomaticUpdateRepository automaticUpdateRepository;
+    private final ParticipationWriter participationWriter;
 
     @Transactional
     public RoomResponse create(long memberId, RoomCreateRequest request) {
@@ -56,9 +54,10 @@ public RoomResponse create(long memberId, RoomCreateRequest request) {
         Member manager = memberRepository.findById(memberId)
                 .orElseThrow(() -> new CoreaException(ExceptionType.MEMBER_NOT_FOUND));
         Room room = roomRepository.save(request.toEntity(manager));
-        Participation participation = new Participation(room, manager);
+        log.info("방을 생성했습니다. 방 생성자 id={}, 요청한 사용자 id={}", room.getManagerId(), memberId);
+
+        Participation participation = participationWriter.create(room,manager,MemberRole.REVIEWER,ParticipationStatus.MANAGER);
 
-        participationRepository.save(participation);
         automaticMatchingRepository.save(new AutomaticMatching(room.getId(), request.recruitmentDeadline()));
         automaticUpdateRepository.save(new AutomaticUpdate(room.getId(), request.reviewDeadline()));
 
@@ -112,6 +111,7 @@ public void delete(long roomId, long memberId) {
         Room room = getRoom(roomId);
         validateDeletionAuthority(room, memberId);
 
+        log.info("방을 삭제했습니다. 방 id={}, 사용자 iD={}", roomId, memberId);
         roomRepository.delete(room);
         participationRepository.deleteAllByRoomId(roomId);
         automaticMatchingRepository.deleteByRoomId(roomId);

backend/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     <springProfile name="dev">
         <include resource="logs/loki-appender.xml"/>
 
-        <logger name="corea" level="DEBUG">
+        <logger name="corea" level="DEBUG" additivity="false">
             <appender-ref ref="LOKI"/>
         </logger>
 
@@ -42,7 +42,7 @@
         <include resource="logs/file-warn-appender.xml"/>
         <include resource="logs/file-error-appender.xml"/>
 
-        <logger name="corea" level="INFO">
+        <logger name="corea" level="INFO" additivity="false">
             <appender-ref ref="LOKI"/>
             <appender-ref ref="FILE-INFO"/>
             <appender-ref ref="FILE-WARN"/>