diff --git a/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java b/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java index 2858f306..898df92a 100644 --- a/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java +++ b/Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java @@ -3,7 +3,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -11,7 +10,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import picasso.server.api.exchange.model.request.PostCreatePaymentRequest; import picasso.server.api.exchange.service.PaymentService; -import picasso.server.api.member.service.UserService; +import picasso.server.api.user.service.UserService; import picasso.server.domain.domains.member.entity.User; import java.util.Optional; diff --git a/Api/src/main/java/picasso/server/api/exchange/validator/PaymentValidator.java b/Api/src/main/java/picasso/server/api/exchange/validator/PaymentValidator.java index df1141ab..851e1512 100644 --- a/Api/src/main/java/picasso/server/api/exchange/validator/PaymentValidator.java +++ b/Api/src/main/java/picasso/server/api/exchange/validator/PaymentValidator.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import picasso.server.api.exchange.model.request.PostCreatePaymentRequest; import picasso.server.common.annotation.Validator; import picasso.server.common.exception.PaymentAlreadyExistsException; import picasso.server.common.exception.PaymentFailedException; diff --git a/Api/src/main/java/picasso/server/api/member/controller/AuthController.java b/Api/src/main/java/picasso/server/api/user/controller/AuthController.java similarity index 94% rename from Api/src/main/java/picasso/server/api/member/controller/AuthController.java rename to Api/src/main/java/picasso/server/api/user/controller/AuthController.java index 248c369d..41359de8 100644 --- a/Api/src/main/java/picasso/server/api/member/controller/AuthController.java +++ b/Api/src/main/java/picasso/server/api/user/controller/AuthController.java @@ -1,4 +1,4 @@ -package picasso.server.api.member.controller; +package picasso.server.api.user.controller; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import picasso.server.api.member.service.UserService; +import picasso.server.api.user.service.UserService; import picasso.server.domain.domains.member.entity.User; import java.util.HashMap; @@ -19,7 +19,7 @@ import java.util.Optional; @Controller -@RequestMapping("/member") +@RequestMapping("/user") public class AuthController { { diff --git a/Api/src/main/java/picasso/server/api/member/controller/MemberController.java b/Api/src/main/java/picasso/server/api/user/controller/MemberController.java similarity index 100% rename from Api/src/main/java/picasso/server/api/member/controller/MemberController.java rename to Api/src/main/java/picasso/server/api/user/controller/MemberController.java diff --git a/Api/src/main/java/picasso/server/api/member/service/AuthService.java b/Api/src/main/java/picasso/server/api/user/service/AuthService.java similarity index 100% rename from Api/src/main/java/picasso/server/api/member/service/AuthService.java rename to Api/src/main/java/picasso/server/api/user/service/AuthService.java diff --git a/Api/src/main/java/picasso/server/api/member/service/AuthServiceImpl.java b/Api/src/main/java/picasso/server/api/user/service/AuthServiceImpl.java similarity index 100% rename from Api/src/main/java/picasso/server/api/member/service/AuthServiceImpl.java rename to Api/src/main/java/picasso/server/api/user/service/AuthServiceImpl.java diff --git a/Api/src/main/java/picasso/server/api/member/service/DefaultMemberService.java b/Api/src/main/java/picasso/server/api/user/service/DefaultMemberService.java similarity index 100% rename from Api/src/main/java/picasso/server/api/member/service/DefaultMemberService.java rename to Api/src/main/java/picasso/server/api/user/service/DefaultMemberService.java diff --git a/Api/src/main/java/picasso/server/api/member/service/UserService.java b/Api/src/main/java/picasso/server/api/user/service/UserService.java similarity index 96% rename from Api/src/main/java/picasso/server/api/member/service/UserService.java rename to Api/src/main/java/picasso/server/api/user/service/UserService.java index 6754644f..4caaf7de 100644 --- a/Api/src/main/java/picasso/server/api/member/service/UserService.java +++ b/Api/src/main/java/picasso/server/api/user/service/UserService.java @@ -1,5 +1,5 @@ -package picasso.server.api.member.service; +package picasso.server.api.user.service; // import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; diff --git a/Domain/src/main/java/picasso/server/domain/domains/items/Picture.java b/Domain/src/main/java/picasso/server/domain/domains/items/Picture.java index 09f4343c..5e82f559 100644 --- a/Domain/src/main/java/picasso/server/domain/domains/items/Picture.java +++ b/Domain/src/main/java/picasso/server/domain/domains/items/Picture.java @@ -7,6 +7,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Lob; +import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.NoArgsConstructor; @@ -17,6 +18,7 @@ @Getter @Setter @Entity +@Table(name = "tbl_picture") @NoArgsConstructor public class Picture { diff --git a/Domain/src/main/java/picasso/server/domain/domains/member/dto/MemberDTO.java b/Domain/src/main/java/picasso/server/domain/domains/member/dto/UserDTO.java similarity index 83% rename from Domain/src/main/java/picasso/server/domain/domains/member/dto/MemberDTO.java rename to Domain/src/main/java/picasso/server/domain/domains/member/dto/UserDTO.java index 02ae2b8b..7e05be5a 100644 --- a/Domain/src/main/java/picasso/server/domain/domains/member/dto/MemberDTO.java +++ b/Domain/src/main/java/picasso/server/domain/domains/member/dto/UserDTO.java @@ -4,9 +4,9 @@ import picasso.server.domain.domains.member.type.UserStatus; import java.time.LocalDateTime; -public class MemberDTO { +public class UserDTO { - private Long memberId; + private Long userId; private String email; private String password; private String nickname; @@ -15,8 +15,8 @@ public class MemberDTO { private LoginType loginType; private UserStatus userStatus; private UserRole userRole; - private LocalDateTime memberCreatedAt; - private LocalDateTime memberUpdatedAt; + private LocalDateTime userCreatedAt; + private LocalDateTime userUpdatedAt; private LocalDateTime loginAt; private Long tokenId; diff --git a/Domain/src/main/java/picasso/server/domain/domains/member/entity/Token.java b/Domain/src/main/java/picasso/server/domain/domains/member/entity/Token.java index 48901980..340cda73 100644 --- a/Domain/src/main/java/picasso/server/domain/domains/member/entity/Token.java +++ b/Domain/src/main/java/picasso/server/domain/domains/member/entity/Token.java @@ -12,7 +12,7 @@ @Entity @Getter @Setter -@Table(name = "m_token") +@Table(name = "tbl_token") @NoArgsConstructor public class Token { diff --git a/Domain/src/main/java/picasso/server/domain/domains/member/entity/User.java b/Domain/src/main/java/picasso/server/domain/domains/member/entity/User.java index c6231da2..2482a56a 100644 --- a/Domain/src/main/java/picasso/server/domain/domains/member/entity/User.java +++ b/Domain/src/main/java/picasso/server/domain/domains/member/entity/User.java @@ -14,7 +14,7 @@ import static jakarta.persistence.GenerationType.IDENTITY; @Entity -@Table(name = "tbl_member") +@Table(name = "tbl_user") @Getter @Setter @NoArgsConstructor