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.

Sign up for GitHub

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

[Chore] #268 - Master DTO 네이밍 변경 #288

Merged
merged 1 commit into from
Jun 22, 2023
+33 −115
Merged

[Chore] #268 - Master DTO 네이밍 변경 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/main/java/shop/cazait/domain/master/api/MasterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import shop.cazait.domain.master.dto.patch.PatchMasterReq;
import shop.cazait.domain.master.dto.post.PostMasterReq;
import shop.cazait.domain.master.dto.post.PostMasterRes;
import shop.cazait.domain.master.dto.request.MasterCreateInDTO;
import shop.cazait.domain.master.dto.request.MasterUpdateInDTO;
import shop.cazait.domain.master.dto.response.MasterCreateOutDTO;
import shop.cazait.domain.master.error.MasterException;
import shop.cazait.domain.master.service.MasterService;
import shop.cazait.domain.user.exception.UserException;
Expand All @@ -49,15 +49,15 @@ public class MasterController {
@NoAuth
@PostMapping("/sign-up")
@Operation(summary = "마스터 회원가입", description = "마스터 사용자의 정보들을 이용해서 회원가입을 진행한다.")
public SuccessResponse<PostMasterRes> registerMaster(@Validated @RequestBody PostMasterReq dto) throws
public SuccessResponse<MasterCreateOutDTO> registerMaster(@Validated @RequestBody MasterCreateInDTO dto) throws
MasterException,
InvalidAlgorithmParameterException,
NoSuchPaddingException,
IllegalBlockSizeException,
NoSuchAlgorithmException,
BadPaddingException,
InvalidKeyException {
PostMasterRes postCreateMasterRes = masterService.registerMaster(dto);
MasterCreateOutDTO postCreateMasterRes = masterService.registerMaster(dto);
return new SuccessResponse<>(CREATE_MASTER, postCreateMasterRes);
}

Expand All @@ -69,10 +69,10 @@ public SuccessResponse<PostMasterRes> registerMaster(@Validated @RequestBody Pos
)
public SuccessResponse<String> updateMaster(
@PathVariable(name = "masterId") Long masterId,
@RequestBody @Valid PatchMasterReq patchMasterReq,
@RequestBody @Valid MasterUpdateInDTO masterUpdateInDTO,
@RequestHeader(value = "REFRESH-TOKEN") String refreshToken) throws UserException {
jwtService.isValidAccessTokenId(masterId);
masterService.updateMaster(masterId, patchMasterReq);
masterService.updateMaster(masterId, masterUpdateInDTO);
return new SuccessResponse<>(SUCCESS, "마스터 정보 수정 완료");
}

Expand Down
38 changes: 0 additions & 38 deletions src/main/java/shop/cazait/domain/master/dto/post/PostMasterLogInReq.java
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions src/main/java/shop/cazait/domain/master/dto/post/PostMasterLogInRes.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...domain/master/dto/post/PostMasterReq.java → ...master/dto/request/MasterCreateInDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package shop.cazait.domain.master.dto.post;
package shop.cazait.domain.master.dto.request;

import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
Expand All @@ -20,7 +20,7 @@
@Schema(description = "마스터 정보 Request : 회원 가입에 필요한 마스터 정보")
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class PostMasterReq {
public class MasterCreateInDTO {

@NotBlank(message = "Master 이메일을 입력해주세요.")
@Schema(description = "이메일", example = "[email protected]")
Expand Down
4 changes: 2 additions & 2 deletions ...main/master/dto/patch/PatchMasterReq.java → ...master/dto/request/MasterUpdateInDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package shop.cazait.domain.master.dto.patch;
package shop.cazait.domain.master.dto.request;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
Expand All @@ -11,7 +11,7 @@
@Schema(description = "마스터 수정 Request : 수정할 마스터 계정 정보")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Getter
public class PatchMasterReq {
public class MasterUpdateInDTO {

@Schema(description = "Master 이메일")
@NotBlank(message = "수정하고자 하는 마스터 계정의 이메일을 입력해주세요.")
Expand Down
8 changes: 4 additions & 4 deletions ...domain/master/dto/post/PostMasterRes.java → ...ster/dto/response/MasterCreateOutDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package shop.cazait.domain.master.dto.post;
package shop.cazait.domain.master.dto.response;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
Expand All @@ -9,7 +9,7 @@
@Schema(description = "마스터 정보 Response : 회원 가입한 마스터 계정 정보")
@Getter
@Builder(access = AccessLevel.PRIVATE)
public class PostMasterRes {
public class MasterCreateOutDTO {

@Schema(description = "마스터 계정 ID")
private Long id;
Expand All @@ -20,8 +20,8 @@ public class PostMasterRes {
@Schema(description = "마스터 계정 이름")
private String nickname;

static public PostMasterRes of(Master master) {
return PostMasterRes.builder()
static public MasterCreateOutDTO of(Master master) {
return MasterCreateOutDTO.builder()
.id(master.getId())
.email(master.getEmail())
.nickname(master.getNickname())
Expand Down
8 changes: 4 additions & 4 deletions ...t/domain/master/dto/get/GetMasterRes.java → ...master/dto/response/MasterListOutDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package shop.cazait.domain.master.dto.get;
package shop.cazait.domain.master.dto.response;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
Expand All @@ -9,7 +9,7 @@
@Schema(description = "마스터 조회 Response : 마스터 계정 정보")
@Getter
@Builder(access = AccessLevel.PRIVATE)
public class GetMasterRes {
public class MasterListOutDTO {
@Schema(description = "마스터 계정 ID")
private Long id;

Expand All @@ -19,8 +19,8 @@ public class GetMasterRes {
@Schema(description = "마스터 계정 이름")
private String nickname;

public static GetMasterRes of(Master master) {
return GetMasterRes.builder()
public static MasterListOutDTO of(Master master) {
return MasterListOutDTO.builder()
.id(master.getId())
.email(master.getEmail())
.nickname(master.getNickname())
Expand Down
5 changes: 2 additions & 3 deletions ...main/master/dto/patch/PatchMasterRes.java → ...ster/dto/response/MasterUptateOutDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package shop.cazait.domain.master.dto.patch;
package shop.cazait.domain.master.dto.response;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;

@Schema(description = "마스터 수정 Response : 수정한 마스터 계정 정보")
@Getter
@Builder
public class PatchMasterRes {
public class MasterUptateOutDTO {

@Schema(description = "마스터 계정 ID")
private Long id;
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/shop/cazait/domain/master/service/MasterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import lombok.extern.slf4j.Slf4j;
import shop.cazait.domain.auth.dto.PostLoginReq;
import shop.cazait.domain.auth.dto.PostLoginRes;
import shop.cazait.domain.master.dto.get.GetMasterRes;
import shop.cazait.domain.master.dto.patch.PatchMasterReq;
import shop.cazait.domain.master.dto.patch.PatchMasterRes;
import shop.cazait.domain.master.dto.post.PostMasterReq;
import shop.cazait.domain.master.dto.post.PostMasterRes;
import shop.cazait.domain.master.dto.request.MasterCreateInDTO;
import shop.cazait.domain.master.dto.request.MasterUpdateInDTO;
import shop.cazait.domain.master.dto.response.MasterCreateOutDTO;
import shop.cazait.domain.master.dto.response.MasterListOutDTO;
import shop.cazait.domain.master.dto.response.MasterUptateOutDTO;
import shop.cazait.domain.master.entity.Master;
import shop.cazait.domain.master.error.MasterException;
import shop.cazait.domain.master.repository.MasterRepository;
Expand All @@ -46,7 +46,7 @@ public class MasterService {
/**
* 마스터 회원 가입
*/
public PostMasterRes registerMaster(PostMasterReq dto) throws
public MasterCreateOutDTO registerMaster(MasterCreateInDTO dto) throws
MasterException,
InvalidAlgorithmParameterException,
NoSuchPaddingException,
Expand All @@ -68,7 +68,7 @@ public PostMasterRes registerMaster(PostMasterReq dto) throws
Master master = dto.toEntity();
masterRepository.save(master);

return PostMasterRes.of(master);
return MasterCreateOutDTO.of(master);

}

Expand Down Expand Up @@ -116,11 +116,11 @@ public PostLoginRes LoginMaster(PostLoginReq dto) throws

//마스터 회원 전체 조회
@Transactional(readOnly = true)
public List<GetMasterRes> getMasterByStatus(BaseStatus status) throws MasterException {
public List<MasterListOutDTO> getMasterByStatus(BaseStatus status) throws MasterException {
List<Master> masterList = masterRepository.findMasterByStatus(status);
List<GetMasterRes> masterResList = new ArrayList<>();
List<MasterListOutDTO> masterResList = new ArrayList<>();
for (Master master : masterList) {
GetMasterRes masterRes = GetMasterRes.of(master);
MasterListOutDTO masterRes = MasterListOutDTO.of(master);
masterResList.add(masterRes);
}
if (masterResList.isEmpty()) {
Expand All @@ -130,10 +130,10 @@ public List<GetMasterRes> getMasterByStatus(BaseStatus status) throws MasterExce
}

//마스터 회원 정보 업데이트
public PatchMasterRes updateMaster(Long id, PatchMasterReq patchMasterReq) {
public MasterUptateOutDTO updateMaster(Long id, MasterUpdateInDTO masterUpdateInDTO) {
Master findMaster = masterRepository.findMasterById(id).get();
Master updateMaster = masterRepository.save(findMaster);
return PatchMasterRes.builder()
return MasterUptateOutDTO.builder()
.id(updateMaster.getId())
.email(updateMaster.getEmail())
.password(updateMaster.getPassword())
Expand Down