diff --git a/src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsResponseDto.java b/src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsResponseDto.java index bd317a8..aaa530e 100644 --- a/src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsResponseDto.java +++ b/src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsResponseDto.java @@ -8,7 +8,7 @@ import com.project.bumawiki.domain.docs.domain.type.DocsType; import com.project.bumawiki.domain.docs.util.DocsUtil; import com.project.bumawiki.domain.user.domain.User; -import com.project.bumawiki.domain.user.presentation.dto.SimpleUserDto; +import com.project.bumawiki.domain.user.presentation.dto.response.SimpleUserResponseDto; public record DocsResponseDto( Long id, @@ -18,7 +18,7 @@ public record DocsResponseDto( LocalDateTime lastModifiedAt, int enroll, boolean isDocsDetail, - List contributors, + List contributors, int version, String thumbnail ) { @@ -33,7 +33,7 @@ public DocsResponseDto(Docs docs, List contributors, VersionDocs versionDo docs.getEnroll(), true, contributors.stream() - .map(SimpleUserDto::new) + .map(SimpleUserResponseDto::new) .toList(), versionDocs.getVersion(), DocsUtil.getThumbnail(versionDocs.getContents()) diff --git a/src/main/java/com/project/bumawiki/domain/user/presentation/UserController.java b/src/main/java/com/project/bumawiki/domain/user/presentation/UserController.java index 4324290..d508c03 100644 --- a/src/main/java/com/project/bumawiki/domain/user/presentation/UserController.java +++ b/src/main/java/com/project/bumawiki/domain/user/presentation/UserController.java @@ -15,8 +15,8 @@ import com.project.bumawiki.domain.auth.service.QueryAuthService; import com.project.bumawiki.domain.docs.service.QueryDocsService; import com.project.bumawiki.domain.user.domain.User; -import com.project.bumawiki.domain.user.presentation.dto.UserAuthorityRequestDto; -import com.project.bumawiki.domain.user.presentation.dto.UserResponseDto; +import com.project.bumawiki.domain.user.presentation.dto.request.UserAuthorityRequestDto; +import com.project.bumawiki.domain.user.presentation.dto.response.UserResponseDto; import com.project.bumawiki.domain.user.service.CommandUserService; import com.project.bumawiki.domain.user.service.QueryUserService; diff --git a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserAuthorityRequestDto.java b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserAuthorityRequestDto.java deleted file mode 100644 index 0c87554..0000000 --- a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserAuthorityRequestDto.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.project.bumawiki.domain.user.presentation.dto; - -import com.project.bumawiki.domain.user.domain.authority.Authority; - -import jakarta.validation.constraints.NotNull; - -public record UserAuthorityRequestDto( - @NotNull Long id, - @NotNull Authority authority -) { -} diff --git a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/request/UserAuthorityRequestDto.java b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/request/UserAuthorityRequestDto.java new file mode 100644 index 0000000..9ec3dc4 --- /dev/null +++ b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/request/UserAuthorityRequestDto.java @@ -0,0 +1,13 @@ +package com.project.bumawiki.domain.user.presentation.dto.request; + +import com.project.bumawiki.domain.user.domain.authority.Authority; + +import jakarta.validation.constraints.NotNull; + +public record UserAuthorityRequestDto( + @NotNull(message = "id는 null일 수 없습니다.") + Long id, + @NotNull(message = "authority는 null일 수 없습니다.") + Authority authority +) { +} diff --git a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/SimpleUserDto.java b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/response/SimpleUserResponseDto.java similarity index 58% rename from src/main/java/com/project/bumawiki/domain/user/presentation/dto/SimpleUserDto.java rename to src/main/java/com/project/bumawiki/domain/user/presentation/dto/response/SimpleUserResponseDto.java index 9ba81bb..22ec29f 100644 --- a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/SimpleUserDto.java +++ b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/response/SimpleUserResponseDto.java @@ -1,15 +1,15 @@ -package com.project.bumawiki.domain.user.presentation.dto; +package com.project.bumawiki.domain.user.presentation.dto.response; import com.project.bumawiki.domain.user.domain.User; -public record SimpleUserDto( +public record SimpleUserResponseDto( Long id, String email, String nickName, String name ) { - public SimpleUserDto(User user) { + public SimpleUserResponseDto(User user) { this( user.getId(), user.getEmail(), diff --git a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserResponseDto.java b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/response/UserResponseDto.java similarity index 91% rename from src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserResponseDto.java rename to src/main/java/com/project/bumawiki/domain/user/presentation/dto/response/UserResponseDto.java index 6e7c7b3..d234eaa 100644 --- a/src/main/java/com/project/bumawiki/domain/user/presentation/dto/UserResponseDto.java +++ b/src/main/java/com/project/bumawiki/domain/user/presentation/dto/response/UserResponseDto.java @@ -1,4 +1,4 @@ -package com.project.bumawiki.domain.user.presentation.dto; +package com.project.bumawiki.domain.user.presentation.dto.response; import java.util.List;