-
Notifications
You must be signed in to change notification settings - Fork 0
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
#27 [FEAT] 프로젝트 등록 API 개발 #31
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
...n/java/com/puzzling/puzzlingServer/api/project/dto/request/ProjectRegisterRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package com.puzzling.puzzlingServer.api.project.dto.request; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import javax.validation.constraints.NotBlank; | ||
import javax.validation.constraints.NotEmpty; | ||
|
||
import java.lang.reflect.Array; | ||
import java.util.List; | ||
|
||
import static lombok.AccessLevel.PROTECTED; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = PROTECTED) | ||
@AllArgsConstructor | ||
public class ProjectRegisterRequestDto { | ||
@NotBlank | ||
private String projectName; | ||
@NotBlank | ||
private String projectIntro; | ||
@NotBlank | ||
private String projectStartDate; | ||
@NotBlank | ||
private String memberProjectRole; | ||
@NotBlank | ||
private String memberProjectNickname; | ||
@NotEmpty | ||
private String[] reviewCycle; | ||
} |
18 changes: 18 additions & 0 deletions
18
...java/com/puzzling/puzzlingServer/api/project/dto/response/ProjectRegisterResponseDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package com.puzzling.puzzlingServer.api.project.dto.response; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import static lombok.AccessLevel.PRIVATE; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = PRIVATE) | ||
@AllArgsConstructor | ||
public class ProjectRegisterResponseDto { | ||
private String projectCode; | ||
|
||
public static ProjectRegisterResponseDto of(String projectCode){ | ||
return new ProjectRegisterResponseDto(projectCode); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ | |
import com.puzzling.puzzlingServer.api.member.domain.Member; | ||
import com.puzzling.puzzlingServer.api.member.repository.MemberRepository; | ||
import com.puzzling.puzzlingServer.api.project.domain.UserProject; | ||
import com.puzzling.puzzlingServer.api.project.dto.request.ProjectRegisterRequestDto; | ||
import com.puzzling.puzzlingServer.api.project.dto.response.*; | ||
import com.puzzling.puzzlingServer.api.project.repository.ProjectRepository; | ||
import com.puzzling.puzzlingServer.api.project.domain.Project; | ||
|
@@ -15,13 +16,16 @@ | |
import com.puzzling.puzzlingServer.common.response.ErrorStatus; | ||
import com.puzzling.puzzlingServer.common.util.MemberUtil; | ||
import lombok.RequiredArgsConstructor; | ||
import org.apache.catalina.User; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.PageRequest; | ||
import org.springframework.data.domain.Pageable; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import java.nio.ByteBuffer; | ||
import java.security.Principal; | ||
import java.security.SecureRandom; | ||
import java.time.DayOfWeek; | ||
import java.time.LocalDate; | ||
import java.time.format.DateTimeFormatter; | ||
|
@@ -131,6 +135,36 @@ public ProjectTeamPuzzleResponseDto getTeamPuzzles(Principal principal, Long pro | |
isReviewDay, hasTodayReview); | ||
} | ||
|
||
@Override | ||
@Transactional | ||
public ProjectRegisterResponseDto createProject(Long memberId, ProjectRegisterRequestDto projectRegisterRequestDto){ | ||
String inviteCode = makeShortUUID(); | ||
String cycle = convertReviewCycleToString(projectRegisterRequestDto.getReviewCycle()); | ||
|
||
Project project = Project.builder() | ||
.name(projectRegisterRequestDto.getProjectName()) | ||
.intro(projectRegisterRequestDto.getProjectIntro()) | ||
.startDate(projectRegisterRequestDto.getProjectStartDate()) | ||
.code(inviteCode) | ||
.createUserId(memberId) | ||
.reviewCycle(cycle) | ||
.build(); | ||
Project savedProject = projectRepository.save(project); | ||
|
||
Member member = findMemberById(memberId); | ||
|
||
UserProject userProject = UserProject.builder() | ||
.role(projectRegisterRequestDto.getMemberProjectRole()) | ||
.nickname(projectRegisterRequestDto.getMemberProjectNickname()) | ||
.leaderOrNot(Boolean.TRUE) | ||
.reviewTemplateId(0L) | ||
.member(member) | ||
.project(savedProject) | ||
.build(); | ||
userProjectRepository.save(userProject); | ||
return new ProjectRegisterResponseDto(cycle); | ||
} | ||
|
||
private String getReviewMemberPercent(Long projectId, int reviewCount) { | ||
int totalProjectMember = userProjectRepository.findAllByProjectId(projectId).size(); | ||
float percent = (float) reviewCount/totalProjectMember; | ||
|
@@ -173,4 +207,29 @@ private ProjectMyPuzzleObjectDto mapperMyPuzzleObject(Long memberId, Long projec | |
return ProjectMyPuzzleObjectDto.of(findMember.getName(), puzzleCount); | ||
} | ||
|
||
// 10자리의 UUID 생성 | ||
public static String makeShortUUID() { | ||
UUID uuid = UUID.randomUUID(); | ||
return parseToShortUUID(uuid.toString()); | ||
} | ||
|
||
// 파라미터로 받은 값을 10자리의 UUID로 변환 | ||
public static String parseToShortUUID(String uuid) { | ||
int l = ByteBuffer.wrap(uuid.getBytes()).getInt(); | ||
return Integer.toString(l, 9); | ||
} | ||
|
||
public String convertReviewCycleToString(String[] array) { | ||
if (array == null || array.length == 0) { | ||
return ""; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. p4; 사실 dto 단에서 |
||
} | ||
StringBuilder sb = new StringBuilder(); | ||
for (int i = 0; i < array.length; i++) { | ||
sb.append(array[i]); | ||
if (i < array.length - 1) { | ||
sb.append(","); | ||
} | ||
} | ||
return sb.toString(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p4;
array.isEmpty()로 하면 더 깔끔할 것 같습니다 !