feat : member, provide create update Services

tape4 · tape4 · commit 2e6644227be3 · 2025-01-30T11:25:25.000+09:00
diff --git a/src/main/java/org/fontory/fontorybe/common/controller/HealthCheck.java b/src/main/java/org/fontory/fontorybe/common/controller/HealthCheck.java
@@ -1,17 +1,15 @@
 package org.fontory.fontorybe.common.controller;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController
 public class HealthCheck {
 
     @Value("${commit.hash}")
     public String commitHash;
 
-    @ResponseBody
     @GetMapping("/health-check")
     public String healthCheck() { return commitHash; }
 }
diff --git a/src/main/java/org/fontory/fontorybe/common/domain/BaseEntity.java b/src/main/java/org/fontory/fontorybe/common/domain/BaseEntity.java
@@ -4,8 +4,10 @@
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import java.time.LocalDateTime;
-import lombok.AllArgsConstructor;
+
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
@@ -14,6 +16,8 @@
 @EntityListeners(AuditingEntityListener.class)
 @Getter
 @MappedSuperclass
+@SuperBuilder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class BaseEntity {
 
     @CreatedDate
diff --git a/src/main/java/org/fontory/fontorybe/member/controller/port/MemberService.java b/src/main/java/org/fontory/fontorybe/member/controller/port/MemberService.java
@@ -2,9 +2,10 @@
 
 import org.fontory.fontorybe.member.domain.Member;
 import org.fontory.fontorybe.member.domain.dto.MemberCreateDto;
-import org.fontory.fontorybe.provide.domain.Provide;
+import org.fontory.fontorybe.member.domain.dto.MemberUpdateDto;
 
 public interface MemberService {
-    Member getById(Long id);
-    Member create(MemberCreateDto memberCreateDto, Provide provide);
+    Member getOrThrowById(Long id);
+    Member create(MemberCreateDto memberCreateDto, Long provideId);
+    Member update(Long memberId, MemberUpdateDto memberUpdateDto);
 }
diff --git a/src/main/java/org/fontory/fontorybe/member/domain/Member.java b/src/main/java/org/fontory/fontorybe/member/domain/Member.java
@@ -8,6 +8,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.fontory.fontorybe.member.domain.dto.MemberCreateDto;
+import org.fontory.fontorybe.member.domain.dto.MemberUpdateDto;
 import org.fontory.fontorybe.member.infrastructure.entity.Gender;
 import org.fontory.fontorybe.provide.domain.Provide;
 import org.fontory.fontorybe.provide.infrastructure.entity.ProvideEntity;
@@ -46,4 +47,17 @@ public static Member from(MemberCreateDto memberCreateDto, Provide provide) {
                 .provideId(provide.getId())
                 .build();
     }
+
+    public Member update(MemberUpdateDto memberUpdateDto) {
+        return Member.builder()
+                .id(this.id)
+                .nickname(memberUpdateDto.getNickname())
+                .gender(memberUpdateDto.getGender())
+                .birth(memberUpdateDto.getBirth())
+                .terms(memberUpdateDto.getTerms())
+                .profileImage(memberUpdateDto.getProfileImage())
+                .createdAt(this.createdAt)
+                .provideId(this.provideId)
+                .build();
+    }
 }
diff --git a/src/main/java/org/fontory/fontorybe/member/domain/dto/MemberUpdateDto.java b/src/main/java/org/fontory/fontorybe/member/domain/dto/MemberUpdateDto.java
@@ -0,0 +1,19 @@
+package org.fontory.fontorybe.member.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import org.fontory.fontorybe.member.infrastructure.entity.Gender;
+
+import java.time.LocalDate;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class MemberUpdateDto {
+    private String nickname;
+    private Gender gender;
+    private LocalDate birth;
+    private Boolean terms;
+    private String profileImage;
+}
diff --git a/src/main/java/org/fontory/fontorybe/member/infrastructure/entity/MemberEntity.java b/src/main/java/org/fontory/fontorybe/member/infrastructure/entity/MemberEntity.java
@@ -16,15 +16,16 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.fontory.fontorybe.common.domain.BaseEntity;
 import org.fontory.fontorybe.member.domain.Member;
 
 @Entity
 @Getter
-@Builder
 @Table(name = "member")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
+@SuperBuilder
 public class MemberEntity extends BaseEntity {
 
     @Id
@@ -68,6 +69,7 @@ public static MemberEntity from(Member member) {
                 .terms(member.isTerms())
                 .profileImage(member.getProfileImage())
                 .provideId(member.getProvideId())
+                .createdAt(member.getCreatedAt())
                 .build();
     }
 }
diff --git a/src/main/java/org/fontory/fontorybe/member/service/MemberServiceImpl.java b/src/main/java/org/fontory/fontorybe/member/service/MemberServiceImpl.java
@@ -4,24 +4,35 @@
 import org.fontory.fontorybe.member.controller.port.MemberService;
 import org.fontory.fontorybe.member.domain.Member;
 import org.fontory.fontorybe.member.domain.dto.MemberCreateDto;
+import org.fontory.fontorybe.member.domain.dto.MemberUpdateDto;
 import org.fontory.fontorybe.member.service.port.MemberRepository;
+import org.fontory.fontorybe.provide.controller.port.ProvideService;
 import org.fontory.fontorybe.provide.domain.Provide;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class MemberServiceImpl implements MemberService {
     private final MemberRepository memberRepository;
+    private final ProvideService provideService;
 
     @Override
-    public Member getById(Long id) {
+    public Member getOrThrowById(Long id) {
         return memberRepository.findById(id)
                 .orElseThrow(RuntimeException::new);
     }
 
     @Override
-    public Member create(MemberCreateDto memberCreateDto, Provide provide) {
+    public Member create(MemberCreateDto memberCreateDto, Long provideId) {
+        Provide provide = provideService.getOrThrownById(provideId);
         Member member = Member.from(memberCreateDto, provide);
+
         return memberRepository.save(member);
     }
+
+    @Override
+    public Member update(Long memberId, MemberUpdateDto memberUpdateDto) {
+        Member member = getOrThrowById(memberId);
+        return memberRepository.save(member.update(memberUpdateDto));
+    }
 }
diff --git a/src/main/java/org/fontory/fontorybe/provide/controller/port/ProvideService.java b/src/main/java/org/fontory/fontorybe/provide/controller/port/ProvideService.java
@@ -4,6 +4,6 @@
 import org.fontory.fontorybe.provide.domain.dto.ProvideCreateDto;
 
 public interface ProvideService {
-    Provide getById(Long id);
+    Provide getOrThrownById(Long id);
     Provide create(ProvideCreateDto provideCreateDto);
 }
diff --git a/src/main/java/org/fontory/fontorybe/provide/infrastructure/entity/ProvideEntity.java b/src/main/java/org/fontory/fontorybe/provide/infrastructure/entity/ProvideEntity.java
@@ -13,6 +13,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.fontory.fontorybe.common.domain.BaseEntity;
 import org.fontory.fontorybe.provide.domain.Provide;
 
@@ -21,7 +22,7 @@
 @Table(name = "provide")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-@Builder
+@SuperBuilder
 public class ProvideEntity extends BaseEntity {
 
     @Id
@@ -45,6 +46,8 @@ public Provide toModel() {
                 .providedId(providedId)
                 .email(email)
                 .memberId(memberId)
+                .createdAt(getCreatedAt())
+                .updatedAt(getUpdatedAt())
                 .build();
     }
 
@@ -55,6 +58,7 @@ public static ProvideEntity from(Provide provide) {
                 .providedId(provide.getProvidedId())
                 .email(provide.getEmail())
                 .memberId(provide.getMemberId())
+                .createdAt(provide.getCreatedAt())
                 .build();
     }
 }
diff --git a/src/main/java/org/fontory/fontorybe/provide/service/ProvideServiceImpl.java b/src/main/java/org/fontory/fontorybe/provide/service/ProvideServiceImpl.java
@@ -13,7 +13,7 @@ public class ProvideServiceImpl implements ProvideService {
     private final ProvideRepository provideRepository;
 
     @Override
-    public Provide getById(Long id) {
+    public Provide getOrThrownById(Long id) {
         return provideRepository.findById(id)
                 .orElseThrow(RuntimeException::new);
     }
diff --git a/src/test/java/org/fontory/fontorybe/infrastructure/DBConnectivityTest.java b/src/test/java/org/fontory/fontorybe/infrastructure/DBConnectivityTest.java
@@ -12,7 +12,7 @@
 import static org.assertj.core.api.Fail.fail;
 
 @SpringBootTest
-public class DBConnectivityTest {
+class DBConnectivityTest {
 
     @Autowired
     private DataSource dataSource;
diff --git a/src/test/java/org/fontory/fontorybe/infrastructure/RedisConnectivityTest.java b/src/test/java/org/fontory/fontorybe/infrastructure/RedisConnectivityTest.java
@@ -8,7 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest
-public class RedisConnectivityTest {
+class RedisConnectivityTest {
 
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
diff --git a/src/test/java/org/fontory/fontorybe/integration/member/MemberServiceTest.java b/src/test/java/org/fontory/fontorybe/integration/member/MemberServiceTest.java
@@ -1,15 +1,15 @@
 package org.fontory.fontorybe.integration.member;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import java.time.LocalDate;
 import org.fontory.fontorybe.member.controller.port.MemberService;
 import org.fontory.fontorybe.member.domain.Member;
 import org.fontory.fontorybe.member.domain.dto.MemberCreateDto;
+import org.fontory.fontorybe.member.domain.dto.MemberUpdateDto;
 import org.fontory.fontorybe.member.infrastructure.entity.Gender;
-import org.fontory.fontorybe.provide.controller.port.ProvideService;
-import org.fontory.fontorybe.provide.domain.Provide;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,29 +19,55 @@
 import org.springframework.test.context.jdbc.SqlGroup;
 
 @SpringBootTest
-@SqlGroup({
-        @Sql(value = "/sql/createMemberTestData.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD),
-        @Sql(value = "/sql/deleteMemberTestData.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD),
-})
-public class MemberServiceTest {
+@Sql(value = "/sql/createMemberTestData.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
+@Sql(value = "/sql/deleteMemberTestData.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+class MemberServiceTest {
 
     @Autowired MemberService memberService;
-    @Autowired ProvideService provideService;
 
+    /**
+     * testValues
+     */
+    Long nonExistentId = -1L;
+    Long testMemberId = 999L;
     Long testProvideId = 1L;
     Gender testGender = Gender.MALE;
     LocalDate testBirth = LocalDate.of(2025, 1, 26);
     Boolean testTerms = Boolean.TRUE;
     String testNickName = "testNickName";
     String testProfileImage = "testProfileImage";
 
+    Gender updateGender = Gender.FEMALE;
+    LocalDate updateBirth = LocalDate.of(2025, 1, 27);
+    Boolean updateTerms = Boolean.FALSE;
+    String updateNickName = "updateNickName";
+    String updateProfileImage = "updateProfileImage";
+
+
+
     @Test
-    @DisplayName("member - getById success test")
-    public void getByIdTest() {
-        MemberCreateDto memberCreateDto = new MemberCreateDto(testNickName, testGender, testBirth, testTerms, testProfileImage);
-        Provide provide = provideService.getById(1L);
+    @DisplayName("member - getOrThrownById success test")
+    void getOrThrownByIdTest() {
+        Member foundMember = memberService.getOrThrowById(testMemberId);
+        assertAll(
+                () -> assertThat(foundMember.getId()).isEqualTo(testMemberId)
+//                        ....
+        );
+    }
 
-        Member createdMember = memberService.create(memberCreateDto, provide);
+    @Test
+    @DisplayName("member - getOrThrownById fail test caused by not found")
+    void getOrThrownByIdTestX() {
+        assertThatThrownBy(
+                () -> memberService.getOrThrowById(nonExistentId)
+        ).isInstanceOf(RuntimeException.class);
+    }
+
+    @Test
+    @DisplayName("member - create success test")
+    void createTest() {
+        MemberCreateDto memberCreateDto = new MemberCreateDto(testNickName, testGender, testBirth, testTerms, testProfileImage);
+        Member createdMember = memberService.create(memberCreateDto, testProvideId);
 
         assertAll(
                 () -> assertThat(createdMember.getId()).isNotNull(),
@@ -50,8 +76,37 @@ public void getByIdTest() {
                 () -> assertThat(createdMember.getGender()).isEqualTo(testGender),
                 () -> assertThat(createdMember.getBirth()).isEqualTo(testBirth),
                 () -> assertThat(createdMember.isTerms()).isEqualTo(testTerms),
-                () -> assertThat(createdMember.getProfileImage()).isEqualTo(testProfileImage)
-//                () -> assertThat(createdMember.getCreatedAt()).isNotNull(),
+                () -> assertThat(createdMember.getProfileImage()).isEqualTo(testProfileImage),
+                () -> assertThat(createdMember.getCreatedAt()).isNotNull(),
+                () -> assertThat(createdMember.getUpdatedAt()).isNotNull()
         );
     }
+
+    @Test
+    @DisplayName("member - create fail test caused by provide Not found")
+    void createTestX() {
+        MemberCreateDto memberCreateDto = new MemberCreateDto(testNickName, testGender, testBirth, testTerms, testProfileImage);
+        assertThatThrownBy(
+                () -> memberService.create(memberCreateDto, nonExistentId))
+                .isInstanceOf(RuntimeException.class);
+    }
+
+    @Test
+    @DisplayName("member - update success")
+    void updateTest() {
+        Member member = memberService.getOrThrowById(testMemberId);
+        MemberUpdateDto memberUpdateDto = new MemberUpdateDto(updateNickName, updateGender, updateBirth, updateTerms, updateProfileImage);
+        Member updatedMember = memberService.update(testMemberId, memberUpdateDto);
+        assertAll(
+                () -> assertThat(updatedMember.getId()).isEqualTo(member.getId()),
+                () -> assertThat(updatedMember.getNickname()).isEqualTo(updateNickName),
+                () -> assertThat(updatedMember.getGender()).isEqualTo(updateGender),
+                () -> assertThat(updatedMember.getBirth()).isEqualTo(updateBirth),
+                () -> assertThat(updatedMember.getProfileImage()).isEqualTo(updateProfileImage),
+                () -> assertThat(updatedMember.getProvideId()).isEqualTo(member.getProvideId()),
+                () -> assertThat(updatedMember.getCreatedAt()).isEqualTo(member.getCreatedAt()),
+                () -> assertThat(updatedMember.getUpdatedAt()).isAfter(member.getUpdatedAt())
+        );
+    }
+
 }
diff --git a/src/test/java/org/fontory/fontorybe/integration/provide/ProvideServiceTest.java b/src/test/java/org/fontory/fontorybe/integration/provide/ProvideServiceTest.java
diff --git a/src/test/resources/sql/createMemberTestData.sql b/src/test/resources/sql/createMemberTestData.sql

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`import org.fontory.fontorybe.provide.domain.dto.ProvideCreateDto;`
`5`	`5`
`6`	`6`	`public interface ProvideService {`
`7`		`- Provide getById(Long id);`
	`7`	`+ Provide getOrThrownById(Long id);`
`8`	`8`	`Provide create(ProvideCreateDto provideCreateDto);`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class ProvideServiceImpl implements ProvideService {`
`13`	`13`	`private final ProvideRepository provideRepository;`
`14`	`14`
`15`	`15`	`@Override`
`16`		`- public Provide getById(Long id) {`
	`16`	`+ public Provide getOrThrownById(Long id) {`
`17`	`17`	`return provideRepository.findById(id)`
`18`	`18`	`.orElseThrow(RuntimeException::new);`
`19`	`19`	`}`