Skip to content

Commit

Permalink
Member Entity 명칭 수정 (#44)
Browse files Browse the repository at this point in the history
* feat: 결제 연동 기능 테스트 #29

* feat: 결제 연동 구현에 맞춘 dbml 수정 #29

* feat: 결제 연동 구현 thymeleaf 오류 수정 1트 #29

* feat: 결제 연동 구현 thymeleaf 오류 수정 완료 #29

* .keep 생성

* fix: console.log to alert

* fix: dbml 수정 #29

* feat: 결제 API 기본 템플릿 작성#29

* feat: 결제 DBML 수정 #29

* edit: 결제 DBML 수정 + 결제 API 초안 갈아엎기 #29

* edit: 결제 DBML 수정 + 결제 API 초안 갈아엎기 #29

* feat: 결제 감 잡아가는중... #29

* feat: 결제 API DTO test #29

* feat: 결제 API DTO test - test user 사용 #29

* feat: 결제 API 작성 #29

* feat: 오탈자 수정 #29

* feat: 결제 API 완료 #29

* edit: payment history 테이블명 수정 #29

* edit: Member Entity 명칭 수정 #29

* edit: validator 수정 #29
  • Loading branch information
bongsh0112 authored Sep 21, 2023
1 parent eca00d8 commit 061bd83
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
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;
import org.springframework.web.bind.annotation.RequestMapping;
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,15 +11,15 @@
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;
import java.util.Map;
import java.util.Optional;

@Controller
@RequestMapping("/member")
@RequestMapping("/user")
public class AuthController {

{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

package picasso.server.api.member.service;
package picasso.server.api.user.service;
//
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,6 +18,7 @@
@Getter
@Setter
@Entity
@Table(name = "tbl_picture")
@NoArgsConstructor
public class Picture {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Entity
@Getter
@Setter
@Table(name = "m_token")
@Table(name = "tbl_token")
@NoArgsConstructor
public class Token {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import static jakarta.persistence.GenerationType.IDENTITY;

@Entity
@Table(name = "tbl_member")
@Table(name = "tbl_user")
@Getter
@Setter
@NoArgsConstructor
Expand Down

0 comments on commit 061bd83

Please sign in to comment.