-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #130 from IT-Cotato/develop
[Release]: V2.2024.08.23.01
- Loading branch information
Showing
14 changed files
with
217 additions
and
13 deletions.
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
10 changes: 10 additions & 0 deletions
10
src/main/java/org/cotato/csquiz/api/project/dto/CreateProjectImageRequest.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,10 @@ | ||
package org.cotato.csquiz.api.project.dto; | ||
|
||
import org.springframework.web.multipart.MultipartFile; | ||
|
||
public record CreateProjectImageRequest( | ||
Long projectId, | ||
MultipartFile logoImage, | ||
MultipartFile thumbNailImage | ||
) { | ||
} |
6 changes: 6 additions & 0 deletions
6
src/main/java/org/cotato/csquiz/api/project/dto/CreateProjectImageResponse.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,6 @@ | ||
package org.cotato.csquiz.api.project.dto; | ||
|
||
public record CreateProjectImageResponse( | ||
|
||
) { | ||
} |
18 changes: 18 additions & 0 deletions
18
src/main/java/org/cotato/csquiz/api/project/dto/CreateProjectRequest.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 org.cotato.csquiz.api.project.dto; | ||
|
||
import jakarta.validation.Valid; | ||
import jakarta.validation.constraints.NotNull; | ||
import java.util.List; | ||
|
||
public record CreateProjectRequest( | ||
@NotNull | ||
Integer generationNumber, | ||
@NotNull | ||
String projectName, | ||
String projectIntroduction, | ||
String githubUrl, | ||
String behanceUrl, | ||
String projectUrl, | ||
@Valid @NotNull List<ProjectMemberRequest> members | ||
) { | ||
} |
13 changes: 13 additions & 0 deletions
13
src/main/java/org/cotato/csquiz/api/project/dto/CreateProjectResponse.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,13 @@ | ||
package org.cotato.csquiz.api.project.dto; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import org.cotato.csquiz.domain.generation.entity.Project; | ||
|
||
public record CreateProjectResponse( | ||
@Schema(description = "생성된 프로젝트 PK") | ||
Long projectId | ||
) { | ||
public static CreateProjectResponse from(Project createdProject) { | ||
return new CreateProjectResponse(createdProject.getId()); | ||
} | ||
} |
10 changes: 10 additions & 0 deletions
10
src/main/java/org/cotato/csquiz/api/project/dto/ProjectImageRequest.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,10 @@ | ||
package org.cotato.csquiz.api.project.dto; | ||
|
||
import org.cotato.csquiz.domain.generation.enums.ProjectImageType; | ||
import org.springframework.web.multipart.MultipartFile; | ||
|
||
public record ProjectImageRequest( | ||
ProjectImageType imageType, | ||
MultipartFile image | ||
) { | ||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/org/cotato/csquiz/api/project/dto/ProjectMemberRequest.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,12 @@ | ||
package org.cotato.csquiz.api.project.dto; | ||
|
||
import jakarta.validation.constraints.NotNull; | ||
import org.cotato.csquiz.domain.auth.enums.MemberPosition; | ||
|
||
public record ProjectMemberRequest( | ||
@NotNull | ||
String name, | ||
@NotNull | ||
MemberPosition position | ||
) { | ||
} |
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
38 changes: 38 additions & 0 deletions
38
src/main/java/org/cotato/csquiz/domain/generation/service/ProjectImageService.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,38 @@ | ||
package org.cotato.csquiz.domain.generation.service; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
import lombok.RequiredArgsConstructor; | ||
import org.cotato.csquiz.api.project.dto.ProjectImageRequest; | ||
import org.cotato.csquiz.common.entity.S3Info; | ||
import org.cotato.csquiz.common.error.exception.ImageException; | ||
import org.cotato.csquiz.common.s3.S3Uploader; | ||
import org.cotato.csquiz.domain.generation.entity.Project; | ||
import org.cotato.csquiz.domain.generation.entity.ProjectImage; | ||
import org.cotato.csquiz.domain.generation.repository.ProjectImageRepository; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
import org.springframework.web.multipart.MultipartFile; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class ProjectImageService { | ||
|
||
private static final String PROJECT_IMAGE = "projects"; | ||
private final S3Uploader s3Uploader; | ||
private final ProjectImageRepository projectImageRepository; | ||
|
||
@Transactional | ||
public void createProjectImage(Long projectId, MultipartFile logoImage, MultipartFile thumbNameImage) | ||
throws ImageException { | ||
List<ProjectImage> newImages = new ArrayList<>(); | ||
|
||
S3Info logoImageInfo = s3Uploader.uploadFiles(logoImage, PROJECT_IMAGE); | ||
newImages.add(ProjectImage.logoImage(logoImageInfo, projectId)); | ||
|
||
S3Info thumbNailInfo = s3Uploader.uploadFiles(thumbNameImage, PROJECT_IMAGE); | ||
newImages.add(ProjectImage.thumbNailImage(thumbNailInfo, projectId)); | ||
|
||
projectImageRepository.saveAll(newImages); | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
src/main/java/org/cotato/csquiz/domain/generation/service/ProjectMemberService.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,27 @@ | ||
package org.cotato.csquiz.domain.generation.service; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
import lombok.RequiredArgsConstructor; | ||
import org.cotato.csquiz.api.project.dto.ProjectMemberRequest; | ||
import org.cotato.csquiz.domain.generation.entity.Project; | ||
import org.cotato.csquiz.domain.generation.entity.ProjectMember; | ||
import org.cotato.csquiz.domain.generation.repository.ProjectMemberRepository; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class ProjectMemberService { | ||
|
||
private final ProjectMemberRepository projectMemberRepository; | ||
|
||
@Transactional | ||
public void createProjectMember(Project project, List<ProjectMemberRequest> members) { | ||
List<ProjectMember> newMembers = members.stream() | ||
.map(request -> ProjectMember.of(request.position(), request.name(), project)) | ||
.toList(); | ||
|
||
projectMemberRepository.saveAll(newMembers); | ||
} | ||
} |
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