Skip to content

Commit

Permalink
fix: delete MemberStatus Entity
Browse files Browse the repository at this point in the history
  • Loading branch information
ah9mon committed Aug 4, 2023
1 parent c3dfe78 commit 189c87a
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 55 deletions.
7 changes: 7 additions & 0 deletions src/main/java/com/anywayclear/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@ public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws
.failureHandler(oAuth2AuthenticationFailureHandler)
);

// 로그아웃 설정
// httpSecurity.logout()
// .addLogoutHandler()
// .logoutSuccessHandler()
// .logout
// .logoutSuccessUrl()

// H2 사용을 위한 설정
httpSecurity
.headers().frameOptions().disable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ private Member createMember(String emailAddress, String nickname, String image)
.image(image)
.nickname(nickname)
.role("ROLE_CONSUMER")
.memberStatus(true)
.build();

return memberRepository.save(member);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ public MemberController(MemberService memberService) {
this.memberService = memberService;
}

@PostMapping("/sign-up")
public ResponseEntity<Void> getMember(@Valid @RequestBody MemberCreateRequest request) {
final String id = memberService.createMember(request);
return ResponseEntity.created(URI.create("api/members/" + id)).build();
}

@GetMapping("/{userId}")
public ResponseEntity<MemberResponse> getMemberDetail(@PathVariable("userId") String userId) {
return ResponseEntity.ok(memberService.getMemberByUserId(userId));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ public class MemberCreateRequest {
private String description;
private String companyRegistrationNumber;
private String companyAddress;
@NotBlank
private boolean memberStatus;

@Builder
public MemberCreateRequest(String nickname, String image, String emailAddress, String role,String phoneNumber, String description, String companyRegistrationNumber, String companyAddress) {
public MemberCreateRequest(String nickname, String image, String emailAddress, String role,String phoneNumber, String description, String companyRegistrationNumber, String companyAddress, boolean memberStatus) {
this.nickname = nickname;
this.image = image;
this.emailAddress = emailAddress;
Expand All @@ -35,5 +37,6 @@ public MemberCreateRequest(String nickname, String image, String emailAddress, S
this.description = description;
this.companyRegistrationNumber = companyRegistrationNumber;
this.companyAddress = companyAddress;
this.memberStatus = memberStatus;
}
}
9 changes: 4 additions & 5 deletions src/main/java/com/anywayclear/entity/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,14 @@ public class Member {

private String companyAddress;

private boolean memberStatus;

@OneToOne(mappedBy = "member", cascade = CascadeType.ALL) // 영속성 전이가 발생해 부모객체를 저장할 때 자식객체도 함께 저장
@JsonBackReference // 순환참조 방지
private Point point = new Point(this); // 멤버 생성 시 포인트 객체 자동 생성

@OneToOne(mappedBy = "member", cascade = CascadeType.ALL)
@JsonBackReference
private MemberStatus memberStatus = new MemberStatus(this);

@Builder
public Member(String id, String userId, String nickname, String image, String emailAddress, String role, String phoneNumber, String description, String companyRegistrationNumber, String companyAddress) {
public Member(String id, String userId, String nickname, String image, String emailAddress, String role, String phoneNumber, String description, String companyRegistrationNumber, String companyAddress, boolean memberStatus) {
this.id = id;
this.userId = userId;
this.nickname = nickname;
Expand All @@ -59,6 +57,7 @@ public Member(String id, String userId, String nickname, String image, String em
this.description = description;
this.companyRegistrationNumber = companyRegistrationNumber;
this.companyAddress = companyAddress;
this.memberStatus = memberStatus;
}

public static Member toEntity(MemberCreateRequest request) {
Expand Down
32 changes: 0 additions & 32 deletions src/main/java/com/anywayclear/entity/MemberStatus.java

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/java/com/anywayclear/service/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ public class MemberService {
public MemberService(MemberRepository memberRepository) {
this.memberRepository = memberRepository;
}
public String createMember(MemberCreateRequest request) {
return memberRepository.save(Member.toEntity(request)).getId();
}

public MemberResponse getMember(String id) {
Member member = memberRepository.findById(id).orElseThrow(() -> new RuntimeException("아이디가 없습니다."));
Expand Down
1 change: 0 additions & 1 deletion src/test/java/com/anywayclear/repository/MemberTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.anywayclear.repository;

import com.anywayclear.entity.Member;
import com.anywayclear.entity.MemberStatus;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
Expand Down

0 comments on commit 189c87a

Please sign in to comment.