merge conflict fix

Author: joowojr

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java

@@ -46,20 +46,20 @@ private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
         BooleanBuilder whereClause = new BooleanBuilder();
         whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
 
-        if (filterRequest.getName() != null) {
-            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.getName()));
+        if (filterRequest.name() != null) {
+            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.name()));
         }
-        if (filterRequest.getEmail() != null) {
-            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.getEmail()));
+        if (filterRequest.email() != null) {
+            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.email()));
         }
-        if (filterRequest.getNickname() != null) {
-            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.getNickname()));
+        if (filterRequest.nickName() != null) {
+            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.nickName()));
         }
-        if (filterRequest.getDepartmentId() != null) {
-            whereClause.and(memberEntity.department.departmentId.eq(filterRequest.getDepartmentId()));
+        if (filterRequest.departmentName() != null) {
+            whereClause.and(memberEntity.department.name.eq(filterRequest.departmentName()));
         }
-        if (filterRequest.getRole() != null) {
-            whereClause.and(memberEntity.role.eq(filterRequest.getRole()));
+        if (filterRequest.role() != null) {
+            whereClause.and(memberEntity.role.eq(filterRequest.role()));
         }
 
         return whereClause;