Merge pull request #189 from SSASINSA/feature/184_metrics_eventapproval_nplus1

[Refactor]이벤트 승인요청 단방향 전환(#184)

Author: EomYoosang

src/main/java/com/ssasinsa/wearagain/domain/event/entity/Event.java

@@ -14,7 +14,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -81,9 +80,6 @@ public class Event extends BaseTimeEntity {
     @BatchSize(size = 50)
     private List<EventImage> images = new ArrayList<>();
 
-    @OneToOne(mappedBy = "event", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-    private EventApprovalRequest approvalRequest;
-
     @Column(name = "usage_guide", columnDefinition = "TEXT")
     private String usageGuide;
 

src/main/java/com/ssasinsa/wearagain/domain/event/repository/EventApprovalRequestRepository.java

@@ -4,6 +4,8 @@
 import com.ssasinsa.wearagain.domain.event.entity.EventStatus;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -16,6 +18,8 @@ public interface EventApprovalRequestRepository extends JpaRepository<EventAppro
 
     List<EventApprovalRequest> findByEvent_StatusAndProcessedAtIsNullOrderByCreatedAtDesc(EventStatus status);
 
+    Optional<EventApprovalRequest> findByEvent_Id(Long eventId);
+
     @Query("""
             select request from EventApprovalRequest request
             where request.processedAt is null

src/main/java/com/ssasinsa/wearagain/domain/event/repository/EventRepository.java

@@ -50,21 +50,13 @@ List<Event> findApprovedEventsToOpen(
             select distinct e
             from Event e
             left join fetch e.organizerAdmin oa
-            left join fetch e.approvalRequest ar
-            left join fetch ar.requestingAdmin
-            left join fetch ar.processedByAdmin
             left join fetch e.options o1
             where e.id = :id
             """)
     Optional<Event> findWithDetailsById(@Param("id") Long id);
 
     @Override
-    @EntityGraph(attributePaths = {
-            "organizerAdmin",
-            "approvalRequest",
-            "approvalRequest.requestingAdmin",
-            "approvalRequest.processedByAdmin"
-    })
+    @EntityGraph(attributePaths = {"organizerAdmin"})
     Page<Event> findAll(Specification<Event> spec, Pageable pageable);
 
     long countByStatusIn(Collection<EventStatus> statuses);

src/main/java/com/ssasinsa/wearagain/domain/event/service/EventAdminServiceImpl.java

@@ -774,7 +774,8 @@ private void resetApprovalRequest(Event event) {
         if (event.getStatus() != EventStatus.DRAFT) {
             event.changeStatus(EventStatus.DRAFT);
         }
-        EventApprovalRequest approvalRequest = event.getApprovalRequest();
+        EventApprovalRequest approvalRequest = eventApprovalRequestRepository.findByEvent_Id(event.getId())
+                .orElse(null);
         if (approvalRequest == null) {
             EventApprovalRequest newRequest = EventApprovalRequest.create(event, organizer);
             eventApprovalRequestRepository.save(newRequest);
@@ -1077,7 +1078,7 @@ public MessageResponse approveApprovalRequest(Long approvalRequestId, Long admin
         AdminUser admin = adminUserRepository.findById(adminId)
                 .orElseThrow(() -> new EventException(EventErrorCode.EVENT_NOT_FOUND));
 
-        if (admin.getRole() != AdminRole.SUPER_ADMIN) {
+        if (admin.getRole() == AdminRole.MANAGER) {
             throw new EventException(EventErrorCode.EVENT_STATUS_UPDATE_FORBIDDEN);
         }
 

src/test/java/com/ssasinsa/wearagain/domain/event/service/EventAdminServiceImplTest.java

@@ -554,7 +554,7 @@ void should_reset_existing_approval_request_when_manager_updates_event() {
         AdminUser reviewer = AdminUser.createSuperAdmin("reviewer@wearagain.kr", "encoded", "검토 관리자");
         ReflectionTestUtils.setField(reviewer, "id", 55L);
         approvalRequest.approve(reviewer, LocalDateTime.now().minusDays(1), EventStatus.OPEN);
-        ReflectionTestUtils.setField(event, "approvalRequest", approvalRequest);
+        when(eventApprovalRequestRepository.findByEvent_Id(101L)).thenReturn(java.util.Optional.of(approvalRequest));
 
         EventAdminUpdateRequest request = new EventAdminUpdateRequest(
                 "매니저 수정",