Skip to content

Commit

Permalink
Merge pull request #60 from taco-official/KL-161/기본-사진-추가
Browse files Browse the repository at this point in the history
ohhamma authored Sep 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents e01921e + 14a92b9 commit 6ec5529
Showing 138 changed files with 1,180 additions and 1,777 deletions.
140 changes: 70 additions & 70 deletions application.log

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package taco.klkl.domain.category.controller;
package taco.klkl.domain.category.controller.category;

import java.util.List;

@@ -11,9 +11,8 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import taco.klkl.domain.category.dto.response.CategoryResponse;
import taco.klkl.domain.category.dto.response.CategoryWithSubcategoryResponse;
import taco.klkl.domain.category.service.CategoryService;
import taco.klkl.domain.category.dto.response.category.CategoryResponse;
import taco.klkl.domain.category.service.category.CategoryService;

@Slf4j
@RestController
@@ -32,7 +31,7 @@ public List<CategoryResponse> findAllCategories() {

@GetMapping("/{categoryId}/subcategories")
@Operation(summary = "대분류의 소분류 목록 조회", description = "Category에 포함된 Subcategory 반환")
public CategoryWithSubcategoryResponse findSubCategoriesByCategoryId(@PathVariable Long categoryId) {
public CategoryResponse findSubCategoriesByCategoryId(@PathVariable Long categoryId) {
return categoryService.findSubCategoriesByCategoryId(categoryId);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package taco.klkl.domain.category.controller;
package taco.klkl.domain.category.controller.tag;

import java.util.List;
import java.util.Set;
@@ -12,10 +12,10 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import taco.klkl.domain.category.domain.Subcategory;
import taco.klkl.domain.category.dto.response.TagResponse;
import taco.klkl.domain.category.service.SubcategoryService;
import taco.klkl.domain.category.domain.subcategory.Subcategory;
import taco.klkl.domain.category.dto.response.tag.TagResponse;
import taco.klkl.domain.category.service.SubcategoryTagService;
import taco.klkl.domain.category.service.subcategory.SubcategoryService;

@Slf4j
@Tag(name = "6. 카테고리", description = "카테고리 관련 API")

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import taco.klkl.domain.category.domain.Subcategory;
import taco.klkl.domain.category.domain.SubcategoryTag;
import taco.klkl.domain.category.domain.subcategory.Subcategory;

@Repository
public interface SubcategoryTagRepository extends JpaRepository<SubcategoryTag, Long> {
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package taco.klkl.domain.category.dao;
package taco.klkl.domain.category.dao.category;

import java.util.List;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import taco.klkl.domain.category.domain.Category;
import taco.klkl.domain.category.domain.CategoryName;
import taco.klkl.domain.category.domain.category.Category;

@Repository
public interface CategoryRepository extends JpaRepository<Category, Long> {
List<Category> findAllByNameIn(final List<CategoryName> names);
List<Category> findAllByNameLike(final String partialName);
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package taco.klkl.domain.category.dao;
package taco.klkl.domain.category.dao.subcategory;

import java.util.List;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import taco.klkl.domain.category.domain.Subcategory;
import taco.klkl.domain.category.domain.SubcategoryName;
import taco.klkl.domain.category.domain.subcategory.Subcategory;

@Repository
public interface SubcategoryRepository extends JpaRepository<Subcategory, Long> {
List<Subcategory> findAllByNameIn(final List<SubcategoryName> names);
List<Subcategory> findAllByNameLike(final String partialName);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package taco.klkl.domain.category.dao;
package taco.klkl.domain.category.dao.tag;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import taco.klkl.domain.category.domain.Tag;
import taco.klkl.domain.category.domain.tag.Tag;

@Repository
public interface TagRepository extends JpaRepository<Tag, Long> {
42 changes: 0 additions & 42 deletions src/main/java/taco/klkl/domain/category/domain/CategoryName.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import taco.klkl.domain.category.domain.subcategory.Subcategory;
import taco.klkl.domain.category.domain.tag.Tag;

@Getter
@Entity(name = "subcategory_tag")
25 changes: 0 additions & 25 deletions src/main/java/taco/klkl/domain/category/domain/TagName.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package taco.klkl.domain.category.domain;
package taco.klkl.domain.category.domain.category;

import java.util.ArrayList;
import java.util.List;
@@ -12,27 +12,32 @@
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import taco.klkl.domain.category.domain.subcategory.Subcategory;

@Getter
@Entity(name = "category")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Category {

private CategoryType categoryType;

@Id
@Column(name = "category_id")
@GeneratedValue(strategy = GenerationType.AUTO)
private Long id;

@Column(name = "name")
private CategoryName name;
private String name;

@OneToMany(mappedBy = "category")
private List<Subcategory> subcategories = new ArrayList<>();

private Category(final CategoryName name) {
this.name = name;
private Category(final CategoryType categoryType) {
this.categoryType = categoryType;
this.name = categoryType.getName();
}

public static Category of(final CategoryName name) {
return new Category(name);
public static Category of(final CategoryType categoryType) {
return new Category(categoryType);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package taco.klkl.domain.category.domain.category;

import java.util.Arrays;

import lombok.AllArgsConstructor;
import lombok.Getter;
import taco.klkl.domain.category.exception.category.CategoryTypeNotFoundException;

@Getter
@AllArgsConstructor
public enum CategoryType {
FOOD("식품"),
CLOTHES("의류"),
SUNDRIES("잡화"),
COSMETICS("화장품"),
;

private final String name;

public static CategoryType from(final String name) {
return Arrays.stream(values())
.filter(type -> type.getName().equals(name))
.findFirst()
.orElseThrow(CategoryTypeNotFoundException::new);
}
}
Loading

0 comments on commit 6ec5529

Please sign in to comment.