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.

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

[2주차] 기본 과제 & 심화 과제 #4

Merged
merged 22 commits into from
Nov 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
63c9e7b
[del] #3 1주차 코드 제거
SunwoongH Oct 26, 2023
79af4d5
[chore] #3 data jpa & h2 의존성 추가
SunwoongH Oct 26, 2023
fff171a
[feat] #3 success status enum 클래스 구현
SunwoongH Oct 26, 2023
330aa99
[feat] #3 error status enum 클래스 구현
SunwoongH Oct 26, 2023
c75d538
[feat] #3 business exception 클래스 구현
SunwoongH Oct 26, 2023
ddeacf5
[feat] #3 conflict exception 클래스 구현
SunwoongH Oct 26, 2023
03ac232
[feat] #3 entity not found exception 클래스 구현
SunwoongH Oct 26, 2023
df9cbbb
[feat] #3 invalid value exception 클래스 구현
SunwoongH Oct 26, 2023
152405b
[feat] #3 API 공통 응답 제네릭 클래스 구현
SunwoongH Oct 26, 2023
6dfcd9f
[feat] #3 controller exception handler 클래스 구현
SunwoongH Oct 26, 2023
ab2e17f
[chore] #3 jpa auditing 설정
SunwoongH Oct 26, 2023
86e07ec
[feat] #3 base time 엔티티 클래스 구현
SunwoongH Oct 26, 2023
c5c216d
[feat] #3 part enum 클래스 구현
SunwoongH Oct 26, 2023
01c1858
[feat] #3 sopt embeddable 클래스 구현
SunwoongH Oct 26, 2023
0ecc8aa
[feat] #3 member 엔티티 클래스 구현
SunwoongH Oct 26, 2023
06c80f9
[feat] #3 회원 가입 요청 dto record 구현
SunwoongH Oct 26, 2023
ea4ce70
[feat] #3 회원 가입 응답 dto record 구현
SunwoongH Oct 26, 2023
c28161d
[feat] #3 회원 조회 요청 dto record 구현
SunwoongH Oct 26, 2023
618a279
[feat] #3 회원 수정 요청 dto record 구현
SunwoongH Oct 26, 2023
1bbfb61
[feat] #3 회원 repository 클래스 구현
SunwoongH Oct 26, 2023
5ebcd43
[feat] #3 회원 service 클래스 구현
SunwoongH Oct 26, 2023
861f422
[feat] #3 회원 api controller 클래스 구현
SunwoongH Oct 26, 2023
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
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ repositories {
}

dependencies {
// spring boot
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'

// h2
runtimeOnly 'com.h2database:h2'

// lombok
compileOnly 'org.projectlombok:lombok'
Expand Down
36 changes: 0 additions & 36 deletions src/main/java/org/sopt/seminar/common/ApiResponse.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.sopt.seminar.domain.member.api;

import lombok.RequiredArgsConstructor;
import org.sopt.seminar.domain.member.dto.request.MemberSaveRequest;
import org.sopt.seminar.domain.member.dto.request.MemberUpdateRequest;
import org.sopt.seminar.domain.member.dto.response.MemberGetResponse;
import org.sopt.seminar.domain.member.dto.response.MemberSaveResponse;
import org.sopt.seminar.domain.member.service.MemberService;
import org.sopt.seminar.global.common.ApiResponse;
import org.sopt.seminar.global.common.SuccessStatus;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RequiredArgsConstructor
@RequestMapping("/api/member")
@Controller
public class MemberApiController {
private final MemberService memberService;

@PostMapping
public ResponseEntity<ApiResponse<?>> saveMember(@RequestBody final MemberSaveRequest memberSaveRequest) {
final MemberSaveResponse savedMember = memberService.saveMember(memberSaveRequest);
return ApiResponse.success(SuccessStatus.CREATED, savedMember);
}

@GetMapping("/{memberId}")
public ResponseEntity<ApiResponse<?>> getMember(@PathVariable final Long memberId) {
final MemberGetResponse findMember = memberService.getMember(memberId);
return ApiResponse.success(SuccessStatus.OK, findMember);
}

@GetMapping
public ResponseEntity<ApiResponse<?>> getMembers(final Pageable pageable) {
final List<MemberGetResponse> findMembers = memberService.getMembers(pageable);
return ApiResponse.success(SuccessStatus.OK, findMembers);
}

@PatchMapping("/{memberId}")
public ResponseEntity<ApiResponse<?>> updateMember(@PathVariable final Long memberId,
@RequestBody final MemberUpdateRequest memberUpdateRequest) {
memberService.updateMember(memberId, memberUpdateRequest);
return ApiResponse.success(SuccessStatus.OK);
}

@DeleteMapping("/{memberId}")
public ResponseEntity<ApiResponse<?>> deleteMember(@PathVariable final Long memberId) {
memberService.deleteMember(memberId);
return ApiResponse.success(SuccessStatus.OK);
}
}
37 changes: 37 additions & 0 deletions src/main/java/org/sopt/seminar/domain/member/domain/Member.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.sopt.seminar.domain.member.domain;

import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.DynamicUpdate;
import org.sopt.seminar.global.common.BaseTimeEntity;

@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@Builder(access = AccessLevel.PRIVATE)
@DynamicUpdate
@Getter
@Entity
public class Member extends BaseTimeEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "member_id")
private Long id;
private String name;
private String nickname;
private Integer age;
@Embedded
private Sopt sopt;

public static Member createMember(final String name, final String nickname, final Integer age, final Sopt sopt) {
return Member.builder()
.name(name)
.nickname(nickname)
.age(age)
.sopt(sopt)
.build();
}

public void updateSopt(Sopt sopt) {
this.sopt = sopt;
}
}
17 changes: 17 additions & 0 deletions src/main/java/org/sopt/seminar/domain/member/domain/Part.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.sopt.seminar.domain.member.domain;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@Getter
public enum Part {
ANDROID("ANDROID"),
iOS("iOS"),
SERVER("SERVER"),
DESIGN("DESIGN"),
PLAN("PLAN");

private final String name;
}
24 changes: 24 additions & 0 deletions src/main/java/org/sopt/seminar/domain/member/domain/Sopt.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.sopt.seminar.domain.member.domain;

import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import lombok.*;

@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@Builder(access = AccessLevel.PRIVATE)
@Getter
@Embeddable
public class Sopt {
private Integer generation;
@Enumerated(EnumType.STRING)
private Part part;

public static Sopt createSopt(final int generation, final Part part) {
return Sopt.builder()
.generation(generation)
.part(part)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package org.sopt.seminar.domain.member.dto.request;

import org.sopt.seminar.domain.member.domain.Sopt;

public record MemberSaveRequest(
String name,
String nickname,
int age,
Sopt sopt) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package org.sopt.seminar.domain.member.dto.request;

import org.sopt.seminar.domain.member.domain.Part;

public record MemberUpdateRequest(
int generation,
Part part) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package org.sopt.seminar.domain.member.dto.response;

import lombok.AccessLevel;
import lombok.Builder;
import org.sopt.seminar.domain.member.domain.Member;
import org.sopt.seminar.domain.member.domain.Sopt;

@Builder(access = AccessLevel.PRIVATE)
public record MemberGetResponse(
String name,
String nickname,
int age,
Sopt sopt
) {
public static MemberGetResponse of(Member member) {
return MemberGetResponse.builder()
.name(member.getName())
.nickname(member.getNickname())
.age(member.getAge())
.sopt(member.getSopt())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.sopt.seminar.domain.member.dto.response;

import org.sopt.seminar.domain.member.domain.Member;

public record MemberSaveResponse(
Long memberId
) {
public static MemberSaveResponse of(Member member) {
return new MemberSaveResponse(member.getId());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.sopt.seminar.domain.member.repository;


import org.sopt.seminar.domain.member.domain.Member;
import org.sopt.seminar.global.error.EntityNotFoundException;
import org.sopt.seminar.global.error.ErrorStatus;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MemberRepository extends JpaRepository<Member, Long> {
boolean existsByNickname(String nickname);

default Member findByIdOrThrow(Long memberId) {
return findById(memberId)
.orElseThrow(() -> new EntityNotFoundException(ErrorStatus.MEMBER_NOT_FOUND));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package org.sopt.seminar.domain.member.service;

import lombok.RequiredArgsConstructor;
import org.sopt.seminar.domain.member.domain.Member;
import org.sopt.seminar.domain.member.domain.Sopt;
import org.sopt.seminar.domain.member.dto.request.MemberSaveRequest;
import org.sopt.seminar.domain.member.dto.request.MemberUpdateRequest;
import org.sopt.seminar.domain.member.dto.response.MemberGetResponse;
import org.sopt.seminar.domain.member.dto.response.MemberSaveResponse;
import org.sopt.seminar.domain.member.repository.MemberRepository;
import org.sopt.seminar.global.error.ConflictException;
import org.sopt.seminar.global.error.ErrorStatus;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

import static org.sopt.seminar.domain.member.domain.Member.createMember;
import static org.sopt.seminar.domain.member.domain.Sopt.createSopt;

@RequiredArgsConstructor
@Transactional(readOnly = true)
@Service
public class MemberService {
private final MemberRepository memberRepository;

@Transactional
public MemberSaveResponse saveMember(MemberSaveRequest memberSaveRequest) {
validateDuplicateMember(memberSaveRequest.nickname());
Member member = createMember(memberSaveRequest.name(), memberSaveRequest.nickname(),
memberSaveRequest.age(), memberSaveRequest.sopt());
Member savedMember = memberRepository.save(member);
return MemberSaveResponse.of(savedMember);
}

public MemberGetResponse getMember(Long memberId) {
Member findMember = memberRepository.findByIdOrThrow(memberId);
return MemberGetResponse.of(findMember);
}

public List<MemberGetResponse> getMembers(Pageable pageable) {
return memberRepository.findAll(pageable)
.stream()
.map(MemberGetResponse::of)
.toList();
}

@Transactional
public void updateMember(Long memberId, MemberUpdateRequest memberUpdateRequest) {
Member findMember = memberRepository.findByIdOrThrow(memberId);
Sopt sopt = createSopt(memberUpdateRequest.generation(), memberUpdateRequest.part());
findMember.updateSopt(sopt);
}

@Transactional
public void deleteMember(Long memberId) {
memberRepository.deleteById(memberId);
}

private void validateDuplicateMember(String nickname) {
if (memberRepository.existsByNickname(nickname)) {
throw new ConflictException(ErrorStatus.DUPLICATE_MEMBER);
}
}
}
Loading