Merge Main to Production-1 #540
Merged
Conversation
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
* 불용 코드 삭제 * 삭제사항을 테스트코드에 반영 * mongoose 를 ts로 전환 * 테스트코드 오류 수정
* @types/ioredis 설치 * utils/db/redis ts 전환 * redis 변경사항 반영
* findBrand 제거 * getBrandByIdx * brand search * findIngredient * readByName * readByIdx * search * KeywordDao * utils/converter * LikePerfumeDao * LikeReviewDao * NoteDao * ReviewDao * ReportsDao * 테스트코드 오류 수정
* GET - admin_perfume * Perfume 목록조회 개선 * 향료 목록조회 개선 * GET 향료 - edditing ingredientCategory * nodemon setUp * fixing error GET admin/ingreditents * code review 반영 * code review 반영 2 * code review 3 --------- Co-authored-by: Heesung Youn <heesung6701@naver.com> Co-authored-by: 조하담 <35447878+ChoHadam@users.noreply.github.com> Co-authored-by: Jinho Hyeon <neverlish@gmail.com>
* 필요 모듈 설치 * sequelize 선언 분리 * 모델 선언방식 개선 * sequelize-typescript로 테이블 선언 * babel 변경사항 반영 * dao 에 변경사항 반영 * app에 변경사항 반영 * test 에서 sequelize import 방식 변경 * 테스트오류 수정 * resolve issue * like test fix
* Perfume readPage 함수에 where 추가 * query에 따라 where 형성 * 향수 목록에 검색어 조건 추가 * 향수 검색에 필터 기능 추가 --------- Co-authored-by: Jinho Hyeon <neverlish@gmail.com>
dev -> main
* 불용 setter 삭제 * NoteService 분리 * LikePerfumeService 분리 * LikePerfume 관련 함수를 서비스로 분리
* controllers Keyword * KeywordService * controllers Review * LikeReviewDao
* converter * converter.spec * KeywordDao.spec * LikeReviewDao.spec
* 어드민 목록 함수에 findAndCountAll 적용 * readPage 함수에서 최신순 정렬 적용
* GET /admin/ingredientCategories * GET /admin/ingredientCategories * GET /admin/ingredientCategories * GET /admin/ingredientCategories
* 향료카테고리 추가 api * 불용 함수 제거
* ReportReviewDao * 테이블에 필요한 fk 필드 추가 * dao 타입 일부 수정 * converter 반환타입 수정 * ReviewService * LikeReviewService 분리 * LikeReviewService.read * ImageService * getPerfumeThumbKeywordConverter * readAllOfPerfume
dev -> main
* 라이브러리 설치 * Perfume 모델의 일부 테이블 변경 * opensearch client 추가 * isLikeJob 함수타입 개선 * requestPerfumeSearch 추가 * SearchService 추가 * PerfumeService 에 신규코드 적용 * dto, request에 nullable 로 정의 * controller에 신규 코드 적용 * 불용 코드 제거 * package-lock.json * 검색엔진 요청 함수 타입강화 * 테스트코드에 변경사항 반영 * 불용 테스트코드 제거 * 검색엔진 문서 갱신 cron 추가
dev -> main
* 환경, 배포 관련 문서 추가 * 최상위에서 접근경로 추가
This reverts commit 165ca87.
This reverts commit 91155d3.
* GET perfume_add englishName * Fixing GET admin/perfumes by adding englishName
* admin-imgUrl * POST admin/ingredient - create ingredient
* admin-imgUrl * POST admin/ingredient - create ingredient * perfume-addImage
upgrade android min version
* Update prebuild.sh * Update reload.sh * Create deploy file to test with Github Hosted Runner * Update deploy-development.yml using github-hosted runner and SSH * Rollback branch name to push * Remove workflow file for testing
…535) * Rollback deploy file to test with Github Hosted Runner * Update branch name to push * Add step to check default github workspace path * Add path option for actions/checkout * Delete unnecessary code * Use bash instead of sh * Get the latest changes from the branch * Manage branch name with environment variable * Use '&&' to ensure each step runs successfully * Write branch name directly * Fetch all branches from remote repository * Update reload.sh to delete duplicate code and clarify roles * Remove git reset and leave only git pull * Reflect the changes so far in deployment-development.yml * Delete the file for testing using Github Hosted Runner * Delete code for checking github workspace path * Reflect the changes so far in deployment-production-1.yml * Reflect the changes so far in deployment-production-2.yml * Reflect the changes so far in deployment-production.yml
Merge dev into main
* Use async-await instead of chaining, Add type declarations * Fix issue by adding 'raw: true, nest: true' options
Merge dev into main
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why:
To keep production-1 branch up to date.
What's being changed:
package.json 수정
환경, 배포 관련 문서 추가
어드민 페이지 작업
/system/supportable엔드포인트 API 수정Android
1.5.2이상부터 true 반환되도록 수정CI/CD 성능 개선 작업
코드 정리