Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyum-q
kyum-q committed Aug 6, 2024
1 parent 3fb3707 commit 70568c2
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 153 deletions.
21 changes: 10 additions & 11 deletions backend/src/main/java/codezap/category/service/CategoryService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import codezap.category.dto.request.CreateCategoryRequest;
import codezap.category.dto.request.UpdateCategoryRequest;
import codezap.category.dto.response.FindAllCategoriesResponse;
import codezap.category.repository.CategoryJpaRepository;
import codezap.category.repository.CategoryRepository;
import codezap.global.exception.CodeZapException;
import codezap.member.domain.Member;
Expand All @@ -20,14 +19,14 @@
@Service
public class CategoryService {

private final CategoryRepository categoryJpaRepository;
private final CategoryRepository categoryRepository;
private final TemplateRepository templateRepository;
private final MemberRepository memberJpaRepository;

public CategoryService(CategoryJpaRepository categoryJpaRepository, TemplateRepository templateRepository,
public CategoryService(CategoryRepository categoryRepository, TemplateRepository templateRepository,
MemberJpaRepository memberJpaRepository
) {
this.categoryJpaRepository = categoryJpaRepository;
this.categoryRepository = categoryRepository;
this.templateRepository = templateRepository;
this.memberJpaRepository = memberJpaRepository;
}
Expand All @@ -38,36 +37,36 @@ public Long create(CreateCategoryRequest createCategoryRequest, MemberDto member
Member member = memberJpaRepository.fetchById(memberDto.id());
validateDuplicatedCategory(categoryName, member);
Category category = new Category(categoryName, member);
return categoryJpaRepository.save(category).getId();
return categoryRepository.save(category).getId();
}

public FindAllCategoriesResponse findAllByMember(MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
return FindAllCategoriesResponse.from(categoryJpaRepository.findAllByMember(member));
return FindAllCategoriesResponse.from(categoryRepository.findAllByMember(member));
}

public FindAllCategoriesResponse findAll() {
return FindAllCategoriesResponse.from(categoryJpaRepository.findAll());
return FindAllCategoriesResponse.from(categoryRepository.findAll());
}

@Transactional
public void update(Long id, UpdateCategoryRequest updateCategoryRequest, MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
validateDuplicatedCategory(updateCategoryRequest.name(), member);
Category category = categoryJpaRepository.fetchById(id);
Category category = categoryRepository.fetchById(id);
validateAuthorizeMember(category, member);
category.updateName(updateCategoryRequest.name());
}

private void validateDuplicatedCategory(String categoryName, Member member) {
if (categoryJpaRepository.existsByNameAndMember(categoryName, member)) {
if (categoryRepository.existsByNameAndMember(categoryName, member)) {
throw new CodeZapException(HttpStatus.CONFLICT, "이름이 " + categoryName + "인 카테고리가 이미 존재합니다.");
}
}

public void deleteById(Long id, MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
Category category = categoryJpaRepository.fetchById(id);
Category category = categoryRepository.fetchById(id);
validateAuthorizeMember(category, member);

if (templateRepository.existsByCategoryId(id)) {
Expand All @@ -76,7 +75,7 @@ public void deleteById(Long id, MemberDto memberDto) {
if (category.getIsDefault()) {
throw new CodeZapException(HttpStatus.BAD_REQUEST, "기본 카테고리는 삭제할 수 없습니다.");
}
categoryJpaRepository.deleteById(id);
categoryRepository.deleteById(id);
}

private void validateAuthorizeMember(Category category, Member member) {
Expand Down
20 changes: 9 additions & 11 deletions backend/src/main/java/codezap/template/service/TemplateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import codezap.category.domain.Category;
import codezap.category.repository.CategoryJpaRepository;
import codezap.category.repository.CategoryRepository;
import codezap.global.exception.CodeZapException;
import codezap.member.domain.Member;
import codezap.member.dto.MemberDto;
Expand Down Expand Up @@ -47,7 +45,7 @@ public class TemplateService {
private final ThumbnailSnippetRepository thumbnailSnippetRepository;
private final TemplateRepository templateRepository;
private final SnippetRepository snippetRepository;
private final CategoryJpaRepository categoryJpaRepository;
private final CategoryRepository categoryRepository;
private final TagRepository tagRepository;
private final TemplateTagRepository templateTagRepository;
private final MemberRepository memberRepository;
Expand All @@ -61,16 +59,16 @@ public TemplateService(ThumbnailSnippetRepository thumbnailSnippetRepository,
this.thumbnailSnippetRepository = thumbnailSnippetRepository;
this.templateRepository = templateRepository;
this.snippetRepository = snippetRepository;
this.categoryJpaRepository = categoryJpaRepository;
this.categoryRepository = categoryRepository;
this.tagRepository = tagRepository;
this.templateTagRepository = templateTagRepository;
this.memberRepository = memberRepository;
}

@Transactional
public Long createTemplate(CreateTemplateRequest createTemplateRequest, MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
Category category = categoryJpaRepository.fetchById(createTemplateRequest.categoryId());
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.fetchById(createTemplateRequest.categoryId());
validateCategoryAuthorizeMember(category, member);
Template template = templateRepository.save(
new Template(member, createTemplateRequest.title(), createTemplateRequest.description(), category)
Expand Down Expand Up @@ -123,7 +121,7 @@ public ExploreTemplatesResponse findAll() {
}

public FindTemplateResponse findByIdAndMember(Long id, MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
Member member = memberRepository.fetchById(memberDto.id());
Template template = templateRepository.fetchById(id);
validateTemplateAuthorizeMember(template, member);

Expand Down Expand Up @@ -194,8 +192,8 @@ private List<Tag> getTemplateTags(Template template) {

@Transactional
public void update(Long templateId, UpdateTemplateRequest updateTemplateRequest, MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
Category category = categoryJpaRepository.fetchById(updateTemplateRequest.categoryId());
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.fetchById(updateTemplateRequest.categoryId());
validateCategoryAuthorizeMember(category, member);
Template template = templateRepository.fetchById(templateId);
validateTemplateAuthorizeMember(template, member);
Expand Down Expand Up @@ -271,7 +269,7 @@ private void validateSnippetsCount(UpdateTemplateRequest updateTemplateRequest,

@Transactional
public void deleteById(Long id, MemberDto memberDto) {
Member member = memberJpaRepository.fetchById(memberDto.id());
Member member = memberRepository.fetchById(memberDto.id());
Template template = templateRepository.fetchById(id);
validateTemplateAuthorizeMember(template, member);

Expand Down
3 changes: 1 addition & 2 deletions backend/src/test/java/codezap/template/controller/TemplateControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ void deleteTemplateFailWithNotFoundTemplate() {
}
}

private CreateTemplateRequest createTemplateRequestWithTwoSnippets(String title) {
private static CreateTemplateRequest createTemplateRequestWithTwoSnippets(String title) {
CreateTemplateRequest templateRequest = new CreateTemplateRequest(
title,
"description",
Expand All @@ -497,5 +497,4 @@ private CreateTemplateRequest createTemplateRequestWithTwoSnippets(String title)
);
return templateRequest;
}

}
27 changes: 17 additions & 10 deletions backend/src/test/java/codezap/template/service/TemplateServiceSearchTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

import codezap.category.domain.Category;
import codezap.category.repository.CategoryRepository;
import codezap.fixture.MemberDtoFixture;
import codezap.member.domain.Member;
import codezap.member.dto.MemberDto;
import codezap.member.repository.MemberRepository;
import codezap.template.domain.Snippet;
import codezap.template.domain.Tag;
Expand Down Expand Up @@ -153,8 +155,9 @@ class searchContainTopic {
@DisplayName("템플릿 토픽 검색 성공 : 템플릿 제목에 포함")
void findAllTemplatesTitleContainTopicSuccess() {
//given
Member member = memberRepository.save(new Member("[email protected]", "aaa1", "kyummi"));
Category category = categoryRepository.save(new Category("category"));
MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.save(new Category("category", member));
saveTemplate(makeTemplateRequest("hello"), member, category);
saveTemplate(makeTemplateRequest("hello topic"), member, category);
saveTemplate(makeTemplateRequest("topic hello"), member, category);
Expand All @@ -172,8 +175,9 @@ void findAllTemplatesTitleContainTopicSuccess() {
@DisplayName("템플릿 토픽 검색 성공 : 탬플릿 내에 스니펫 파일명 중 하나라도 포함")
void findAllSnippetFilenameContainTopicSuccess() {
//given
Member member = memberRepository.save(new Member("[email protected]", "aaa1", "kyummi"));
Category category = categoryRepository.save(new Category("category"));
MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.save(new Category("category", member));
saveTemplateBySnippetFilename("tempate1", "login.js", "signup.js", member, category);
saveTemplateBySnippetFilename("tempate2", "login.java", "signup.java", member, category);
saveTemplateBySnippetFilename("tempate3", "login.js", "signup.java", member, category);
Expand All @@ -190,8 +194,9 @@ void findAllSnippetFilenameContainTopicSuccess() {
@DisplayName("템플릿 토픽 검색 성공 : 탬플릿 내에 스니펫 코드 중 하나라도 포함")
void findAllSnippetContentContainTopicSuccess() {
//given
Member member = memberRepository.save(new Member("[email protected]", "aaa1", "kyummi"));
Category category = categoryRepository.save(new Category("category"));
MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.save(new Category("category", member));
saveTemplateBySnippetContent("tempate1", "public Main {", "new Car();", member, category);
saveTemplateBySnippetContent("tempate2", "private Car", "public Movement", member, category);
saveTemplateBySnippetContent("tempate3", "console.log", "a+b=3", member, category);
Expand All @@ -208,8 +213,9 @@ void findAllSnippetContentContainTopicSuccess() {
@DisplayName("템플릿 토픽 검색 성공 : 탬플릿 설명에 포함")
void findAllDescriptionContainTopicSuccess() {
//given
Member member = memberRepository.save(new Member("[email protected]", "aaa1", "kyummi"));
Category category = categoryRepository.save(new Category("category"));
MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.save(new Category("category", member));
CreateTemplateRequest request1 = new CreateTemplateRequest(
"타이틀",
"Login 구현",
Expand Down Expand Up @@ -245,8 +251,9 @@ void findAllDescriptionContainTopicSuccess() {
@DisplayName("템플릿 토픽 검색 성공 : 페이징 성공")
void findAllContainTopicPaging() {
//given
Member member = memberRepository.save(new Member("[email protected]", "aaa1", "kyummi"));
Category category = categoryRepository.save(new Category("category"));
MemberDto memberDto = MemberDtoFixture.getFirstMemberDto();
Member member = memberRepository.fetchById(memberDto.id());
Category category = categoryRepository.save(new Category("category", member));
saveTemplate(makeTemplateRequest("hello topic 1"), member, category);
saveTemplate(makeTemplateRequest("hello topic 2"), member, category);
saveTemplate(makeTemplateRequest("hello topic 3"), member, category);
Expand Down
Loading

0 comments on commit 70568c2

Please sign in to comment.