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

[BE] [팀-18 / Kyu] 리뷰 요청 #51

Open
wants to merge 81 commits into
base: team18
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
57f3911
Update README.md
kyupid Apr 19, 2021
97d1844
chore : 기본 설정
kyupid Apr 19, 2021
f7377ec
add : 엔티티 Banchan, Category 추가
kyupid Apr 19, 2021
fb62ccb
add : Entity User 추가
kyupid Apr 19, 2021
d3dc14b
Merge pull request #15 from kyu-kim-kr/add/entity
kyupid Apr 19, 2021
8c62da3
delete : 클래스 User 삭제
kyupid Apr 19, 2021
5cc5704
fix : 클래스 Banchan 수정
kyupid Apr 19, 2021
c036d5b
add : Repo 생성
kyupid Apr 19, 2021
794131a
Merge pull request #16 from kyu-kim-kr/add/repo
kyupid Apr 19, 2021
7934422
chore : spring-data-jdbc 추가
kyupid Apr 19, 2021
cd6efd9
refactor : Banchan의 DeliveryType과 Badge를 객체로 받는
kyupid Apr 20, 2021
e3247f9
add : detail_hash에 값으로 반찬 찾기
kyupid Apr 20, 2021
1e367d5
fix: Category 수정
kyupid Apr 20, 2021
4cf5b7d
add : 기본적인 서비스, 컨트롤러
kyupid Apr 20, 2021
328ad5b
test : 기본 테스트코드 추가
kyupid Apr 20, 2021
0f45318
Merge pull request #22 from kyu-kim-kr/add/service
kyupid Apr 20, 2021
5f188a2
chore : 디비 비번 생성
kyupid Apr 20, 2021
d48ca5f
delete : 클래스 Badge, DeliveryType 삭제
kyupid Apr 20, 2021
5bb829c
fix : delivery_type & badge 타입 String으로 변경
kyupid Apr 20, 2021
c81ab8f
add : BanchanDto 생성
kyupid Apr 20, 2021
d40364e
fix : Controller, Service에서 Entity가 아니라 DTO를 불러오도록 수정
kyupid Apr 20, 2021
c9949d1
fix : BanchanDetail directory
kyupid Apr 20, 2021
31d5520
Merge pull request #26 from kyu-kim-kr/feat/jsonarray
kyupid Apr 20, 2021
cfc49fd
set : Null값이면 JSON 데이터에서 제외하도록 어노테이션 설정
kyupid Apr 21, 2021
ef29e09
feat : String을 배열로 변환해줄때 String이 Null이면 Null로 반환
kyupid Apr 21, 2021
d91be65
add : 필드 tag, BanchanDetail 추가
kyupid Apr 21, 2021
d953f3e
add : BanchanDetail, BanchanDetailDto
kyupid Apr 21, 2021
4a3a18f
feat : 반찬 detail 가져오는 api 구현
kyupid Apr 21, 2021
47edb0f
fix : 필드명 변경
kyupid Apr 22, 2021
853c8a9
feat : 상세페이지 API
kyupid Apr 22, 2021
51307e4
add : 테스트용 toString()
kyupid Apr 22, 2021
a4449d4
add : Reponse시 Null처리 어노테이션
kyupid Apr 22, 2021
d69ee68
fix : String[]을 Set<String>으로 변경
kyupid Apr 22, 2021
c50871a
feat : DataDto 를 추가해서 필드들 배열로 받을 수 있도록
kyupid Apr 22, 2021
cedac8c
refactor : String 에서 Set으로 바꾸는 메서드 중복 코드 줄이기 위해 통합
kyupid Apr 22, 2021
2c6ffd4
rename : 클래스 Data를 명확하게 표현
kyupid Apr 22, 2021
8ca45db
Merge pull request #32 from kyu-kim-kr/feat/detailpage
kyupid Apr 22, 2021
cd5545c
remove : 필요없는 생성자 삭제
kyupid Apr 22, 2021
bce16cc
add : 개별 메인 반찬 이외에 다른 개별 반찬 API
kyupid Apr 22, 2021
c2ae692
add : Banchan에 category_id 필드 추가
kyupid Apr 22, 2021
a5a7b56
add : CategoryDto 추가
kyupid Apr 22, 2021
a4719d5
feat : 카테고리에 따른 반찬들 API
kyupid Apr 22, 2021
43556f5
rename : method
kyupid Apr 23, 2021
cb2b1b8
Merge pull request #36 from kyu-kim-kr/feat/category
kyupid Apr 23, 2021
da543ae
feat : 베스트반찬들 API 구현 Http상태와 카테고리에 따른 리스트들을 응답
kyupid Apr 23, 2021
1dcc49a
rename : method and variable
kyupid Apr 24, 2021
f2003b1
delete : 불필요한 명시
kyupid Apr 24, 2021
426f6ad
rename : typo
kyupid Apr 24, 2021
3130bbf
Merge pull request #40 from kyu-kim-kr/feat/non-category
kyupid Apr 26, 2021
39b0af5
add : 반찬 상세정보 컬럼 추가
kyupid Apr 26, 2021
14eb6d8
delete : detail_section 삭제
kyupid Apr 26, 2021
ea53b25
rename : Message
kyupid Apr 26, 2021
a9f97ec
add : Tag에 따른 반찬들 부르는 API
kyupid Apr 26, 2021
e135ff3
Merge pull request #44 from kyu-kim-kr/feat/taggedbanchan
kyupid Apr 26, 2021
3f268a7
fix : 데이터 구분법 변경
kyupid Apr 26, 2021
96c92e0
Merge pull request #45 from kyu-kim-kr/fix/splitdata
kyupid Apr 26, 2021
9a62860
fix : BanchanDetail 내에 hash를 detail_hash로 변경
kyupid Apr 26, 2021
837bab1
feat : Order 추가
kyupid Apr 27, 2021
5ffe10b
Merge pull request #48 from kyu-kim-kr/feat/order
kyupid Apr 27, 2021
124062a
add : get 추가
kyupid Apr 27, 2021
fce0f5b
Merge pull request #50 from kyu-kim-kr/feat/order
kyupid Apr 27, 2021
1ce5fc0
chore : spring-security & spring-oauth2.0 추가
kyupid Apr 27, 2021
52fbcf8
add : Oauth 설정 추가
kyupid Apr 27, 2021
2954b19
chore : Github Oauth 연동 설정
kyupid Apr 27, 2021
6d3d323
fix : typo
kyupid Apr 27, 2021
76a8ec5
Merge pull request #52 from kyu-kim-kr/feat/github-oauth
kyupid Apr 27, 2021
e0049ae
chore : gradlew
kyupid Apr 27, 2021
6e6c7f4
Merge branch 'feat/github-oauth' into backend
kyupid Apr 27, 2021
7fb1f37
chore : gradle
kyupid Apr 27, 2021
ad3eca9
chore : application.properties
kyupid Apr 27, 2021
2517662
add : Mapping 규칙
kyupid Apr 29, 2021
85db84e
add : gradle related
kyupid Apr 30, 2021
3b2644c
remove : test
kyupid Apr 30, 2021
96f05e8
resolve : problem about merging with gradle.xml
kyupid Apr 30, 2021
7cd7769
Merge branch 'feat/order' into set/aws-approperties
kyupid Apr 30, 2021
44aee23
remove : Oauth related
kyupid Apr 30, 2021
5f61044
add : 주문하기 API
kyupid Apr 30, 2021
31bbc13
Merge pull request #61 from kyu-kim-kr/feat/order
kyupid Apr 30, 2021
7ff3ea1
fix : 매핑정보
kyupid Apr 30, 2021
6349704
Merge pull request #62 from kyu-kim-kr/feat/order
kyupid Apr 30, 2021
ba5cc6b
Merge branch 'team18' into backend
kyupid May 6, 2021
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
Prev Previous commit
Next Next commit
set : Null값이면 JSON 데이터에서 제외하도록 어노테이션 설정
kyupid committed Apr 21, 2021
commit cfc49fdeecf9c9be34712afa12a6659997cf3255
2 changes: 2 additions & 0 deletions backend/src/main/java/develop/baminchan/dto/BanchanDto.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package develop.baminchan.dto;

import com.fasterxml.jackson.annotation.JsonInclude;
import develop.baminchan.entity.Banchan;

@JsonInclude(JsonInclude.Include.NON_NULL)
public class BanchanDto {
private String detail_hash;
private String image;