Feat: [FN-68][FN-69][FN-70][FN-71][FN-72] 그룹 가입 신청

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

@@ -23,9 +23,9 @@ public class GroupController {
 
 	@PostMapping("")
 	public ResponseEntity<GroupCreateResponse> create(
-		@AuthenticationPrincipal AuthPrinciple userAuth,
+		@AuthenticationPrincipal AuthPrinciple authPrinciple,
 		@Valid @RequestBody GroupCreateRequest req) {
-		GroupCreateResponse res = groupService.create(userAuth, req);
+		GroupCreateResponse res = groupService.create(authPrinciple, req);
 		return ResponseEntity.status(HttpStatus.CREATED).body(res);
 	}
 }

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

@@ -1,11 +1,6 @@
 package project.flipnote.group.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -23,11 +18,12 @@ public class GroupPermission {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
+	@Enumerated(EnumType.STRING)
 	@Column(nullable = false, length = 50, unique = true)
-	private String name;
+	private GroupPermissionStatus name;
 
 	@Builder
-	private GroupPermission(String name) {
+	private GroupPermission(GroupPermissionStatus name) {
 		this.name = name;
 	}
 }

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

@@ -0,0 +1,5 @@
+package project.flipnote.group.entity;
+
+public enum GroupPermissionStatus {
+	INVITE, KICK, JOIN_REQUEST_MANAGE
+}

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

@@ -30,10 +30,10 @@ public class GroupRolePermission {
 
 	@Enumerated(EnumType.STRING)
 	@Column(name = "role", nullable = false)
-	private GroupRole role;
+	private GroupMemberRole role;
 
 	@Builder
-	private GroupRolePermission(Group group, GroupPermission groupPermission, GroupRole role) {
+	private GroupRolePermission(Group group, GroupPermission groupPermission, GroupMemberRole role) {
 		this.group = group;
 		this.groupPermission = groupPermission;
 		this.role = role;

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

@@ -10,6 +10,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum GroupErrorCode implements ErrorCode {
+	GROUP_NOT_FOUND(HttpStatus.NOT_FOUND, "GROUP_002", "그룹이 존재하지 않습니다."),
 	INVALID_MAX_MEMBER(HttpStatus.BAD_REQUEST, "GROUP_001", "최대 인원 수는 1 이상 100 이하여야 합니다.");
 
 	private final HttpStatus httpStatus;

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

@@ -0,0 +1,48 @@
+package project.flipnote.group.model;
+
+import org.hibernate.validator.constraints.URL;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import project.flipnote.group.entity.Category;
+
+public class GroupCreateDto {
+	public record Request(
+		@NotBlank
+		@Size(max = 50)
+		String name,
+
+		@NotNull
+		Category category,
+
+		@NotBlank
+		String description,
+
+		@NotNull
+		Boolean applicationRequired,
+
+		@NotNull
+		Boolean publicVisible,
+
+		@NotNull
+		@Min(1)
+		@Max(100)
+		Integer maxMember,
+
+		@URL
+		String image
+	) {
+	}
+
+	public record Response(
+		Long groupId
+	){
+		public static Response from(Long groupId) {
+			return new Response(groupId);
+		}
+	}
+}

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

@@ -2,9 +2,18 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import project.flipnote.group.entity.Group;
+
 import org.springframework.stereotype.Repository;
 import project.flipnote.group.entity.GroupMember;
+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);
+
+	long countByGroup_Id(Long groupId);
+
 }

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

@@ -4,7 +4,9 @@
 import org.springframework.stereotype.Repository;
 
 import project.flipnote.group.entity.GroupPermission;
+import project.flipnote.group.entity.GroupPermissionStatus;
 
 @Repository
 public interface GroupPermissionRepository extends JpaRepository<GroupPermission, Long> {
+    GroupPermission findByName(GroupPermissionStatus name);
 }

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

@@ -1,10 +1,22 @@
 package project.flipnote.group.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import jakarta.persistence.LockModeType;
 import project.flipnote.group.entity.Group;
+import project.flipnote.group.entity.GroupMember;
+
+import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface GroupRepository extends JpaRepository<Group, Long> {
+    Optional<Group> findById(Long groupId);
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("select g from Group g where g.id = :id")
+    Optional<Group> findByIdForUpdate(Long groupId);
 }

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

@@ -2,9 +2,13 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import project.flipnote.group.entity.Group;
+import project.flipnote.group.entity.GroupMemberRole;
+import project.flipnote.group.entity.GroupPermission;
 import org.springframework.stereotype.Repository;
 import project.flipnote.group.entity.GroupRolePermission;
 
 @Repository
 public interface GroupRolePermissionRepository extends JpaRepository<GroupRolePermission, Long> {
+    boolean existsByGroupAndRoleAndGroupPermission(Group group, GroupMemberRole role, GroupPermission groupPermission);
 }

src/main/java/project/flipnote/group/service/GroupService.java

@@ -14,7 +14,6 @@
 import project.flipnote.group.entity.GroupMember;
 import project.flipnote.group.entity.GroupMemberRole;
 import project.flipnote.group.entity.GroupPermission;
-import project.flipnote.group.entity.GroupRole;
 import project.flipnote.group.entity.GroupRolePermission;
 import project.flipnote.group.exception.GroupErrorCode;
 import project.flipnote.group.model.GroupCreateRequest;
@@ -24,6 +23,7 @@
 import project.flipnote.group.repository.GroupRepository;
 import project.flipnote.group.repository.GroupRolePermissionRepository;
 import project.flipnote.user.entity.UserProfile;
+import project.flipnote.user.entity.UserStatus;
 import project.flipnote.user.exception.UserErrorCode;
 import project.flipnote.user.repository.UserProfileRepository;
 
@@ -40,18 +40,18 @@ public class GroupService {
 	private final UserProfileRepository userProfileRepository;
 
 	//유저 정보 조회
-	public UserProfile findUser(AuthPrinciple userAuth) {
-		return userProfileRepository.findById(userAuth.userId()).orElseThrow(
+	public UserProfile findUser(AuthPrinciple authPrinciple) {
+		return userProfileRepository.findByIdAndStatus(authPrinciple.userId(), UserStatus.ACTIVE).orElseThrow(
 			() -> new BizException(UserErrorCode.USER_NOT_FOUND)
 		);
 	}
 
 	//그룹 생성
 	@Transactional
-	public GroupCreateResponse create(AuthPrinciple userAuth, GroupCreateRequest req) {
+	public GroupCreateResponse create(AuthPrinciple authPrinciple, GroupCreateRequest req) {
 
 		//1. 유저 조회
-		UserProfile user = findUser(userAuth);
+		UserProfile userProfile = findUser(authPrinciple);
 
 		//2. 인원수 검증
 		validateMaxMember(req.maxMember());
@@ -60,21 +60,21 @@ public GroupCreateResponse create(AuthPrinciple userAuth, GroupCreateRequest req
 		Group group = createGroup(req);
 
 		//4. 그룹 회원 정보 생성
-		saveGroupOwner(group, user);
+		saveGroupOwner(group, userProfile);
 
 		//5. 그룹 내의 모든 권한 조회
 		initializeGroupPermissions(group);
 
 		return GroupCreateResponse.from(group.getId());
 	}
-	
+
 	/*
 	최초 그룹 권한 설정
 	 */
 	private void initializeGroupPermissions(Group group) {
 		List<GroupPermission> groupPermissions = groupPermissionRepository.findAll();
 
-		List<GroupRolePermission> groupRolePermissions = Arrays.stream(GroupRole.values())
+		List<GroupRolePermission> groupRolePermissions = Arrays.stream(GroupMemberRole.values())
 				.flatMap(role -> groupPermissions.stream()
 						.map(permission -> GroupRolePermission.builder()
 								.group(group)
@@ -85,7 +85,7 @@ private void initializeGroupPermissions(Group group) {
 
 		groupRolePermissionRepository.saveAll(groupRolePermissions);
 	}
-	
+
 	/*
 	그룹 생성 메서드
 	 */
@@ -106,7 +106,7 @@ private Group createGroup(GroupCreateRequest req) {
 
 		return saveGroup;
 	}
-	
+
 	/*
 	그룹 생성시 오너 멤버 추가
 	 */

src/main/java/project/flipnote/groupjoin/controller/GroupJoinController.java

@@ -0,0 +1,76 @@
+package project.flipnote.groupjoin.controller;
+
+import jakarta.validation.Valid;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import lombok.RequiredArgsConstructor;
+import project.flipnote.common.security.dto.AuthPrinciple;
+import project.flipnote.groupjoin.model.*;
+import project.flipnote.groupjoin.service.GroupJoinService;
+
+@RestController
+@RequestMapping("/v1")
+@RequiredArgsConstructor
+public class GroupJoinController {
+
+	private final GroupJoinService groupJoinService;
+
+	//가입 신청 요청
+	@PostMapping("/groups/{groupId}/joins")
+	public ResponseEntity<GroupJoinResponse> joinRequest(
+			@AuthenticationPrincipal AuthPrinciple authPrinciple,
+			@PathVariable("groupId") Long groupId,
+			@Valid @RequestBody GroupJoinRequest req) {
+		GroupJoinResponse res = groupJoinService.joinRequest(authPrinciple, groupId, req);
+
+		return ResponseEntity.status(HttpStatus.CREATED).body(res);
+	}
+
+	//그룹 내 가입 신청한 리스트 조회
+	@GetMapping("/groups/{groupId}/joins")
+	public ResponseEntity<GroupJoinListResponse> findGroupJoinList(
+			@AuthenticationPrincipal AuthPrinciple authPrinciple,
+			@PathVariable("groupId") Long groupId) {
+		GroupJoinListResponse res = groupJoinService.findGroupJoinList(authPrinciple, groupId);
+
+		return ResponseEntity.ok(res);
+	}
+
+	//가입 신청 응답
+	@PatchMapping("/groups/{groupId}/joins/{joinId}")
+	public ResponseEntity<GroupJoinRespondResponse> respondToJoinRequest(
+			@AuthenticationPrincipal AuthPrinciple authPrinciple,
+			@PathVariable("groupId") Long groupId,
+			@PathVariable("joinId") Long joinId,
+			@Valid @RequestBody GroupJoinRespondRequest req) {
+
+		GroupJoinRespondResponse res = groupJoinService.respondToJoinRequest(authPrinciple, groupId, joinId, req);
+
+		return ResponseEntity.ok(res);
+	}
+
+	//가입 신청 삭제
+	@DeleteMapping("/groups/{groupId}/joins/{joinId}")
+	public ResponseEntity<Void> groupJoinDelete(
+		@AuthenticationPrincipal AuthPrinciple authPrinciple,
+		@PathVariable("groupId") Long groupId,
+		@PathVariable("joinId") Long joinId
+	) {
+		groupJoinService.groupJoinDelete(authPrinciple, groupId, joinId);
+
+		return ResponseEntity.noContent().build();
+	}
+
+	//내가 신청한 가입신청 리스트 조회
+	@GetMapping("/groups/joins/me")
+	public ResponseEntity<FindGroupJoinListMeResponse> findGroupJoinMe(
+		@AuthenticationPrincipal AuthPrinciple authPrinciple
+	) {
+		FindGroupJoinListMeResponse res = groupJoinService.findGroupJoinListMe(authPrinciple);
+
+		return ResponseEntity.ok(res);
+	}
+}