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

Feature/tag #61

Merged
merged 2 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package store.mybooks.resource.tag.dto.response;

import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

/**
* packageName : store.mybooks.resource.tag.dto.response
Expand All @@ -15,7 +15,7 @@
* 2/17/24 damho-lee 최초 생성
*/
@Getter
@Builder
@Setter
public class TagCreateResponse {
private String name;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package store.mybooks.resource.tag.dto.response;

import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

/**
* packageName : store.mybooks.resource.tag.dto.response
Expand All @@ -15,7 +15,7 @@
* 2/17/24 damho-lee 최초 생성
*/
@Getter
@Builder
@Setter
public class TagDeleteResponse {
private String name;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package store.mybooks.resource.tag.dto.response;

import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

/**
* packageName : store.mybooks.resource.tag.dto.response
Expand All @@ -15,7 +15,7 @@
* 2/17/24 damho-lee 최초 생성
*/
@Getter
@Builder
@Setter
public class TagModifyResponse {
private String name;
}
19 changes: 2 additions & 17 deletions src/main/java/store/mybooks/resource/tag/entity/Tag.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
import javax.persistence.Table;
import lombok.Getter;
import lombok.NoArgsConstructor;
import store.mybooks.resource.tag.dto.request.TagCreateRequest;
import store.mybooks.resource.tag.dto.request.TagModifyRequest;
import store.mybooks.resource.tag.dto.response.TagCreateResponse;

/**
* packageName : store.mybooks.resource.domain.entity
Expand Down Expand Up @@ -40,24 +38,11 @@ public class Tag {
@Column(name = "tag_created_date")
private LocalDate createdDate;

public Tag(TagCreateRequest tagCreateRequest) {
this.name = tagCreateRequest.getName();
public Tag(String name) {
this.name = name;
this.createdDate = LocalDate.now();
}

/**
* methodName : convertToCreateResponse
* author : damho-lee
* description : Tag 를 TagCreateResponse 로 변환시켜주는 메서드.
*
* @return TagCreateResponse
*/
public TagCreateResponse convertToCreateResponse() {
return TagCreateResponse.builder()
.name(this.name)
.build();
}

public void setByTagModifyRequest(TagModifyRequest tagModifyRequest) {
this.name = tagModifyRequest.getName();
}
Expand Down
31 changes: 31 additions & 0 deletions src/main/java/store/mybooks/resource/tag/mapper/TagMapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package store.mybooks.resource.tag.mapper;

import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
import store.mybooks.resource.tag.dto.response.TagCreateResponse;
import store.mybooks.resource.tag.dto.response.TagDeleteResponse;
import store.mybooks.resource.tag.dto.response.TagModifyResponse;
import store.mybooks.resource.tag.entity.Tag;

/**
* packageName : store.mybooks.resource.tag.mapper
* fileName : TagMapper
* author : damho-lee
* date : 2/19/24
* description :
* ===========================================================
* DATE AUTHOR NOTE
* -----------------------------------------------------------
* 2/19/24 damho-lee 최초 생성
*/
@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR)
public interface TagMapper {
TagMapper INSTANCE = Mappers.getMapper(TagMapper.class);

TagCreateResponse createResponse(Tag tag);

TagModifyResponse modifyResponse(Tag tag);

TagDeleteResponse deleteResponse(Tag tag);
}
11 changes: 4 additions & 7 deletions src/main/java/store/mybooks/resource/tag/service/TagService.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import store.mybooks.resource.tag.entity.Tag;
import store.mybooks.resource.tag.exception.TagNameAlreadyExistsException;
import store.mybooks.resource.tag.exception.TagNotExistsException;
import store.mybooks.resource.tag.mapper.TagMapper;
import store.mybooks.resource.tag.repository.TagRepository;

/**
Expand Down Expand Up @@ -50,7 +51,7 @@ public TagCreateResponse createTag(TagCreateRequest tagCreateRequest) {
throw new TagNameAlreadyExistsException(tagCreateRequest.getName());
}

return tagRepository.save(new Tag(tagCreateRequest)).convertToCreateResponse();
return TagMapper.INSTANCE.createResponse(tagRepository.save(new Tag(tagCreateRequest.getName())));
}

/**
Expand All @@ -73,9 +74,7 @@ public TagModifyResponse modifyTag(int id, TagModifyRequest tagModifyRequest) {

tag.setByTagModifyRequest(tagModifyRequest);

return TagModifyResponse.builder()
.name(tag.getName())
.build();
return TagMapper.INSTANCE.modifyResponse(tag);
}

/**
Expand All @@ -91,8 +90,6 @@ public TagDeleteResponse deleteTag(int id) {

tagRepository.deleteById(id);

return TagDeleteResponse.builder()
.name(tag.getName())
.build();
return TagMapper.INSTANCE.deleteResponse(tag);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ void givenGetTags_whenNormalCase_thenReturnTagGetResponseList() {
@Test
@DisplayName("createTag 메서드 정상적인 경우 테스트")
void givenCreateTag_whenNormalCase_thenReturnTagCreateResponse() {
TagCreateRequest tagCreateRequest = new TagCreateRequest("IT");
String name = "IT";
TagCreateRequest tagCreateRequest = new TagCreateRequest(name);

when(tagRepository.existsByName(anyString())).thenReturn(false);
when(tagRepository.save(any())).thenReturn(new Tag(tagCreateRequest));
when(tagRepository.save(any())).thenReturn(new Tag(name));

TagCreateResponse tagCreateResponse = tagService.createTag(tagCreateRequest);

Expand All @@ -95,8 +96,7 @@ void givenCreateTag_whenDuplicateTagName_thenThrowTagNameAlreadyExistsException(
@Test
@DisplayName("modifyTag 메서드 정상적인 경우 테스트")
void givenModifyTag_whenNormalCase_thenReturnTagModifyResponse() {
TagCreateRequest tagCreateRequest = new TagCreateRequest("IT");
Tag tag = new Tag(tagCreateRequest);
Tag tag = new Tag("IT");

when(tagRepository.findById(anyInt())).thenReturn(Optional.of(tag));
when(tagRepository.existsByName(anyString())).thenReturn(false);
Expand All @@ -122,8 +122,7 @@ void givenModifyTag_whenNotExistsTagId_thenThrowTagNotExistsException() {
@DisplayName("modifyTag 메서드 수정하려는 태그 이름이 이미 존재하는 경우 테스트")
void givenModifyTag_whenDuplicateTagName_thenThrowTagNameAlreadyExistsException() {
TagModifyRequest modifyRequest = new TagModifyRequest("Education");
TagCreateRequest tagCreateRequest = new TagCreateRequest("IT");
Tag tag = new Tag(tagCreateRequest);
Tag tag = new Tag("IT");

when(tagRepository.findById(anyInt())).thenReturn(Optional.of(tag));
when(tagRepository.existsByName(anyString())).thenReturn(true);
Expand All @@ -134,7 +133,7 @@ void givenModifyTag_whenDuplicateTagName_thenThrowTagNameAlreadyExistsException(
@Test
@DisplayName("deleteTag 메서드 정상적인 경우 테스트")
void givenDeleteTag_whenNormalCase_thenReturnTagDeleteResponse() {
Tag tag = new Tag(new TagCreateRequest("IT"));
Tag tag = new Tag("IT");
when(tagRepository.findById(anyInt())).thenReturn(Optional.of(tag));

TagDeleteResponse tagDeleteResponse = tagService.deleteTag(1);
Expand Down
Loading