Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 리크루트 신청 신청시간, 확정시간 필드명 수정 #250

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;

@Getter
@NoArgsConstructor
public class GetRecruitApplicationDetailResDto {
Expand All @@ -15,6 +17,7 @@ public class GetRecruitApplicationDetailResDto {
private String reply;
private String question;
private Boolean liked;
private LocalDateTime appliedAt;

public GetRecruitApplicationDetailResDto(RecruitApplicationElement recruitApplicationElement) {
this.recruitId = recruitApplicationElement.getRecruitId();
Expand All @@ -25,5 +28,6 @@ public GetRecruitApplicationDetailResDto(RecruitApplicationElement recruitApplic
this.reply = recruitApplicationElement.getReply();
this.question = recruitApplicationElement.getQuestion();
this.liked = recruitApplicationElement.getLiked();
this.appliedAt = recruitApplicationElement.getCreatedAt();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
public class GetRecruitApplicationsResDto {
private String category;
private Long recruitId;
private Map<String, List<RecruitApplicationElement>> recruitApplications;
private Map<String, List<PendingRecruitApplicationElement>> recruitApplications;

public GetRecruitApplicationsResDto(Recruit recruit, List<RecruitApplicationElement> recruitApplications) {
this.category = recruit.getCategory().name();
Expand All @@ -28,9 +28,9 @@ public GetRecruitApplicationsResDto(Recruit recruit, List<RecruitApplicationElem
});

recruitApplications.forEach(recruitApplicationElement -> {
List<RecruitApplicationElement> applications = this.recruitApplications
List<PendingRecruitApplicationElement> applications = this.recruitApplications
.getOrDefault(recruitApplicationElement.getRecruitType(), new ArrayList<>());
applications.add(recruitApplicationElement);
applications.add(new PendingRecruitApplicationElement(recruitApplicationElement));
this.recruitApplications.put(recruitApplicationElement.getRecruitType(), applications);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@Builder
public class ParticipantElement {
private Long recruitApplicationId;
private LocalDateTime modifiedAt;
private LocalDateTime joinedAt;
private Long memberId;
private String nickname;
private Boolean isMajor;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.ssafy.ssafsound.domain.recruitapplication.dto;

import com.ssafy.ssafsound.domain.member.dto.AuthorElement;
import com.ssafy.ssafsound.domain.recruitapplication.domain.MatchStatus;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;

@Getter
@NoArgsConstructor
public class PendingRecruitApplicationElement {
private Long recruitApplicationId;
private MatchStatus matchStatus;
private AuthorElement author;
private String reply;
private String question;
private Boolean liked;
private LocalDateTime appliedAt;

public PendingRecruitApplicationElement(RecruitApplicationElement recruitApplicationElement) {
this.recruitApplicationId = recruitApplicationElement.getRecruitApplicationId();
this.matchStatus = recruitApplicationElement.getMatchStatus();
this.author = recruitApplicationElement.getAuthor();
this.reply = recruitApplicationElement.getReply();
this.question = recruitApplicationElement.getQuestion();
this.liked = recruitApplicationElement.getLiked();
this.appliedAt = recruitApplicationElement.getCreatedAt();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void addMember(Long recruitApplicationId, LocalDateTime modifiedAt, Membe

members.add(ParticipantElement.builder()
.recruitApplicationId(recruitApplicationId)
.modifiedAt(modifiedAt)
.joinedAt(modifiedAt)
.memberId(member.getId())
.nickname(member.getNickname())
.isMajor(member.getMajor())
Expand Down
76 changes: 38 additions & 38 deletions src/main/resources/static/docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ <h4 id="_게시글_목록_조회_http_response"><a class="link" href="#_게시
"content" : "저도 싸피에서 교육들으면 개발실력 엄청 오르겠죠?",
"likeCount" : 11,
"commentCount" : 29,
"createdAt" : "2023-09-21T00:27:32.307179",
"createdAt" : "2023-09-22T23:36:08.300052",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand All @@ -843,7 +843,7 @@ <h4 id="_게시글_목록_조회_http_response"><a class="link" href="#_게시
"content" : "역시 B형 특강을 열심히 듣는게 맞나요?",
"likeCount" : 5,
"commentCount" : 14,
"createdAt" : "2023-09-21T00:27:32.307198",
"createdAt" : "2023-09-22T23:36:08.300081",
"nickname" : "익명",
"anonymity" : true,
"thumbnail" : "썸네일 URL"
Expand Down Expand Up @@ -1585,7 +1585,7 @@ <h4 id="_게시글_검색_http_response"><a class="link" href="#_게시글_검
Vary: Access-Control-Request-Method
Vary: Access-Control-Request-Headers
Content-Type: application/json
Content-Length: 491
Content-Length: 490

{
"code" : "200",
Expand All @@ -1599,7 +1599,7 @@ <h4 id="_게시글_검색_http_response"><a class="link" href="#_게시글_검
"content" : "SSAFY 9기 합격했습니다!!",
"likeCount" : 3,
"commentCount" : 2,
"createdAt" : "2023-09-21T00:27:32.307204",
"createdAt" : "2023-09-22T23:36:08.30009",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand Down Expand Up @@ -2508,7 +2508,7 @@ <h4 id="_hot_게시글_목록_조회_http_response"><a class="link" href="#_hot_
"content" : "열심히 SSAFY 9기를 수료하시면 취업에 성공하실겁니다.",
"likeCount" : 102,
"commentCount" : 33,
"createdAt" : "2023-09-21T00:27:32.307209",
"createdAt" : "2023-09-22T23:36:08.300097",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand All @@ -2520,7 +2520,7 @@ <h4 id="_hot_게시글_목록_조회_http_response"><a class="link" href="#_hot_
"content" : "은 실력입니다.",
"likeCount" : 202,
"commentCount" : 54,
"createdAt" : "2023-09-21T00:27:32.307214",
"createdAt" : "2023-09-22T23:36:08.300104",
"nickname" : "익명",
"anonymity" : true,
"thumbnail" : "썸네일 URL"
Expand Down Expand Up @@ -2712,7 +2712,7 @@ <h4 id="_hot_게시글_검색_http_response"><a class="link" href="#_hot_게시
"content" : "열심히 SSAFY 9기를 수료하시면 취업에 성공하실겁니다.",
"likeCount" : 102,
"commentCount" : 33,
"createdAt" : "2023-09-21T00:27:32.307209",
"createdAt" : "2023-09-22T23:36:08.300097",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand Down Expand Up @@ -2894,7 +2894,7 @@ <h4 id="_나의_게시글_목록_조회_http_response"><a class="link" href="#_
Vary: Access-Control-Request-Method
Vary: Access-Control-Request-Headers
Content-Type: application/json
Content-Length: 923
Content-Length: 922

{
"code" : "200",
Expand All @@ -2908,7 +2908,7 @@ <h4 id="_나의_게시글_목록_조회_http_response"><a class="link" href="#_
"content" : "SSAFY 9기 합격했습니다!!",
"likeCount" : 3,
"commentCount" : 2,
"createdAt" : "2023-09-21T00:27:32.307217",
"createdAt" : "2023-09-22T23:36:08.300107",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand All @@ -2920,7 +2920,7 @@ <h4 id="_나의_게시글_목록_조회_http_response"><a class="link" href="#_
"content" : "열심히 SSAFY 9기를 수료하시면 취업에 성공하실겁니다.",
"likeCount" : 102,
"commentCount" : 33,
"createdAt" : "2023-09-21T00:27:32.307219",
"createdAt" : "2023-09-22T23:36:08.30011",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand Down Expand Up @@ -3112,7 +3112,7 @@ <h4 id="_나의_스크랩_게시글_목록_조회_http_response"><a class="link"
"content" : "역시 B형 특강을 열심히 듣는게 맞나요?",
"likeCount" : 5,
"commentCount" : 14,
"createdAt" : "2023-09-21T00:27:32.307198",
"createdAt" : "2023-09-22T23:36:08.300081",
"nickname" : "익명",
"anonymity" : true,
"thumbnail" : "썸네일 URL"
Expand All @@ -3124,7 +3124,7 @@ <h4 id="_나의_스크랩_게시글_목록_조회_http_response"><a class="link"
"content" : "저도 싸피에서 교육들으면 개발실력 엄청 오르겠죠?",
"likeCount" : 11,
"commentCount" : 29,
"createdAt" : "2023-09-21T00:27:32.307179",
"createdAt" : "2023-09-22T23:36:08.300052",
"nickname" : "이용준",
"anonymity" : false,
"thumbnail" : "썸네일 URL"
Expand Down Expand Up @@ -3317,7 +3317,7 @@ <h4 id="_댓글_목록_조회_http_response"><a class="link" href="#_댓글_목
"commentId" : 1,
"content" : "반가워요",
"likeCount" : 3,
"createdAt" : "2023-09-21T00:27:32.304887",
"createdAt" : "2023-09-22T23:36:08.295714",
"anonymity" : true,
"modified" : false,
"liked" : true,
Expand All @@ -3335,7 +3335,7 @@ <h4 id="_댓글_목록_조회_http_response"><a class="link" href="#_댓글_목
"commentId" : 1,
"content" : "안녕하세요",
"likeCount" : 10,
"createdAt" : "2023-09-21T00:27:32.304321",
"createdAt" : "2023-09-22T23:36:08.294887",
"anonymity" : false,
"modified" : false,
"liked" : false,
Expand Down Expand Up @@ -4788,8 +4788,8 @@ <h4 id="_로그인_http_response"><a class="link" href="#_로그인_http_respons
Vary: Origin
Vary: Access-Control-Request-Method
Vary: Access-Control-Request-Headers
Set-Cookie: accessToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c; Path=/; Max-Age=2629744; Expires=Sat, 21 Oct 2023 01:56:35 GMT; Secure; HttpOnly
Set-Cookie: refreshToken=syJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IsdfserwetweSflKxwRJeSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c; Path=/auth/reissue; Max-Age=2629744; Expires=Sat, 21 Oct 2023 01:56:35 GMT; Secure; HttpOnly
Set-Cookie: accessToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c; Path=/; Max-Age=2629744; Expires=Mon, 23 Oct 2023 01:05:10 GMT; Secure; HttpOnly
Set-Cookie: refreshToken=syJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IsdfserwetweSflKxwRJeSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c; Path=/auth/reissue; Max-Age=2629744; Expires=Mon, 23 Oct 2023 01:05:10 GMT; Secure; HttpOnly
Content-Type: application/json
Content-Length: 415

Expand Down Expand Up @@ -7937,7 +7937,7 @@ <h4 id="_리크루트_등록_http_request"><a class="link" href="#_리크루트_

{
"category" : "PROJECT",
"recruitEnd" : "2023-09-28",
"recruitEnd" : "2023-09-29",
"title" : "[사이드 프로젝트] 공모전 레퍼런스 웹 플랫폼 개발 프로젝트 팀원을 모집합니다.",
"content" : "&lt;p&gt;[프로젝트 소개]&lt;/p&gt;\n저희 프로젝트는 대학생들의 공모전 경험에 있어 누구나 참고할 레퍼런스를 제공받고, 또 자발적으로 공유할 수 있는 환경을 구축하고자 시작하게 되었습니다! 저희 프로젝트는 아래와 같은 특징을 가지고 있습니다.\n현재 PM 1명, 프론트엔드 개발자 2명, 백엔드 개발자 1명이 있으며, 디자인의 경우 PM이 1차 MVP의 UI/UX를 제작했습니다.\n",
"contactURI" : "https://open.kakao.com/o/sA8Kb83b",
Expand Down Expand Up @@ -8409,8 +8409,8 @@ <h4 id="_리크루트_상세_조회_http_response"><a class="link" href="#_리
"contactURI" : "https://open.kakao.com/o/sA8Kb83b",
"view" : 1,
"finishedRecruit" : false,
"recruitStart" : "2023-09-21",
"recruitEnd" : "2023-09-28",
"recruitStart" : "2023-09-22",
"recruitEnd" : "2023-09-29",
"skills" : [ {
"skillId" : 1,
"name" : "Spring"
Expand Down Expand Up @@ -9007,7 +9007,7 @@ <h4 id="_리크루트_목록_조회_2_http_response"><a class="link" href="#_리
"category" : "PROJECT",
"title" : "[사이드 프로젝트] 공모전 레퍼런스 웹 플랫폼 개발 프로젝트 팀원을 모집합니다.",
"finishedRecruit" : false,
"recruitEnd" : "2023-09-28",
"recruitEnd" : "2023-09-29",
"content" : "&lt;p&gt;[프로젝트 소개]&lt;/p&gt;\n저희 ",
"skills" : [ {
"skillId" : 1,
Expand Down Expand Up @@ -9757,7 +9757,7 @@ <h4 id="_리크루트_참여자_목록_조회_http_response"><a class="link" hre
Vary: Access-Control-Request-Method
Vary: Access-Control-Request-Headers
Content-Type: application/json
Content-Length: 993
Content-Length: 989

{
"code" : "200",
Expand All @@ -9768,7 +9768,7 @@ <h4 id="_리크루트_참여자_목록_조회_http_response"><a class="link" hre
"limit" : 4,
"members" : [ {
"recruitApplicationId" : -1,
"modifiedAt" : "2023-09-21T00:27:34.220094",
"joinedAt" : "2023-09-22T23:36:17.891781",
"memberId" : 99,
"nickname" : "KIM",
"isMajor" : true,
Expand All @@ -9784,7 +9784,7 @@ <h4 id="_리크루트_참여자_목록_조회_http_response"><a class="link" hre
"limit" : 3,
"members" : [ {
"recruitApplicationId" : 1,
"modifiedAt" : "2023-09-21T00:27:34.576735",
"joinedAt" : "2023-09-22T23:36:19.235585",
"memberId" : 100,
"nickname" : "TIM",
"isMajor" : true,
Expand Down Expand Up @@ -9849,9 +9849,9 @@ <h4 id="_리크루트_참여자_목록_조회_response_fields"><a class="link" h
<td class="tableblock halign-left valign-top"><p class="tableblock">참여신청 PK</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitTypes.*.members[].modifiedAt</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitTypes.*.members[].joinedAt</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">참여 신청일</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">참여 확정일</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitTypes.*.members[].nickname</code></p></td>
Expand Down Expand Up @@ -9950,7 +9950,7 @@ <h4 id="_등록자_리크루트_참여신청_목록_조회_http_response"><a cla
Vary: Access-Control-Request-Method
Vary: Access-Control-Request-Headers
Content-Type: application/json
Content-Length: 918
Content-Length: 866

{
"code" : "200",
Expand Down Expand Up @@ -9978,8 +9978,7 @@ <h4 id="_등록자_리크루트_참여신청_목록_조회_http_response"><a cla
"reply" : "취업 준비를 위해서 신청하게되었습니다.",
"question" : "프로젝트에 참여하고자 하는 동기가 무엇인가요?",
"liked" : false,
"createdAt" : "2023-09-21T00:27:34.57608",
"modifiedAt" : "2023-09-21T00:27:34.576091"
"appliedAt" : "2023-09-22T23:36:19.232224"
} ]
}
}
Expand Down Expand Up @@ -10079,14 +10078,9 @@ <h4 id="_등록자_리크루트_참여신청_목록_조회_response_fields"><a c
<td class="tableblock halign-left valign-top"><p class="tableblock">등록자 좋아요 여부</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitApplications.*.[].createdAt</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">등록일</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitApplications.*.[].modifiedAt</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitApplications.*.[].appliedAt</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">최종 수정일</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">참여 신청일</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.recruitApplications.*.[].author.ssafyInfo.semester</code></p></td>
Expand Down Expand Up @@ -10292,7 +10286,7 @@ <h4 id="_등록자_리크루트_참여신청_상세_조회_http_response"><a cla
Vary: Access-Control-Request-Method
Vary: Access-Control-Request-Headers
Content-Type: application/json
Content-Length: 677
Content-Length: 725

{
"code" : "200",
Expand All @@ -10317,7 +10311,8 @@ <h4 id="_등록자_리크루트_참여신청_상세_조회_http_response"><a cla
},
"reply" : "취업 준비를 위해서 신청하게되었습니다.",
"question" : "프로젝트에 참여하고자 하는 동기가 무엇인가요?",
"liked" : false
"liked" : false,
"appliedAt" : "2023-09-22T23:36:19.232224"
}
}</code></pre>
</div>
Expand Down Expand Up @@ -10415,6 +10410,11 @@ <h4 id="_등록자_리크루트_참여신청_상세_조회_response_fields"><a c
<td class="tableblock halign-left valign-top"><p class="tableblock">등록자 좋아요 여부</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.appliedAt</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">신청일</p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.author.ssafyInfo.semester</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">참여자 싸피 기수 (1~10)</p></td>
Expand Down Expand Up @@ -11045,7 +11045,7 @@ <h4 id="_리크루트_덧글_목록_조회_http_response"><a class="link" href="
"likeCount" : 0,
"liked" : false,
"mine" : false,
"createdAt" : "2023-09-21T00:27:34.756578",
"createdAt" : "2023-09-22T23:36:19.924127",
"deletedComment" : false,
"modified" : false,
"author" : {
Expand Down
Loading