Merge pull request #257 from Open-Eye-Im-Developer/develop

[MERGE] develop을 main에 반영
Open-Eye-Im-Developer · Mar 12, 2024 · 97f8845 · 97f8845
2 parents b51a522 + 047622b
commit 97f8845
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...ogakgo/domain/project_join_req/infrastructure/ProjectJoinRequestRepositoryCustomImpl.java b/...ogakgo/domain/project_join_req/infrastructure/ProjectJoinRequestRepositoryCustomImpl.java
@@ -96,6 +96,7 @@ public CursorPaginationResult<ProjectJoinRequestDetailAPIRes> getBySenderIdWithP
 
         List<ProjectJoinRequestDetailAPIRes> result = entities.stream().map(
             projectJoinRequest -> new ProjectJoinRequestDetailAPIRes(
+                    projectJoinRequest.getId(),
                     projectJoinRequest.getProject().getId(),
                     projectJoinRequest.getProject().getCreator().getAvatarUrl(),
                     new MeetingInfoResponse(

diff --git a/.../mogakgo/domain/project_join_req/presentation/dto/res/ProjectJoinRequestDetailAPIRes.java b/.../mogakgo/domain/project_join_req/presentation/dto/res/ProjectJoinRequestDetailAPIRes.java
@@ -9,28 +9,34 @@
 @Getter
 public class ProjectJoinRequestDetailAPIRes {
 
+    @Schema(description = "프로젝트 요청 ID", example = "10", implementation = Long.class)
+    @NotNull
+    private final Long id;
+
     @Schema(description = "프로젝트 ID", example = "3", implementation = Long.class)
     @NotNull
     private final Long projectId;
 
     @Schema(description = "프로젝트 생성자 아바타 URL", example = "https://avatars.githubusercontent.com/u/85854384?v=4")
     private final String creatorAvatorUrl;
 
-    @Schema(description = "프로젝트 만남 장ㅔ")
+    @Schema(description = "프로젝트 만남 장소")
     private final MeetingInfoResponse meetingInfo;
 
-    public ProjectJoinRequestDetailAPIRes(Long projectId, String creatorAvatorUrl,
-        MeetingInfoResponse meetingInfo
+    public ProjectJoinRequestDetailAPIRes(Long id, Long projectId,
+        String creatorAvatorUrl, MeetingInfoResponse meetingInfo
     ) {
+        this.id = id;
         this.projectId = projectId;
         this.creatorAvatorUrl = creatorAvatorUrl;
         this.meetingInfo = meetingInfo;
     }
 
-    public static ProjectJoinRequestDetailAPIRes from(Long projectId, String creatorAvatorUrl,
-        MeetingInfoResponse meetingInfo
+    public static ProjectJoinRequestDetailAPIRes from(Long id, Long projectId,
+        String creatorAvatorUrl, MeetingInfoResponse meetingInfo
     ) {
-        return new ProjectJoinRequestDetailAPIRes(projectId, creatorAvatorUrl, meetingInfo);
+        return new ProjectJoinRequestDetailAPIRes(
+            id, projectId, creatorAvatorUrl, meetingInfo);
     }
 
 }