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.

Sign up for GitHub

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

Jump to bottom

[BE][Team-17][Robin, Cooper] 반찬가게 1차 PR 요청드립니다. #24

Merged
merged 58 commits into from
Apr 29, 2021
Merged

[BE][Team-17][Robin, Cooper] 반찬가게 1차 PR 요청드립니다. #24

merged 58 commits into from
Apr 29, 2021

Commits on Apr 20, 2021

  1. Chore : 백엔드 프로젝트 파일을 생성하라.

    @pbg0205
    pbg0205 committed Apr 20, 2021
    Configuration menu
    Copy the full SHA
    3642f9b View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Feat: 스프링 데이터 jdbc으로 셋팅하라 

    - 스프링 부트와 mysql을 연동해라
- 반찬 item, image, best_category, dish_category 테이블을 생성해라
    @malaheaven
    malaheaven committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    0b2600b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from swing-park/feature-setup-jdbc 

    Feat: 스프링 데이터 jdbc으로 셋팅하라
    @pbg0205
    pbg0205 authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    7fc73cc View commit details
    Browse the repository at this point in the history

  3. Feat: domain을 생성해라 

    - Item domain을 생성해라
- Image domain을 생성해라
- DishCategory domain을 생성해라
- BestCategory domain을 생성해라
    @malaheaven
    malaheaven committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    41d119b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #11 from swing-park/feature-create-domain 

    Feat: domain을 생성해라
    @pbg0205
    pbg0205 authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    d9290c6 View commit details
    Browse the repository at this point in the history

  5. Feat: repository를 생성해라 

    - ItemRepository를 생성해라
- ImageRepository를 생성해라
- DishCategoryRepository를 생성해라
- BestCategoryRepository를 생성해라
    @malaheaven
    malaheaven committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    5849e54 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #12 from swing-park/feature-create-repository 

    Feat: repository를 생성해라
    @pbg0205
    pbg0205 authored Apr 21, 2021
    Configuration menu
    Copy the full SHA
    64d0596 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. Fix : DB 스키마 변경하라 

    - 변경된 image, item 컬럼에 따라 domain 변경
- best_category 및 dish_category 에 대한 insert구문 추가
    @malaheaven
    malaheaven committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    16d4c02 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from swing-park/fix-db-schema 

    Fix : DB 스키마 변경하라
    @pbg0205
    pbg0205 authored Apr 22, 2021
    Configuration menu
    Copy the full SHA
    fe0e43c View commit details
    Browse the repository at this point in the history

  3. Feat: controller를 만들어라

    @malaheaven
    malaheaven committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    b970e66 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from swing-park/feature-create-controller 

    Feat: controller를 만들어라
    @pbg0205
    pbg0205 authored Apr 22, 2021
    Configuration menu
    Copy the full SHA
    8c2ca83 View commit details
    Browse the repository at this point in the history

  5. style : 변수명 오탈자를 수정하라. 

    - discription -> description으로 변수명을 변경하라.
    @pbg0205
    pbg0205 committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    5f05a54 View commit details
    Browse the repository at this point in the history

  6. feat : finAll 메서드를 추가하라. 

    - 리턴타입을 List로 한 findAll 메서드를 생성하라.
    @pbg0205
    pbg0205 committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    a34d29c View commit details
    Browse the repository at this point in the history

  7. feat : domain과 dto에 getter를 추가해라.

    @pbg0205
    pbg0205 committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    21ef877 View commit details
    Browse the repository at this point in the history

  8. feat : 베스트목록들을 반환하는 메서드를 작성하라.

    @pbg0205
    pbg0205 committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    5d7243b View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. feat : 베스트 카테고리 목록을 조회하라. 

    - 베스트 카테고리 전체 목록을 조회하라.

- 베스트 카테고리 세부 목록을 조회하라.
    @pbg0205
    pbg0205 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    e842d9a View commit details
    Browse the repository at this point in the history

  2. feat : service layer를 추가하라. 

    - ItemService를 추가하라.

- ImageService를 추가하라.

- BestCategoryService를 추가하라.
    @pbg0205
    pbg0205 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    f75f0b9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #21 from swing-park/feature-create-get-method 

    Feature create get method
    @malaheaven
    malaheaven authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    92a2627 View commit details
    Browse the repository at this point in the history

  4. style : ItemDto item 변수명을 변경하라. 

    - itemId -> item_id로 변경하라.
    @pbg0205
    pbg0205 committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    4f09ac7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #22 from swing-park/feature-create-get-method 

    style : ItemDto item 변수명을 변경하라.
    @malaheaven
    malaheaven authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    5dcf127 View commit details
    Browse the repository at this point in the history

  6. Feat: DishCategory 조회 기능을 구현해라 

    - DishCategoryController 구현
- DishCategoryService 구현
- DishCategoryDto 구현
    @malaheaven
    malaheaven committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    7b874c4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #24 from swing-park/feature-create-dishcategory 

    Feat: DishCategory 조회 기능을 구현해라
    @pbg0205
    pbg0205 authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    8cf8d8c View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2021

  1. refactor : 불필요한 의존성을 제거하라. 

    - 사용하지 않는 ItemService 제거

- 사용하지 않는 ImageService 제거
    @pbg0205
    pbg0205 committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    991103c View commit details
    Browse the repository at this point in the history

  2. feat : BestCategory의 불필요한 의존성을 제거하라. 

    - 사용하지 않는 ImageService를 제거하라.
    @pbg0205
    pbg0205 committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    4d1f50a View commit details
    Browse the repository at this point in the history

  3. refactor : imageRepository 의존성을주입하자. 

    - 현재 단계에서 imageService의 큰 사용이 없어 조회기능을
imageRepository로 주입해서 조회하도록 변경하라.
    @pbg0205
    pbg0205 committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    84c3609 View commit details
    Browse the repository at this point in the history

  4. refactor : dto의 nPrice, sPrice 변수명을 변경하라. 

    - Java Naming Convention에 맞게 camel case로 변경하여라.

- 정확한 의미를 부여할 수 있도록 변수명을 구체적으로 작성하라.
    @pbg0205
    pbg0205 committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    7ebac27 View commit details
    Browse the repository at this point in the history

  5. refactor : itemDto 변수명에 final을 선언하라.

    @pbg0205
    pbg0205 committed Apr 25, 2021
    Configuration menu
    Copy the full SHA
    23d2ecf View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2021

  1. feat : 상세정보를 조회하는 기능을 구현하라.

    @pbg0205
    pbg0205 committed Apr 26, 2021
    Configuration menu
    Copy the full SHA
    bab8d75 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29 from swing-park/feature-create-detail 

    Feature create detail
    @malaheaven
    malaheaven authored Apr 26, 2021
    Configuration menu
    Copy the full SHA
    e7d652d View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2021

  1. refactor : API관련 내용을 수정하라. 

    - itemDetail : description 2500원 내용 삭제

- badge 빈 문자열 제거
- badge 베스트 요소 제거

- 배포 URL 완성
- URL 추가 : recommandedItemDto, ItemDto

- delivery-type 순서 변경
    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    72346c5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #36 from swing-park/refactor-response-json-api 

    refactor : API관련 내용을 수정하라.
    @malaheaven
    malaheaven authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    b0daa2e View commit details
    Browse the repository at this point in the history

  3. feat : CORS 기능을 구현하라.

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    5bed534 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #37 from swing-park/feature-setup-cors 

    feat : CORS 기능을 구현하라.
    @malaheaven
    malaheaven authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    8a1afdc View commit details
    Browse the repository at this point in the history

  5. style : URL 추가 / 제거

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    8591818 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #39 from swing-park/style-url-path 

    style : URL 추가 / 제거
    @malaheaven
    malaheaven authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    b4badb8 View commit details
    Browse the repository at this point in the history

  7. fix : 오탈자 수정 및 URL 추가 수정 

    - 중복된 URL을 제거하라.

- recommanded -> recommended로 변경하라.
    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    004c536 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #41 from swing-park/style-url-path 

    fix : 오탈자 수정 및 URL 추가 수정
    @malaheaven
    malaheaven authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    6edbbcf View commit details
    Browse the repository at this point in the history

  9. style : 중복된 URL을 제거하라.

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    1c51b98 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #43 from swing-park/style-url-path 

    style : 중복된 URL을 제거하라.
    @pbg0205
    pbg0205 authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    ac31a2f View commit details
    Browse the repository at this point in the history

  11. Fix: dish url

    @malaheaven
    malaheaven committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    621d6c4 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #45 from swing-park/fix-dish-url 

    Fix: dish url
    @malaheaven
    malaheaven authored Apr 27, 2021
    Configuration menu
    Copy the full SHA
    ab9efe8 View commit details
    Browse the repository at this point in the history

  13. feat : 주문 기능을 위한 OrderDto 생성

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    ad07c85 View commit details
    Browse the repository at this point in the history

  14. feat : OrderController 생성

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    9de9048 View commit details
    Browse the repository at this point in the history

  15. feat : Item entity에 재고 반영 기능 추가

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    15d6ab0 View commit details
    Browse the repository at this point in the history

  16. feat : 재고 반영을 위한 OrderService를 생성하라.

    @pbg0205
    pbg0205 committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    528fe7d View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2021

  1. Merge pull request #50 from swing-park/feature-order-test 

    [BE] feature order
    @malaheaven
    malaheaven authored Apr 28, 2021
    Configuration menu
    Copy the full SHA
    955b7c7 View commit details
    Browse the repository at this point in the history

  2. feat : ItemDetailDto deliveryInfo 변수명을 추가하라.

    @pbg0205
    pbg0205 committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    c0b10b5 View commit details
    Browse the repository at this point in the history

  3. style : dummy data를 수정하라. 

    - 이벤트 특가, 론칭 특가 순서 변경
    @pbg0205
    pbg0205 committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    c57bc46 View commit details
    Browse the repository at this point in the history

  4. feat : 추천 목록을 10개를 임의로 반환하라.

    @pbg0205
    pbg0205 committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    ef89ce5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #51 from swing-park/refactor-FE-feedback 

    [BE] Refactor FE feedback
    @malaheaven
    malaheaven authored Apr 28, 2021
    Configuration menu
    Copy the full SHA
    920ec75 View commit details
    Browse the repository at this point in the history

  6. refactor : RequestBody 형태로 데이터를 전달받아라.

    @pbg0205
    pbg0205 committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    c37a453 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #55 from swing-park/feature-order 

    refactor : RequestBody 형태로 데이터를 전달받아라.
    @malaheaven
    malaheaven authored Apr 28, 2021
    Configuration menu
    Copy the full SHA
    7032c0c View commit details
    Browse the repository at this point in the history

  8. Feat: 커스텀 이셉션 핸들러를 이용하여 예외를 처리 

    - best 카테고리
- dish 카테고리
- 이미지
- 아이템
- 재고부족
    @malaheaven
    malaheaven committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    9f364c8 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #61 from swing-park/feature-exception-handler 

    Feat: 커스텀 이셉션 핸들러를 이용하여 예외를 처리
    @pbg0205
    pbg0205 authored Apr 28, 2021
    Configuration menu
    Copy the full SHA
    b50f10b View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. feat : CORS 설정에 PUT METHOD를 추가하라.

    @pbg0205
    pbg0205 committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    90658f1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62 from swing-park/feat-cors-put 

    feat : CORS 설정에 PUT METHOD를 추가하라.
    @malaheaven
    malaheaven authored Apr 29, 2021
    Configuration menu
    Copy the full SHA
    362f0fb View commit details
    Browse the repository at this point in the history

  3. chore : jackson databind dependency를 추가하라.

    @pbg0205
    pbg0205 committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    ae71da2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #66 from swing-park/chore-jackson-core 

    chore : jackson databind dependency를 추가하라.
    @malaheaven
    malaheaven authored Apr 29, 2021
    Configuration menu
    Copy the full SHA
    8c3d66e View commit details
    Browse the repository at this point in the history