Merge pull request #410 from depromeet/develop

mikekks · web-flow · commit 08e7ec739cf6 · 2025-07-18T16:08:37.000+09:00
v1.3.83
diff --git a/layer-admin/src/main/java/org/layer/admin/common/CommonController.java b/layer-admin/src/main/java/org/layer/admin/common/CommonController.java
@@ -0,0 +1,36 @@
+package org.layer.admin.common;
+
+import org.layer.admin.member.repository.AdminMemberRepository;
+import org.layer.admin.retrospect.repository.AdminRetrospectAnswerRepository;
+import org.layer.admin.retrospect.repository.AdminRetrospectRepository;
+import org.layer.admin.space.repository.AdminSpaceRepository;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class CommonController {
+
+	// 간단한 기능이기에 바로 repository를 사용합니다.
+	private final AdminMemberRepository adminMemberRepository;
+	private final AdminSpaceRepository adminSpaceRepository;
+	private final AdminRetrospectRepository adminRetrospectRepository;
+	private final AdminRetrospectAnswerRepository adminRetrospectAnswerRepository;
+
+
+	@GetMapping("/admin/outline")
+	public ResponseEntity<OutlineResponse> getOutline() {
+
+		return ResponseEntity.ok(
+			new OutlineResponse(
+				adminMemberRepository.count(),
+				adminSpaceRepository.count(),
+				adminRetrospectRepository.count(),
+				adminRetrospectAnswerRepository.count()
+			)
+		);
+	}
+}
diff --git a/layer-admin/src/main/java/org/layer/admin/common/OutlineResponse.java b/layer-admin/src/main/java/org/layer/admin/common/OutlineResponse.java
@@ -0,0 +1,9 @@
+package org.layer.admin.common;
+
+public record OutlineResponse(
+	long totalMemberCount,
+	long totalSpaceCount,
+	long totalRetrospectCount,
+	long totalRetrospectAnswerCount
+) {
+}
diff --git a/layer-admin/src/main/java/org/layer/admin/common/UserOnlyEventListener.java b/layer-admin/src/main/java/org/layer/admin/common/UserOnlyEventListener.java
@@ -0,0 +1,11 @@
+package org.layer.admin.common;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UserOnlyEventListener {
+}
diff --git a/layer-admin/src/main/java/org/layer/admin/common/UserOnlyEventListenerAspect.java b/layer-admin/src/main/java/org/layer/admin/common/UserOnlyEventListenerAspect.java
@@ -0,0 +1,44 @@
+package org.layer.admin.common;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.layer.admin.member.entity.AdminMemberRole;
+import org.layer.admin.member.entity.AdminMemberSignupHistory;
+import org.layer.admin.member.repository.AdminMemberRepository;
+import org.layer.event.BaseEvent;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+
+@Aspect
+@Component
+@RequiredArgsConstructor
+public class UserOnlyEventListenerAspect {
+
+	private final AdminMemberRepository adminMemberRepository;
+
+	@Around("@annotation(UserOnlyEventListener) && @annotation(org.springframework.context.event.EventListener)")
+	public Object skipIfAdminRole(ProceedingJoinPoint joinPoint) throws Throwable {
+		Object[] args = joinPoint.getArgs();
+		if (args.length == 0) return joinPoint.proceed();
+
+		if (!(args[0] instanceof BaseEvent event)) {
+			return joinPoint.proceed();
+		}
+
+		Long memberId = event.memberId();
+		if (memberId == null) return joinPoint.proceed();
+
+		AdminMemberRole role = adminMemberRepository.findById(memberId)
+			.map(AdminMemberSignupHistory::getMemberRole)
+			.orElse(null);
+
+		if (role == AdminMemberRole.ADMIN) {
+			// 🔥 ADMIN이면 스킵
+			return null;
+		}
+
+		return joinPoint.proceed();
+	}
+}
diff --git a/layer-admin/src/main/java/org/layer/admin/member/entity/AdminMemberRole.java b/layer-admin/src/main/java/org/layer/admin/member/entity/AdminMemberRole.java
@@ -0,0 +1,20 @@
+package org.layer.admin.member.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum AdminMemberRole {
+	USER,
+	ADMIN;
+
+	public static AdminMemberRole fromString(String role) {
+		for (AdminMemberRole memberRole : values()) {
+			if (memberRole.name().equalsIgnoreCase(role)) {
+				return memberRole;
+			}
+		}
+		throw new IllegalArgumentException("Unknown role: " + role);
+	}
+}
diff --git a/layer-admin/src/main/java/org/layer/admin/member/entity/AdminMemberSignupHistory.java b/layer-admin/src/main/java/org/layer/admin/member/entity/AdminMemberSignupHistory.java
@@ -3,6 +3,8 @@
 import java.time.LocalDateTime;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -29,10 +31,20 @@ public class AdminMemberSignupHistory {
 	@NotNull
 	private String eventId;
 
+	@NotNull
+	@Enumerated(EnumType.STRING)
+	private AdminMemberRole memberRole;
+
 	@Builder
-	private AdminMemberSignupHistory(LocalDateTime eventTime, Long memberId, String eventId) {
+	private AdminMemberSignupHistory(
+		LocalDateTime eventTime,
+		Long memberId,
+		String eventId,
+		AdminMemberRole memberRole
+	) {
 		this.eventTime = eventTime;
 		this.memberId = memberId;
 		this.eventId = eventId;
+		this.memberRole = memberRole;
 	}
 }
diff --git a/layer-admin/src/main/java/org/layer/admin/member/listener/SignUpEventListener.java b/layer-admin/src/main/java/org/layer/admin/member/listener/SignUpEventListener.java
@@ -1,5 +1,6 @@
 package org.layer.admin.member.listener;
 
+import org.layer.admin.common.UserOnlyEventListener;
 import org.layer.admin.member.service.AdminMemberService;
 import org.layer.event.member.SignUpEvent;
 import org.springframework.context.event.EventListener;
@@ -12,6 +13,7 @@
 public class SignUpEventListener {
 	private final AdminMemberService adminMemberService;
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleSignUp(SignUpEvent event) {
 		adminMemberService.saveMemberSignUp(event);
diff --git a/layer-admin/src/main/java/org/layer/admin/member/service/AdminMemberService.java b/layer-admin/src/main/java/org/layer/admin/member/service/AdminMemberService.java
@@ -8,6 +8,7 @@
 import java.util.stream.Collectors;
 
 import org.layer.admin.member.controller.dto.MemberSignupCountResponse;
+import org.layer.admin.member.entity.AdminMemberRole;
 import org.layer.admin.member.entity.AdminMemberSignupHistory;
 import org.layer.admin.member.repository.AdminMemberRepository;
 import org.layer.event.member.SignUpEvent;
@@ -53,6 +54,7 @@ public void saveMemberSignUp(SignUpEvent event) {
 			.eventId(event.eventId())
 			.eventTime(event.eventTime())
 			.memberId(event.memberId())
+			.memberRole(AdminMemberRole.fromString(event.memberRole()))
 			.build();
 
 		adminMemberRepository.save(adminMemberSignupHistory);
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/listener/AnswerRetrospectEventListener.java b/layer-admin/src/main/java/org/layer/admin/retrospect/listener/AnswerRetrospectEventListener.java
@@ -1,5 +1,6 @@
 package org.layer.admin.retrospect.listener;
 
+import org.layer.admin.common.UserOnlyEventListener;
 import org.layer.admin.retrospect.service.AdminRetrospectService;
 import org.layer.event.retrospect.AnswerRetrospectEndEvent;
 import org.layer.event.retrospect.AnswerRetrospectStartEvent;
@@ -13,11 +14,13 @@
 public class AnswerRetrospectEventListener {
 	private final AdminRetrospectService adminRetrospectService;
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleWriteRetrospectStart(AnswerRetrospectStartEvent event) {
 		adminRetrospectService.saveRetrospectAnswerHistory(event);
 	}
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleWriteRetrospectEnd(AnswerRetrospectEndEvent event) {
 		adminRetrospectService.updateRetrospectAnswerHistory(event);
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/listener/CreateRetrospectEventListener.java b/layer-admin/src/main/java/org/layer/admin/retrospect/listener/CreateRetrospectEventListener.java
@@ -1,5 +1,6 @@
 package org.layer.admin.retrospect.listener;
 
+import org.layer.admin.common.UserOnlyEventListener;
 import org.layer.admin.retrospect.service.AdminRetrospectService;
 import org.layer.event.retrospect.CreateRetrospectEvent;
 import org.springframework.context.event.EventListener;
@@ -12,6 +13,7 @@
 public class CreateRetrospectEventListener {
 	private final AdminRetrospectService adminRetrospectService;
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleWriteRetrospectStart(CreateRetrospectEvent event) {
 		adminRetrospectService.saveRetrospectHistory(event);
diff --git a/layer-admin/src/main/java/org/layer/admin/space/listener/SpaceEventListener.java b/layer-admin/src/main/java/org/layer/admin/space/listener/SpaceEventListener.java
@@ -1,5 +1,6 @@
 package org.layer.admin.space.listener;
 
+import org.layer.admin.common.UserOnlyEventListener;
 import org.layer.admin.space.service.AdminSpaceService;
 import org.layer.event.space.CreateSpaceEvent;
 import org.layer.event.space.JoinSpaceEvent;
@@ -14,16 +15,19 @@
 public class SpaceEventListener {
 	private final AdminSpaceService adminSpaceService;
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleSignUp(CreateSpaceEvent event) {
 		adminSpaceService.saveSpaceHistory(event);
 	}
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleJoinSpace(JoinSpaceEvent event) {
 		adminSpaceService.saveMemberSpaceHistory(event);
 	}
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleLeaveSpace(LeaveSpaceEvent event) {
 		adminSpaceService.deleteMemberSpaceHistory(event);
diff --git a/layer-admin/src/main/java/org/layer/admin/template/listener/TemplateListViewEventListener.java b/layer-admin/src/main/java/org/layer/admin/template/listener/TemplateListViewEventListener.java
@@ -1,5 +1,6 @@
 package org.layer.admin.template.listener;
 
+import org.layer.admin.common.UserOnlyEventListener;
 import org.layer.admin.template.service.AdminTemplateService;
 import org.layer.event.template.TemplateListViewEvent;
 import org.springframework.context.event.EventListener;
@@ -12,6 +13,7 @@
 public class TemplateListViewEventListener {
 	private final AdminTemplateService adminTemplateService;
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleTemplateListView(TemplateListViewEvent event) {
 		adminTemplateService.saveTemplateListViewHistory(event);
diff --git a/layer-admin/src/main/java/org/layer/admin/template/listener/TemplateRecommendedEventListener.java b/layer-admin/src/main/java/org/layer/admin/template/listener/TemplateRecommendedEventListener.java
@@ -1,5 +1,6 @@
 package org.layer.admin.template.listener;
 
+import org.layer.admin.common.UserOnlyEventListener;
 import org.layer.admin.template.service.AdminTemplateService;
 import org.layer.event.template.TemplateRecommendedEvent;
 import org.springframework.context.event.EventListener;
@@ -12,6 +13,7 @@
 public class TemplateRecommendedEventListener {
 	private final AdminTemplateService adminTemplateService;
 
+	@UserOnlyEventListener
 	@EventListener
 	public void handleTemplateRecommended(TemplateRecommendedEvent event) {
 		adminTemplateService.saveTemplateRecommendation(event);
diff --git a/layer-api/src/main/java/org/layer/domain/auth/service/AuthService.java b/layer-api/src/main/java/org/layer/domain/auth/service/AuthService.java
@@ -82,7 +82,7 @@ public SignUpResponse signUp(final String socialAccessToken, final SignUpRequest
 
             // 3. DB에 회원 저장
             member = memberService.saveMember(signUpRequest, memberInfo);
-            publishCreateRetrospectEvent(member);
+            publishSignUpEvent(member);
 
             // 4. 토큰 발급
             jwtToken = jwtService.issueToken(member.getId(), member.getMemberRole());
@@ -103,12 +103,13 @@ public SignUpResponse signUp(final String socialAccessToken, final SignUpRequest
         return SignUpResponse.of(member, jwtToken);
     }
 
-    private void publishCreateRetrospectEvent(final Member member) {
+    private void publishSignUpEvent(final Member member) {
         eventPublisher.publishEvent(new SignUpEvent(
             	random.generateRandomValue(),
 				member.getId(),
 				member.getName(),
-                time.now()
+                time.now(),
+                member.getMemberRole().name()
         ));
     }
 
diff --git a/layer-event/src/main/java/org/layer/event/BaseEvent.java b/layer-event/src/main/java/org/layer/event/BaseEvent.java
@@ -0,0 +1,9 @@
+package org.layer.event;
+
+import java.time.LocalDateTime;
+
+public interface BaseEvent {
+    String eventId();
+    Long memberId();
+    LocalDateTime eventTime();
+}
diff --git a/layer-event/src/main/java/org/layer/event/member/SignUpEvent.java b/layer-event/src/main/java/org/layer/event/member/SignUpEvent.java
@@ -2,10 +2,13 @@
 
 import java.time.LocalDateTime;
 
+import org.layer.event.BaseEvent;
+
 public record SignUpEvent(
 	String eventId,
 	Long memberId,
 	String name,
-	LocalDateTime eventTime
-) {
+	LocalDateTime eventTime,
+	String memberRole
+) implements BaseEvent {
 }
diff --git a/layer-event/src/main/java/org/layer/event/retrospect/AnswerRetrospectEndEvent.java b/layer-event/src/main/java/org/layer/event/retrospect/AnswerRetrospectEndEvent.java
@@ -2,14 +2,16 @@
 
 import java.time.LocalDateTime;
 
+import org.layer.event.BaseEvent;
+
 public record AnswerRetrospectEndEvent(
 	String eventId,
 	LocalDateTime eventTime,
 	Long memberId,
 	Long spaceId,
 	Long retrospectId,
 	String answerContent
-) {
+) implements BaseEvent {
 	public static AnswerRetrospectEndEvent of(
 		String eventId,
 		LocalDateTime eventTime,
diff --git a/layer-event/src/main/java/org/layer/event/retrospect/AnswerRetrospectStartEvent.java b/layer-event/src/main/java/org/layer/event/retrospect/AnswerRetrospectStartEvent.java
@@ -2,13 +2,15 @@
 
 import java.time.LocalDateTime;
 
+import org.layer.event.BaseEvent;
+
 public record AnswerRetrospectStartEvent(
 	String eventId,
 	LocalDateTime eventTime,
 	Long memberId,
 	Long spaceId,
 	Long retrospectId
-) {
+) implements BaseEvent {
 	public static AnswerRetrospectStartEvent of(
 		String eventId,
 		LocalDateTime eventTime,
diff --git a/layer-event/src/main/java/org/layer/event/retrospect/CreateRetrospectEvent.java b/layer-event/src/main/java/org/layer/event/retrospect/CreateRetrospectEvent.java
@@ -2,6 +2,8 @@
 
 import java.time.LocalDateTime;
 
+import org.layer.event.BaseEvent;
+
 public record CreateRetrospectEvent(
 	String eventId,
 	Long spaceId,
@@ -10,7 +12,7 @@ public record CreateRetrospectEvent(
 	String title,
 	Long memberId,
 	LocalDateTime eventTime
-) {
+) implements BaseEvent {
 	public static CreateRetrospectEvent of(
 		String eventId,
 		Long spaceId,
diff --git a/layer-event/src/main/java/org/layer/event/space/CreateSpaceEvent.java b/layer-event/src/main/java/org/layer/event/space/CreateSpaceEvent.java
diff --git a/layer-event/src/main/java/org/layer/event/space/JoinSpaceEvent.java b/layer-event/src/main/java/org/layer/event/space/JoinSpaceEvent.java
diff --git a/layer-event/src/main/java/org/layer/event/space/LeaveSpaceEvent.java b/layer-event/src/main/java/org/layer/event/space/LeaveSpaceEvent.java
diff --git a/layer-event/src/main/java/org/layer/event/template/TemplateListViewEvent.java b/layer-event/src/main/java/org/layer/event/template/TemplateListViewEvent.java
diff --git a/layer-event/src/main/java/org/layer/event/template/TemplateRecommendedEvent.java b/layer-event/src/main/java/org/layer/event/template/TemplateRecommendedEvent.java
