Merge pull request #31 from FlipNoteTeam/feat/notification

Feat: [FN-124][FN-125] 알림 생성 및 목록 조회 기능

Author: dungbik

src/main/java/project/flipnote/auth/controller/AuthController.java

@@ -19,8 +19,8 @@
 import lombok.RequiredArgsConstructor;
 import project.flipnote.auth.controller.docs.AuthControllerDocs;
 import project.flipnote.auth.model.ChangePasswordRequest;
-import project.flipnote.auth.model.EmailVerifyRequest;
 import project.flipnote.auth.model.EmailVerificationRequest;
+import project.flipnote.auth.model.EmailVerifyRequest;
 import project.flipnote.auth.model.PasswordResetCreateRequest;
 import project.flipnote.auth.model.PasswordResetRequest;
 import project.flipnote.auth.model.TokenPair;

src/main/java/project/flipnote/auth/controller/docs/AuthControllerDocs.java

@@ -5,8 +5,8 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import project.flipnote.auth.model.ChangePasswordRequest;
-import project.flipnote.auth.model.EmailVerifyRequest;
 import project.flipnote.auth.model.EmailVerificationRequest;
+import project.flipnote.auth.model.EmailVerifyRequest;
 import project.flipnote.auth.model.PasswordResetCreateRequest;
 import project.flipnote.auth.model.PasswordResetRequest;
 import project.flipnote.auth.model.UserLoginRequest;

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

@@ -18,8 +18,8 @@
 import project.flipnote.auth.event.PasswordResetCreateEvent;
 import project.flipnote.auth.exception.AuthErrorCode;
 import project.flipnote.auth.model.ChangePasswordRequest;
-import project.flipnote.auth.model.EmailVerifyRequest;
 import project.flipnote.auth.model.EmailVerificationRequest;
+import project.flipnote.auth.model.EmailVerifyRequest;
 import project.flipnote.auth.model.PasswordResetCreateRequest;
 import project.flipnote.auth.model.PasswordResetRequest;
 import project.flipnote.auth.model.TokenPair;
@@ -34,9 +34,9 @@
 import project.flipnote.auth.util.PasswordResetTokenGenerator;
 import project.flipnote.auth.util.VerificationCodeGenerator;
 import project.flipnote.common.config.ClientProperties;
-import project.flipnote.common.model.request.UserCreateCommand;
-import project.flipnote.common.model.event.UserRegisteredEvent;
 import project.flipnote.common.exception.BizException;
+import project.flipnote.common.model.event.UserRegisteredEvent;
+import project.flipnote.common.model.request.UserCreateCommand;
 import project.flipnote.common.security.dto.AuthPrinciple;
 import project.flipnote.common.security.jwt.JwtComponent;
 import project.flipnote.user.model.SocialLinksResponse;

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

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

src/main/java/project/flipnote/common/model/event/GroupJoinRequestedEvent.java

@@ -0,0 +1,10 @@
+package project.flipnote.common.model.event;
+
+import java.util.List;
+
+public record GroupJoinRequestedEvent(
+	Long groupId,
+	List<Long> receiverIds,
+	Long requesterId
+) {
+}

src/main/java/project/flipnote/common/model/request/CursorPageRequest.java

@@ -29,6 +29,10 @@ public Long getCursorId() {
 			return null;
 		}
 
-		return Long.valueOf(normalized);
+		try {
+			return Long.valueOf(normalized);
+		} catch (NumberFormatException ex) {
+			return null;
+		}
 	}
 }

src/main/java/project/flipnote/common/security/config/SecurityConfig.java

@@ -58,7 +58,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 			.authorizeHttpRequests(auth -> auth
 				.requestMatchers(
 					HttpMethod.POST,
-					"/*/users", "/*/auth/token/refresh", "/*/auth/password-resets", "/*/auth/register", "/*/images/upload"
+					"/*/users", "/*/auth/token/refresh", "/*/auth/password-resets", "/*/auth/register",
+					"/*/images/upload"
 				).permitAll()
 				.requestMatchers(HttpMethod.PATCH, "/*/auth/password-resets").permitAll()
 				.requestMatchers(

src/main/java/project/flipnote/group/repository/GroupInvitationRepository.java

@@ -33,9 +33,11 @@ Optional<GroupInvitation> findByIdAndGroup_IdAndInviteeUserIdAndStatus(
 	boolean existsByGroup_IdAndInviteeEmailAndStatus(Long groupId, String inviteeEmail, GroupInvitationStatus status);
 
 	@Modifying(clearAutomatically = true, flushAutomatically = true)
-	@Query("UPDATE GroupInvitation gi " +
-		"SET gi.status = project.flipnote.group.entity.GroupInvitationStatus.EXPIRED " +
-		"WHERE gi.status = project.flipnote.group.entity.GroupInvitationStatus.PENDING " +
-		"AND gi.expiredAt < :now")
+	@Query("""
+		UPDATE GroupInvitation gi
+		SET gi.status = project.flipnote.group.entity.GroupInvitationStatus.EXPIRED
+		WHERE gi.status = project.flipnote.group.entity.GroupInvitationStatus.PENDING
+		AND gi.expiredAt < :now
+		""")
 	int bulkExpire(@Param("now") LocalDateTime now);
 }

src/main/java/project/flipnote/group/repository/GroupMemberRepository.java

@@ -1,23 +1,25 @@
 package project.flipnote.group.repository;
 
+import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import project.flipnote.group.entity.Group;
-
-import org.springframework.stereotype.Repository;
 import project.flipnote.group.entity.GroupMember;
+import project.flipnote.group.entity.GroupMemberRole;
 import project.flipnote.user.entity.UserProfile;
 
-import java.util.Optional;
-
 @Repository
 public interface GroupMemberRepository extends JpaRepository<GroupMember, Long> {
-    Optional<GroupMember> findByGroupAndUser(Group group, UserProfile userProfile);
+	Optional<GroupMember> findByGroupAndUser(Group group, UserProfile userProfile);
 
 	long countByGroup_Id(Long groupId);
 
 	boolean existsByGroup_idAndUser_id(Long groupId, Long userId);
 
 	Optional<GroupMember> findByGroup_IdAndUser_Id(Long groupId, Long userId);
 
+	List<GroupMember> findByGroupAndRoleIn(Group group, List<GroupMemberRole> roles);
 }

src/main/java/project/flipnote/group/repository/GroupRolePermissionRepository.java

@@ -1,5 +1,7 @@
 package project.flipnote.group.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import project.flipnote.group.entity.Group;
@@ -11,4 +13,6 @@
 @Repository
 public interface GroupRolePermissionRepository extends JpaRepository<GroupRolePermission, Long> {
     boolean existsByGroupAndRoleAndGroupPermission(Group group, GroupMemberRole role, GroupPermission groupPermission);
+
+    List<GroupRolePermission> findByGroupAndGroupPermission(Group group, GroupPermission groupPermission);
 }