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

메인 브랜치로 merge 24.03.04 #249

Merged
merged 82 commits into from
Mar 4, 2024
Merged

메인 브랜치로 merge 24.03.04 #249

merged 82 commits into from
Mar 4, 2024

Commits on Feb 29, 2024

  1. feat: member 테이블 권한 추가 

    - member 테이블에 references 권한 추가
    @linglong67
    linglong67 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    156efea View commit details
    Browse the repository at this point in the history

  2. feat: review 관련 interceptor 내용 추가 

    - interceptor config에 /reviews 경로 추가
- interceptor에 reviews url 추가 검증 로직 추가
    @linglong67
    linglong67 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5c15c2a View commit details
    Browse the repository at this point in the history

  3. feat: review paging 및 log 추가 

    - review paging 추가
- ReviewService 내 로그 남기는 부분 추가
    @linglong67
    linglong67 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    f50bcd6 View commit details
    Browse the repository at this point in the history

  4. refactor:: like 리턴변경

    @HyunJunSon
    HyunJunSon committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    637b360 View commit details
    Browse the repository at this point in the history

  5. Update cicd-dev.yml

    @linglong67
    linglong67 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    901adad View commit details
    Browse the repository at this point in the history

  6. refactor : .yml 파일에 jwt-expiring-time 지정하여 profile 별로 다르게 설정하여 사용하도록 수정

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    48f70b2 View commit details
    Browse the repository at this point in the history

  7. Update cicd-dev.yml

    @linglong67
    linglong67 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2c8bc2c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #222 from cgk95/hotfix/configure_jwt_expiring 

    refactor : .yml 파일에 jwt-expiring-time 지정하여 profile 별로 다르게 설정하여 사용하도록 수정
    @chan99k
    chan99k authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    9614bd1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #221 from HyunJunSon/refator/like 

    refactor:: 즐겨찾기 목록 요청 리팩토링
    @linglong67
    linglong67 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    6e261b8 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #223 from linglong67/feature/modify-cicd-dev-yml 

    [hotfix] cicd-dev yml 수정
    @linglong67
    linglong67 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    0ec3b72 View commit details
    Browse the repository at this point in the history

  11. * 쿼리 파일 수정 (계정분류 추가)

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    5bce046 View commit details
    Browse the repository at this point in the history

  12. * 계정 분류 Enum 클래스 추가

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1129ed9 View commit details
    Browse the repository at this point in the history

  13. * 계정 분류 Entity Field 추가

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    d558b8f View commit details
    Browse the repository at this point in the history

  14. feat :: admin 모듈에서 사용하는 Brand 의 Code 추가

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    580db55 View commit details
    Browse the repository at this point in the history

  15. feat :: BrandDto 와 그와 관련된 로직 추가

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    f2930c6 View commit details
    Browse the repository at this point in the history

  16. feat :: Admin 모듈 Brand CRUD 기능 구현

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    b06a0c2 View commit details
    Browse the repository at this point in the history

  17. feat :: Admin 모듈 auditor 추가

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    f933a98 View commit details
    Browse the repository at this point in the history

  18. * Entity에 accountType 추가로 인한 null 추가 (dto엔 accountType가 필요해질 경우에만 넣는걸로)

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    7702973 View commit details
    Browse the repository at this point in the history

  19. chore :: 오타 수정, Authorization 헤더 삭제

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    7e69ab6 View commit details
    Browse the repository at this point in the history

  20. feat: 리뷰번호순 정렬 추가

    @linglong67
    linglong67 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    0ce9306 View commit details
    Browse the repository at this point in the history

  21. * AccountType enum 클래스 추가로 인한 코드 수정 

    폼 가입시 type platform value 추가
카카오 가입시 type kakao value 추가
* 회원 탈퇴 코드가 중복이므로 메서드 병합 작업 진행
* 약간의 리팩터링 진행
    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    cff8dbc View commit details
    Browse the repository at this point in the history

  22. feat: flyway sql 수정 

    - memeber table grant 관련 제거 (추후 지용님 작업에 올라올 예정으로 겹침)
- review table 제약조건 추가
    @linglong67
    linglong67 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    9ca40f4 View commit details
    Browse the repository at this point in the history

  23. feat :: 세차정보가 없는 경우 400 메시지를 핸들링하도록 변경

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    a19ee50 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'develop' into hotfix/wash_excetion_handling

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    232e911 View commit details
    Browse the repository at this point in the history

  25. * 빌드에러 방지를 위한 테스트코드 추가

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    68bfa3a View commit details
    Browse the repository at this point in the history

  26. Merge pull request #227 from cgk95/hotfix/wash_exception_handling 

    Hotfix :: 세차 정보 예외 핸들링 추가
    @chan99k
    chan99k authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    51239ee View commit details
    Browse the repository at this point in the history

  27. Merge pull request #226 from gunsight1/feature_add_account_type 

    feature :: 회원가입, 로그인시 계정 타입 추가
    @gunsight1
    gunsight1 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    f350c16 View commit details
    Browse the repository at this point in the history

  28. Update MemberController.java 

    소스 에러 병합
    @gunsight1
    gunsight1 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    6f3760d View commit details
    Browse the repository at this point in the history

  29. feat: 등록/수정에 try-catch 추가 

    - 등록/수정 시 유니크 키에 대한 무결성 exception 발생할 수 있어 내용 추가
    @linglong67
    linglong67 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    a0d0872 View commit details
    Browse the repository at this point in the history

  30. * 테이블 컬럼 추가시 존재여부를 판단 한 후 수행하도록 PLSQL로 작성

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    8b65787 View commit details
    Browse the repository at this point in the history

  31. Revert "* 테이블 컬럼 추가시 존재여부를 판단 한 후 수행하도록 PLSQL로 작성" 

    This reverts commit 8b65787.
    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    d00e2cf View commit details
    Browse the repository at this point in the history

  32. Merge pull request #228 from gunsight1/hotfix_modify_v109_query 

    * 테이블 컬럼 추가시 존재여부를 판단 한 후 수행하도록 PLSQL로 작성
    @gunsight1
    gunsight1 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    0b97e8b View commit details
    Browse the repository at this point in the history

  33. Merge branch 'develop' of https://github.com/gunsight1/F1-WashPedia-BE … 

    …into develop
    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2a87260 View commit details
    Browse the repository at this point in the history

  34. feat :: GlobalExceptionHandler 에 처리할 예외 추가

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    290d11e View commit details
    Browse the repository at this point in the history

  35. feat :: GlobalExceptionHandler 에 MissingRequestHeaderException 처리 추가

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    bed7ed1 View commit details
    Browse the repository at this point in the history

  36. * 프론트 로컬 개발 환경용 localhost:3000 추가

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    ffde7a6 View commit details
    Browse the repository at this point in the history

  37. * 이력 불일치로 인한 sql파일 재추가

    gunsight1 committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1696657 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #232 from gunsight1/test_add_webconfig_cors_frontend 

    프론트엔드 접근용 url 추가
    @gunsight1
    gunsight1 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    1f075ac View commit details
    Browse the repository at this point in the history

  39. squash & merge

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    4da697d View commit details
    Browse the repository at this point in the history

  40. squash&merge

    @chan99k
    chan99k committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    bfb971e View commit details
    Browse the repository at this point in the history

  41. Merge pull request #231 from cgk95/feat/#224 

    Feature : 커스텀 예외 메시지 처리를 추가합니다.
    @chan99k
    chan99k authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    8cdb760 View commit details
    Browse the repository at this point in the history

  42. Merge pull request #229 from linglong67/feature/review-api-update 

    [feat] 리뷰 API 보완 (페이징, 토큰 검증)
    @linglong67
    linglong67 authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    fbe1f5c View commit details
    Browse the repository at this point in the history

  43. chore:: interceptor 경로추가

    @HyunJunSon
    HyunJunSon committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    2b98a24 View commit details
    Browse the repository at this point in the history

  44. Merge pull request #234 from HyunJunSon/refator/like 

    chore:: interceptor 경로추가
    @HyunJunSon
    HyunJunSon authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    07bf0d2 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. develop 브랜치 최신 변경사항 squash

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2e2bab5 View commit details
    Browse the repository at this point in the history

  2. chore :: json 파라미터 명 변경

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c848a05 View commit details
    Browse the repository at this point in the history

  3. chore :: 에러 코드 메시지, 비즈니스 코드 메시지 변경

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    448abf8 View commit details
    Browse the repository at this point in the history

  4. feat :: IllegalArgumentException 에 대한 핸들러, 에러코드 추가 (주로 요청-응답 간 Json 파… 

    …라미터 명이 일치하지 않을 때 발생)
    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ba0064f View commit details
    Browse the repository at this point in the history

  5. refactor : 비밀번호 재설정 로직 변경 

    이메일 링크는 이제 /find-password 에 GET 요청을 보내고, 서버는 유효성 검사후 /reset-password 로 리다이렉트 (토큰을 URL 쿼리스트링에 담아서 반환). /reset-password 페이지에서 POST 요청을 보내며 재설정 로직을 마무리
    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    270e7c6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into refactor/change_password_reset_logic

    @chan99k
    chan99k authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ce13f62 View commit details
    Browse the repository at this point in the history

  7. feat :: HttpRequestMethodNotSupportedException 에 대한 핸들러 추가, 주석 제거

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1687855 View commit details
    Browse the repository at this point in the history

  8. fix :: 요청 파라미터 명 명시적으로 지정

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    e7d73cd View commit details
    Browse the repository at this point in the history

  9. fix :: 변경사항을 테스트 코드에 반영

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    4156430 View commit details
    Browse the repository at this point in the history

  10. fix :: 변수명 명시적으로 수정 (value -> memberId)

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    42bdb75 View commit details
    Browse the repository at this point in the history

  11. resolve conflict

    @chan99k
    chan99k committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    088840c View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. chore :: 의도하지 않은 줄바꿈 등을 되돌리기

    @chan99k
    chan99k committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    9be715b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #235 from cgk95/refactor/change_password_reset_logic 

    Fix : 패스워드 재설정 로직을 변경합니다
    @chan99k
    chan99k authored Mar 2, 2024
    Configuration menu
    Copy the full SHA
    8c8409d View commit details
    Browse the repository at this point in the history

  3. fix :: 내 세차 정보 조회 시, 선택할 수 있는 세차정보 옵션을 함께 반환하도록 변경

    @chan99k
    chan99k committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    7cc5920 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #236 from cgk95/fix/washInfo_response 

    fix :: 내 세차 정보 조회 시, 선택할 수 있는 세차정보 옵션을 함께 반환하도록 변경
    @chan99k
    chan99k authored Mar 2, 2024
    Configuration menu
    Copy the full SHA
    3dc31aa View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. * 프론트 개발 배포서버 추가

    gunsight1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    8dde2e9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #238 from gunsight1/hotfix_add_cors_domain 

    * 프론트 개발 배포서버 추가
    @gunsight1
    gunsight1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    9f3aa6c View commit details
    Browse the repository at this point in the history

  3. * 추천제품 20개 발송

    gunsight1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    74088fd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #239 from gunsight1/develop 

    hotfix :: 추천제품 20개 발송
    @gunsight1
    gunsight1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    7d66118 View commit details
    Browse the repository at this point in the history

  5. * 테스트코드 에노테이션 생략

    gunsight1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    6a64843 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #240 from gunsight1/hotfix_maincontroller_testcode… 

    …_disable

* 테스트코드 에노테이션 생략
    @gunsight1
    gunsight1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    9597d2a View commit details
    Browse the repository at this point in the history

  7. setting: querydsl 기본 세팅

    @linglong67
    linglong67 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    d1f7e1b View commit details
    Browse the repository at this point in the history

  8. feat: querydsl 적용을 위한 repo 변경 및 추가 (리뷰)

    @linglong67
    linglong67 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    d5a5b39 View commit details
    Browse the repository at this point in the history

  9. feat: querydsl 적용을 위한 코드 변경 및 추가 (리뷰)

    @linglong67
    linglong67 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    5b8e31b View commit details
    Browse the repository at this point in the history

  10. feat: cf> GlobalException 추가

    @linglong67
    linglong67 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    c3de00b View commit details
    Browse the repository at this point in the history

  11. * 깃허브 장애시(?) 발생 된 merge 코드 누락 조치

    gunsight1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    4f06edc View commit details
    Browse the repository at this point in the history

  12. Merge pull request #241 from gunsight1/hotfix_add_to_product_service_… 

    …missing_method

hotfix ::  product repository 코드 merge시 누락 된 메서드 추가
    @gunsight1
    gunsight1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    d3c91bf View commit details
    Browse the repository at this point in the history

  13. * 플랫폼 회원만 이용이 가능한 기능들에 대해 플랫폼 조건을 추가하였습니다.

    gunsight1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    b43762c View commit details
    Browse the repository at this point in the history

  14. * 프론트엔드 버셀서버명 변경

    gunsight1 committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    66205f4 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #243 from gunsight1/hotfix_config_frontend_cors_do… 

    …main

hotfix ::  프론트엔드 버셀서버명 변경
    @gunsight1
    gunsight1 authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    4574b21 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Merge pull request #242 from gunsight1/find_member_add_account_type_P… 

    …LATFORM

feature :: 계정 조회 관련 조건 추가
    @gunsight1
    gunsight1 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    eb02695 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #225 from cgk95/feat/#206 

    Feature : Admin 모듈 Brand CRUD 기능 추가
    @chan99k
    chan99k authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    878d819 View commit details
    Browse the repository at this point in the history

  3. feat: 파일명 변경 (~Domain -> ~Jpa, ~Custom -> ~dsl)

    @linglong67
    linglong67 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    ff44b50 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #245 from linglong67/feature/setting-querydsl 

    [feat] Querydsl 세팅 및 적용
    @linglong67
    linglong67 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    89c459c View commit details
    Browse the repository at this point in the history

  5. * 프론트엔드 버셀서버명 / 제거

    gunsight1 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    71826c7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #246 from gunsight1/hotfix_modified_frontend_origins 

    hotfix ::  프론트엔드 버셀서버명 / 제거
    @gunsight1
    gunsight1 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    ceb27ef View commit details
    Browse the repository at this point in the history

  7. * 프론트엔드 버셀서버 CORS 추가 

    (호출방식이 잘못된듯하며 프론트 코드 확인 필요)
    gunsight1 committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    7eeb13f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #247 from gunsight1/hotfix_modified_frontend_origins 

    hotfix :: 프론트엔드 버셀서버 CORS 추가
    @gunsight1
    gunsight1 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    2342840 View commit details
    Browse the repository at this point in the history