Feat: [FN-96][FN-97][FN-99][FN-110] 그룹 초대 기능

.github/workflows/ci.yml

@@ -30,6 +30,17 @@ jobs:
       S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }}
       S3_BUCKET_REGION: ${{ secrets.S3_BUCKET_REGION }}
 
+    services:
+      redis:
+        image: redis:7.0-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17

build.gradle

@@ -37,6 +37,9 @@ dependencies {
 	implementation 'io.jsonwebtoken:jjwt:0.12.6'
 	implementation 'com.resend:resend-java:4.1.1'
 	implementation 'com.googlecode.libphonenumber:libphonenumber:9.0.9'
+	implementation 'net.javacrumbs.shedlock:shedlock-spring:6.9.2'
+	implementation 'net.javacrumbs.shedlock:shedlock-provider-redis-spring:6.9.2'
+	implementation 'org.redisson:redisson-spring-boot-starter:3.46.0'
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'

src/main/java/project/flipnote/auth/service/AuthService.java

@@ -78,7 +78,7 @@ public UserRegisterResponse register(UserRegisterRequest req) {
 			.build();
 		userAuthRepository.save(userAuth);
 
-		eventPublisher.publishEvent(new UserRegisteredEvent(userId, email));
+		eventPublisher.publishEvent(new UserRegisteredEvent(email));
 
 		return UserRegisterResponse.from(userId);
 	}

src/main/java/project/flipnote/common/config/RedissonConfig.java

@@ -0,0 +1,51 @@
+package project.flipnote.common.config;
+
+import java.util.Arrays;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+@Configuration
+public class RedissonConfig {
+
+	@Value("${spring.data.redis.host}")
+	private String host;
+
+	@Value("${spring.data.redis.port}")
+	private int port;
+
+	@Value("${spring.data.redis.password:}")
+	private String password;
+
+	@Value("${spring.data.redis.cluster.nodes:}")
+	private String clusterNodes;
+
+	@Bean(destroyMethod = "shutdown")
+	public RedissonClient redissonClient() {
+		Config config = new Config();
+
+		if (!clusterNodes.isBlank()) {
+			config.useClusterServers()
+				.addNodeAddress(
+					Arrays.stream(clusterNodes.split(","))
+						.map(String::trim)
+						.filter(s -> !s.isEmpty())
+						.map(addr -> addr.startsWith("redis://") || addr.startsWith("rediss://") ? addr :
+							"redis://" + addr)
+						.toArray(String[]::new)
+				)
+				.setPassword(StringUtils.hasText(password) ? password : null);
+		} else {
+			config.useSingleServer()
+				.setAddress("redis://" + host + ":" + port)
+				.setPassword(StringUtils.hasText(password) ? password : null);
+		}
+
+		return Redisson.create(config);
+	}
+}

src/main/java/project/flipnote/common/config/SchedulerConfig.java

@@ -0,0 +1,9 @@
+package project.flipnote.common.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableScheduling
+@Configuration
+public class SchedulerConfig {
+}

src/main/java/project/flipnote/common/config/ShedLockConfig.java

@@ -0,0 +1,19 @@
+package project.flipnote.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+
+import net.javacrumbs.shedlock.core.LockProvider;
+import net.javacrumbs.shedlock.provider.redis.spring.RedisLockProvider;
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
+
+@EnableSchedulerLock(defaultLockAtMostFor = "PT30S")
+@Configuration
+public class ShedLockConfig {
+
+	@Bean
+	public LockProvider lockProvider(RedisConnectionFactory connectionFactory) {
+		return new RedisLockProvider(connectionFactory);
+	}
+}

src/main/java/project/flipnote/common/event/UserRegisteredEvent.java

@@ -1,7 +1,6 @@
 package project.flipnote.common.event;
 
 public record UserRegisteredEvent(
-	Long userId,
 	String email
 ) {
 }

src/main/java/project/flipnote/common/exception/CommonErrorCode.java

@@ -9,7 +9,8 @@
 @RequiredArgsConstructor
 public enum CommonErrorCode implements ErrorCode {
 	INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), "COMMON_001", "예기치 않은 오류가 발생했습니다."),
-	INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST.value(), "COMMON_002", "입력값이 올바르지 않습니다.");
+	INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST.value(), "COMMON_002", "입력값이 올바르지 않습니다."),
+	SERVICE_TEMPORARILY_UNAVAILABLE(HttpStatus.TOO_MANY_REQUESTS.value(), "COMMON_003", "요청이 많아 처리되지 않았습니다. 잠시 후 다시 시도해주세요.");
 
 	private final int status;
 	private final String code;

src/main/java/project/flipnote/group/controller/GroupInvitationQueryController.java

@@ -27,8 +27,8 @@ public class GroupInvitationQueryController implements GroupInvitationQueryContr
 	@GetMapping("/groups/{groupId}/invitations")
 	public ResponseEntity<PageResponse<OutgoingGroupInvitationResponse>> getOutgoingInvitations(
 		@PathVariable("groupId") Long groupId,
-		@Min(0) @RequestParam(defaultValue = "0") int page,
-		@Min(1) @Min(30) @RequestParam(defaultValue = "20") int size,
+		@RequestParam(defaultValue = "0") int page,
+		@RequestParam(defaultValue = "20") int size,
 		@AuthenticationPrincipal AuthPrinciple authPrinciple
 	) {
 		PageResponse<OutgoingGroupInvitationResponse> res
@@ -39,8 +39,8 @@ public ResponseEntity<PageResponse<OutgoingGroupInvitationResponse>> getOutgoing
 
 	@GetMapping("/group-invitations")
 	public ResponseEntity<PageResponse<IncomingGroupInvitationResponse>> getIncomingInvitations(
-		@Min(0) @RequestParam(defaultValue = "0") int page,
-		@Min(1) @Min(30) @RequestParam(defaultValue = "20") int size,
+		@RequestParam(defaultValue = "0") int page,
+		@RequestParam(defaultValue = "20") int size,
 		@AuthenticationPrincipal AuthPrinciple authPrinciple
 	) {
 		PageResponse<IncomingGroupInvitationResponse> res

src/main/java/project/flipnote/group/controller/docs/GroupInvitationQueryControllerDocs.java

@@ -5,6 +5,8 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import project.flipnote.common.response.PageResponse;
 import project.flipnote.common.security.dto.AuthPrinciple;
 import project.flipnote.group.model.IncomingGroupInvitationResponse;
@@ -16,15 +18,15 @@ public interface GroupInvitationQueryControllerDocs {
 	@Operation(summary = "그룹 초대 보낸 목록 조회", security = {@SecurityRequirement(name = "access-token")})
 	ResponseEntity<PageResponse<OutgoingGroupInvitationResponse>> getOutgoingInvitations(
 		Long groupId,
-		int page,
-		int size,
+		@Min(0) int page,
+		@Min(1) @Max(30) int size,
 		AuthPrinciple authPrinciple
 	);
 
 	@Operation(summary = "그룹 초대 받은 목록 조회", security = {@SecurityRequirement(name = "access-token")})
 	ResponseEntity<PageResponse<IncomingGroupInvitationResponse>> getIncomingInvitations(
-		int page,
-		int size,
+		@Min(0) int page,
+		@Min(1) @Max(30) int size,
 		AuthPrinciple authPrinciple
 	);
 }

src/main/java/project/flipnote/group/entity/Group.java

@@ -32,6 +32,7 @@
 @SQLDelete(sql = "UPDATE app_groups SET deleted_at = now() WHERE id = ?")
 @SQLRestriction("deleted_at IS NULL")
 public class Group extends BaseEntity {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
@@ -59,6 +60,11 @@ public class Group extends BaseEntity {
 
 	private String imageUrl;
 
+	@Column(nullable = false)
+	@Min(1)
+	@Max(100)
+	private Integer memberCount;
+
 	@Column(name = "deleted_at")
 	private LocalDateTime deletedAt;
 
@@ -79,11 +85,17 @@ private Group(
 		this.publicVisible = publicVisible;
 		this.maxMember = maxMember;
 		this.imageUrl = imageUrl;
+		this.memberCount = 1;
 	}
 
 	public void validateJoinable() {
-		if (maxMember < 1 || maxMember >= 100) {
-			throw new BizException(GroupErrorCode.INVALID_MAX_MEMBER);
+		if (memberCount >= maxMember) {
+			throw new BizException(GroupErrorCode.GROUP_IS_ALREADY_MAX_MEMBER);
 		}
 	}
+
+	public void increaseMemberCount() {
+		validateJoinable();
+		memberCount++;
+	}
 }

src/main/java/project/flipnote/group/entity/GroupInvitation.java

@@ -1,5 +1,8 @@
 package project.flipnote.group.entity;
 
+import java.time.LocalDateTime;
+import java.util.Objects;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -17,12 +20,14 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import project.flipnote.common.entity.BaseEntity;
+import project.flipnote.common.exception.BizException;
+import project.flipnote.group.exception.GroupInvitationErrorCode;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Table(
-	name = "group_invitation",
+	name = "group_invitations",
 	indexes = {
 		@Index(name = "idx_group_invitee_user", columnList = "group_id, invitee_user_id, status"),
 		@Index(name = "idx_group_invitee_email", columnList = "group_id, invitee_email, status"),
@@ -36,6 +41,8 @@
 )
 public class GroupInvitation extends BaseEntity {
 
+	private static final long DEFAULT_EXPIRATION_DAYS = 7L;
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
@@ -55,16 +62,43 @@ public class GroupInvitation extends BaseEntity {
 	@Column(nullable = false)
 	private GroupInvitationStatus status;
 
+	@Column(nullable = false)
+	private LocalDateTime expiredAt;
+
 	@Builder
 	public GroupInvitation(Group group, Long inviterUserId, Long inviteeUserId, String inviteeEmail) {
 		this.group = group;
 		this.inviterUserId = inviterUserId;
 		this.inviteeUserId = inviteeUserId;
 		this.inviteeEmail = inviteeEmail;
 		this.status = GroupInvitationStatus.PENDING;
+		this.expiredAt = LocalDateTime.now().plusDays(DEFAULT_EXPIRATION_DAYS);
 	}
 
 	public void respond(GroupInvitationStatus status) {
 		this.status = status;
 	}
+
+	public void validateNotExpired() {
+		if (isExpired()) {
+			throw new BizException(GroupInvitationErrorCode.INVITATION_NOT_FOUND);
+		}
+	}
+
+	public boolean isExpired() {
+		if (this.status == GroupInvitationStatus.EXPIRED) {
+			return true;
+		}
+		if (this.status != GroupInvitationStatus.PENDING) {
+			return false;
+		}
+		return this.expiredAt.isBefore(LocalDateTime.now());
+	}
+
+	public GroupInvitationStatus getStatus() {
+		if (isExpired()) {
+			return GroupInvitationStatus.EXPIRED;
+		}
+		return status;
+	}
 }

src/main/java/project/flipnote/group/entity/GroupInvitationStatus.java

@@ -1,5 +1,5 @@
 package project.flipnote.group.entity;
 
 public enum GroupInvitationStatus {
-	PENDING, ACCEPTED, REJECTED
+	PENDING, ACCEPTED, REJECTED, EXPIRED;
 }

src/main/java/project/flipnote/group/exception/GroupErrorCode.java

@@ -1,6 +1,5 @@
 package project.flipnote.group.exception;
 
-
 import org.springframework.http.HttpStatus;
 
 import lombok.Getter;
@@ -12,7 +11,9 @@
 public enum GroupErrorCode implements ErrorCode {
 	GROUP_NOT_FOUND(HttpStatus.NOT_FOUND, "GROUP_002", "그룹이 존재하지 않습니다."),
 	INVALID_MAX_MEMBER(HttpStatus.BAD_REQUEST, "GROUP_001", "최대 인원 수는 1 이상 100 이하여야 합니다."),
-	USER_NOT_IN_GROUP(HttpStatus.NOT_FOUND, "GROUP_003", "그룹에 유저가 존재하지 않습니다.");
+	USER_NOT_IN_GROUP(HttpStatus.NOT_FOUND, "GROUP_003", "그룹에 유저가 존재하지 않습니다."),
+	GROUP_IS_ALREADY_MAX_MEMBER(HttpStatus.CONFLICT, "GROUP_004", "그룹 정원이 가득 찼습니다."),
+	ALREADY_GROUP_MEMBER(HttpStatus.CONFLICT, "GROUP_005", "이미 그룹 회원입니다.");
 
 	private final HttpStatus httpStatus;
 	private final String code;

src/main/java/project/flipnote/group/exception/GroupInvitationErrorCode.java

@@ -1,6 +1,5 @@
 package project.flipnote.group.exception;
 
-
 import org.springframework.http.HttpStatus;
 
 import lombok.Getter;
@@ -13,8 +12,7 @@ public enum GroupInvitationErrorCode implements ErrorCode {
 	ALREADY_INVITED(HttpStatus.CONFLICT, "GROUP_INVITATION_001", "이미 초대된 사용자입니다."),
 	NO_INVITATION_PERMISSION(HttpStatus.FORBIDDEN, "GROUP_INVITATION_002", "해당 그룹에 초대할 권한이 없습니다."),
 	INVITATION_NOT_FOUND(HttpStatus.NOT_FOUND, "GROUP_INVITATION_003", "유효하지 않은 초대입니다."),
-	CANNOT_INVITE_SELF(HttpStatus.BAD_REQUEST, "GROUP_INVITATION_004", "본인을 초대할 수 없습니다."),
-	ALREADY_GROUP_MEMBER(HttpStatus.CONFLICT, "GROUP_INVITATION_005", "이미 그룹 회원입니다.");
+	CANNOT_INVITE_SELF(HttpStatus.BAD_REQUEST, "GROUP_INVITATION_004", "본인을 초대할 수 없습니다.");
 
 	private final HttpStatus httpStatus;
 	private final String code;

src/main/java/project/flipnote/group/listener/UserRegisteredEventListener.java

@@ -27,11 +27,11 @@ public class UserRegisteredEventListener {
 	)
 	@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
 	public void HandleUserRegisteredEvent(UserRegisteredEvent event) {
-		groupInvitationService.acceptPendingInvitationsOnRegister(event.userId(), event.email());
+		groupInvitationService.acceptPendingInvitationsOnRegister(event.email());
 	}
 
 	@Recover
 	public void recover(Exception ex, UserRegisteredEvent event) {
-		log.error("회원가입 후속 처리 예외 발생: userId={}, email={}", event.userId(), event.email(), ex);
+		log.error("회원가입 후속 처리 예외 발생: email={}", event.email(), ex);
 	}
 }

src/main/java/project/flipnote/group/model/GroupInvitationStatus.java

@@ -1,7 +1,7 @@
 package project.flipnote.group.model;
 
 public enum GroupInvitationStatus {
-	PENDING, ACCEPTED, REJECTED;
+	PENDING, ACCEPTED, REJECTED, EXPIRED;
 
 	public static GroupInvitationStatus from(project.flipnote.group.entity.GroupInvitationStatus status) {
 		if (status == null) {
@@ -12,6 +12,7 @@ public static GroupInvitationStatus from(project.flipnote.group.entity.GroupInvi
 			case PENDING -> PENDING;
 			case ACCEPTED -> ACCEPTED;
 			case REJECTED -> REJECTED;
+			case EXPIRED -> EXPIRED;
 			default -> throw new IllegalArgumentException("Unknown GroupInvitationStatus: " + status);
 		};
 	}