Merge pull request #122 from 9oormthon-univ/feature/#111

🩹 [FIX] 필드 이름 수정
9oormthon-univ · Dec 4, 2024 · a2fef3e · a2fef3e
2 parents 023f04d + 60476c2
commit a2fef3e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/com/carely/backend/controller/EasyCodefController.java b/src/main/java/com/carely/backend/controller/EasyCodefController.java
@@ -54,13 +54,13 @@ public ResponseEntity<ResponseDTO> connectAPI(@RequestBody RequestUserIdentityDT
                 .loginType("6")
                 .loginTypeLevel("1")
                 .telecom("")
-                .phoneNo(requestUserIdentityDTO.getPhoneNo())
-                .loginUserName(requestUserIdentityDTO.getUserName())
+                .phoneNo(requestUserIdentityDTO.getPhoneNum())
+                .loginUserName(requestUserIdentityDTO.getNickname())
                 .loginIdentity(requestUserIdentityDTO.getIdentity())
                 .loginBirthDate("")
                 .birthDate("")
                 .identity(requestUserIdentityDTO.getIdentity())
-                .userName(requestUserIdentityDTO.getUserName())
+                .userName(requestUserIdentityDTO.getNickname())
                 .issueDate(requestUserIdentityDTO.getIssueDate())
                 .identityEncYn("")
                 .build();

diff --git a/src/main/java/com/carely/backend/dto/easyCodef/RequestUserIdentityDTO.java b/src/main/java/com/carely/backend/dto/easyCodef/RequestUserIdentityDTO.java
@@ -5,9 +5,9 @@
 @Getter
 public class RequestUserIdentityDTO {
     //핸드폰 번호
-    private String phoneNo;
+    private String phoneNum;
     //이름
-    private String userName;
+    private String nickname;
     //발급일자
     private String issueDate;
     //주민번호

diff --git a/src/main/java/com/carely/backend/repository/VolunteerRepository.java b/src/main/java/com/carely/backend/repository/VolunteerRepository.java
@@ -24,4 +24,9 @@ public interface VolunteerRepository extends JpaRepository<Volunteer, Long> {
     List<Volunteer> findByVolunteerOrCaregiver(@Param("volunteer") User volunteer);
 
     List<Volunteer> findByVolunteerAndHasMemoFalse(User writer);
+
+    @Query("SELECT v FROM Volunteer v " +
+            "WHERE v.caregiver IN (SELECT j.user FROM JoinGroup j WHERE j.group.id = :groupId) " +
+            "AND v.volunteer IN (SELECT j.user FROM JoinGroup j WHERE j.group.id = :groupId)")
+    List<Volunteer> findVolunteersInGroup(@Param("groupId") Long groupId);
 }