Merge pull request #118 from FixLog/develop

Develop

Author: youngseo22

src/main/java/com/example/FixLog/mock/TagMockDataInitializer.java

@@ -34,7 +34,7 @@ public void run(String... args) {
         // BIG_CATEGORY
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "backend"));
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "machine-learning"));
-        addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "frontend"));
+        addIfNotExist(tagsToInsert, existingTagNames, Tag.of(BIG_CATEGORY, "web"));
 
         // MAJOR_CATEGORY
         addIfNotExist(tagsToInsert, existingTagNames, Tag.of(MAJOR_CATEGORY, "django"));

src/main/java/com/example/FixLog/repository/tag/TagRepository.java

@@ -1,13 +1,15 @@
 package com.example.FixLog.repository.tag;
 
 import com.example.FixLog.domain.tag.Tag;
+import com.example.FixLog.domain.tag.TagCategory;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;
 
 public interface TagRepository extends JpaRepository<Tag, Long> {
-    Page<Tag> findAll(Pageable pageable);
+    // Page<Tag> findAll(Pageable pageable);
+    Page<Tag> findAllByTagCategory(TagCategory tagCategory, Pageable pageable);
     Optional<Tag> findByTagName(String tagName);
 }

src/main/java/com/example/FixLog/service/TagService.java

@@ -1,6 +1,7 @@
 package com.example.FixLog.service;
 
 import com.example.FixLog.domain.tag.Tag;
+import com.example.FixLog.domain.tag.TagCategory;
 import com.example.FixLog.dto.tag.TagDto;
 import com.example.FixLog.dto.tag.TagResponseDto;
 import com.example.FixLog.repository.tag.TagRepository;
@@ -24,7 +25,7 @@ public TagService(TagRepository tagRepository){
     public TagResponseDto viewTags(int page, int size){
         Pageable pageable = PageRequest.of(page - 1, size);
 
-        Page<Tag> tags = tagRepository.findAll(pageable);
+        Page<Tag> tags = tagRepository.findAllByTagCategory(TagCategory.MINOR_CATEGORY, pageable);
 
         List<TagDto> tagList = tags.stream()
                 .map(tag -> new TagDto(