Feat: 그룹 검색시 그룹명 포함하도록 수정

Feat: 그룹 검색시 그룹명 포함하도록 수정

Author: stoneTiger0912

src/main/java/flipnote/group/adapter/out/persistence/GroupRepositoryAdapter.java

@@ -46,18 +46,18 @@ public void delete(Long groupId) {
 	}
 
 	@Override
-	public List<GroupInfo> findAllByCursor(Long cursorId, Category category, int size) {
-		return groupRepository.findAllByCursor(cursorId, category, size);
+	public List<GroupInfo> findAllByCursor(Long cursorId, Category category, int size, String groupName) {
+		return groupRepository.findAllByCursor(cursorId, category, size, groupName);
 	}
 
 	@Override
-	public List<GroupInfo> findAllByCursorAndUserId(Long cursorId, Category category, int size, Long userId) {
-		return groupRepository.findAllByCursorAndUserId(cursorId, category, size, userId);
+	public List<GroupInfo> findAllByCursorAndUserId(Long cursorId, Category category, int size, Long userId, String groupName) {
+		return groupRepository.findAllByCursorAndUserId(cursorId, category, size, userId, groupName);
 	}
 
 	@Override
-	public List<GroupInfo> findAllByCursorAndCreatedUserId(Long cursorId, Category category, int size, Long userId) {
-		return groupRepository.findAllByCursorAndCreatedUserId(cursorId, category, size, userId);
+	public List<GroupInfo> findAllByCursorAndCreatedUserId(Long cursorId, Category category, int size, Long userId, String groupName) {
+		return groupRepository.findAllByCursorAndCreatedUserId(cursorId, category, size, userId, groupName);
 	}
 
 	@Override

src/main/java/flipnote/group/api/dto/request/GroupListRequestDto.java

@@ -12,6 +12,7 @@
 public class GroupListRequestDto extends CursorPagingRequest {
 
 	private Category category;
+	private String groupName;
 
 	@Override
 	public PageRequest getPageRequest() {

src/main/java/flipnote/group/application/port/out/GroupRepositoryPort.java

@@ -14,11 +14,11 @@ public interface GroupRepositoryPort {
 
     void delete(Long id);
 
-	List<GroupInfo> findAllByCursor(Long cursorId, Category category, int size);
+	List<GroupInfo> findAllByCursor(Long cursorId, Category category, int size, String groupName);
 
-	List<GroupInfo> findAllByCursorAndUserId(Long cursorId, Category category, int size, Long userId);
+	List<GroupInfo> findAllByCursorAndUserId(Long cursorId, Category category, int size, Long userId, String groupName);
 
-	List<GroupInfo> findAllByCursorAndCreatedUserId(Long cursorId, Category category, int size, Long userId);
+	List<GroupInfo> findAllByCursorAndCreatedUserId(Long cursorId, Category category, int size, Long userId, String groupName);
 
 	boolean checkJoinable(Long groupId);
 

src/main/java/flipnote/group/application/service/FindGroupService.java

@@ -97,7 +97,8 @@ public CursorPagingResponseDto<GroupInfo> findAllGroup(Long userId, GroupListReq
 		List<GroupInfo> groups = groupRepository.findAllByCursor(
 			req.getCursorId(),
 			req.getCategory(),
-			req.getSize());
+			req.getSize(),
+			req.getGroupName());
 
 		enrichGroupsWithImageUrl(groups);
 
@@ -116,7 +117,8 @@ public CursorPagingResponseDto<GroupInfo> findMyGroup(Long userId, GroupListRequ
 			req.getCursorId(),
 			req.getCategory(),
 			req.getSize(),
-			userId);
+			userId,
+			req.getGroupName());
 
 		enrichGroupsWithImageUrl(groups);
 
@@ -135,7 +137,8 @@ public CursorPagingResponseDto<GroupInfo> findCreatedGroup(Long userId, GroupLis
 			req.getCursorId(),
 			req.getCategory(),
 			req.getSize(),
-			userId);
+			userId,
+			req.getGroupName());
 
 		enrichGroupsWithImageUrl(groups);
 

src/main/java/flipnote/group/infrastructure/persistence/querydsl/GroupRepositoryCustom.java

@@ -6,9 +6,9 @@
 import flipnote.group.domain.model.group.GroupInfo;
 
 public interface GroupRepositoryCustom {
-	List<GroupInfo> findAllByCursor(Long lastId, Category category, int pageSize);
+	List<GroupInfo> findAllByCursor(Long lastId, Category category, int pageSize, String groupName);
 
-	List<GroupInfo> findAllByCursorAndUserId(Long lastId, Category category, int pageSize, Long userId);
+	List<GroupInfo> findAllByCursorAndUserId(Long lastId, Category category, int pageSize, Long userId, String groupName);
 
-	List<GroupInfo> findAllByCursorAndCreatedUserId(Long cursorId, Category category, int size, Long id);
+	List<GroupInfo> findAllByCursorAndCreatedUserId(Long cursorId, Category category, int size, Long id, String groupName);
 }

src/main/java/flipnote/group/infrastructure/persistence/querydsl/GroupRepositoryImpl.java

@@ -33,7 +33,7 @@ public class GroupRepositoryImpl implements GroupRepositoryCustom {
 	 * @return
 	 */
 	@Override
-	public List<GroupInfo> findAllByCursor(Long lastId, Category category, int pageSize) {
+	public List<GroupInfo> findAllByCursor(Long lastId, Category category, int pageSize, String groupName) {
 		//삭제되지 않은
 		BooleanBuilder where = new BooleanBuilder()
 			.and(group.deletedAt.isNull());
@@ -43,6 +43,10 @@ public List<GroupInfo> findAllByCursor(Long lastId, Category category, int pageS
 			where.and(group.id.lt(lastId));
 		}
 
+		if (groupName != null && !groupName.isBlank()) {
+			where.and(group.name.contains(groupName));
+		}
+
 		//카테고리 제한
 		if (category != null) {
 			where.and(group.category.eq(category));
@@ -73,7 +77,7 @@ public List<GroupInfo> findAllByCursor(Long lastId, Category category, int pageS
 	 * @return
 	 */
 	@Override
-	public List<GroupInfo> findAllByCursorAndUserId(Long lastId, Category category, int pageSize, Long userId) {
+	public List<GroupInfo> findAllByCursorAndUserId(Long lastId, Category category, int pageSize, Long userId, String groupName) {
 
 		BooleanBuilder where = new BooleanBuilder()
 			.and(group.deletedAt.isNull())
@@ -83,6 +87,10 @@ public List<GroupInfo> findAllByCursorAndUserId(Long lastId, Category category,
 			where.and(group.id.lt(lastId));
 		}
 
+		if (groupName != null && !groupName.isBlank()) {
+			where.and(group.name.contains(groupName));
+		}
+
 		if (category != null) {
 			where.and(group.category.eq(category));
 		}
@@ -114,7 +122,7 @@ public List<GroupInfo> findAllByCursorAndUserId(Long lastId, Category category,
 	 * @return
 	 */
 	@Override
-	public List<GroupInfo> findAllByCursorAndCreatedUserId(Long lastId, Category category, int pageSize, Long userId) {
+	public List<GroupInfo> findAllByCursorAndCreatedUserId(Long lastId, Category category, int pageSize, Long userId, String groupName) {
 
 		return queryFactory
 			.select(Projections.constructor(
@@ -134,7 +142,8 @@ public List<GroupInfo> findAllByCursorAndCreatedUserId(Long lastId, Category cat
 				groupMember.userId.eq(userId),
 				groupMember.role.role.eq(GroupMemberRole.OWNER),
 				lastId != null ? group.id.lt(lastId) : null,
-				category != null ? group.category.eq(category) : null
+				category != null ? group.category.eq(category) : null,
+				groupName != null && !groupName.isBlank() ? group.name.contains(groupName) : null
 			)
 			.orderBy(group.id.desc())
 			.limit(pageSize + 1)