-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge pull request #60 from taco-official/KL-161/기본-사진-추가
- KL-163/프론트-요구사항-처리
- (#60)
- KL-184/서버-배포
- (#60)
- develop
- (#72, #60)
Showing
138 changed files
with
1,180 additions
and
1,777 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
src/main/java/taco/klkl/domain/category/converter/CategoryNameConverter.java
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
src/main/java/taco/klkl/domain/category/converter/SubcategoryNameConverter.java
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
src/main/java/taco/klkl/domain/category/converter/TagNameConverter.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
...main/category/dao/CategoryRepository.java → ...gory/dao/category/CategoryRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} |
7 changes: 3 additions & 4 deletions
7
...n/category/dao/SubcategoryRepository.java → ...ao/subcategory/SubcategoryRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} |
4 changes: 2 additions & 2 deletions
4
...kl/domain/category/dao/TagRepository.java → ...omain/category/dao/tag/TagRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 0 additions & 42 deletions
42
src/main/java/taco/klkl/domain/category/domain/CategoryName.java
This file was deleted.
Oops, something went wrong.
64 changes: 0 additions & 64 deletions
64
src/main/java/taco/klkl/domain/category/domain/SubcategoryName.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
src/main/java/taco/klkl/domain/category/domain/TagName.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
src/main/java/taco/klkl/domain/category/domain/category/CategoryType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} | ||
} |
Oops, something went wrong.