-
Notifications
You must be signed in to change notification settings - Fork 0
[Release] V2.0.0 제휴지도 배포 #209
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
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
c10eb58
feat: 다양한 도메인 및 서비스에 대한 기능 추가 및 수정 (#170)
jayn2u e80915c
fix: 리뷰v2 0601 수정사항 (#171)
JjungminLee 60ca341
Merge pull request #175 from EAT-SSU/hotfix/deploy-fail
jayn2u aa890b4
Merge pull request #178 from EAT-SSU/feat/add-ai-rules
jayn2u 1e37c69
feat: 테스트 코드 구조 개선 및 OAuthService 테스트 케이스 추가 (#177)
jayn2u b6f100f
feat: 금지된 닉네임 목록에 추가 항목 추가 (#179)
jayn2u 5aa2d69
feat: Gemini 설정 및 스타일 가이드 문서 추가 (#181)
jayn2u b54c983
feat: Review 엔티티 필드 및 메서드 정리 (#180)
jayn2u f615842
feat: eatssu scheme에 따른 코드 재정렬 (#185)
JjungminLee b6a5e39
hotfix: 토큰 401에러 확인을 위한 토큰 시간 조정 핫픽스
JjungminLee 2b2eeb6
hotfix: jwt 유효시간 원복
JjungminLee 6faa045
feat: 250626 리뷰v2수정요청사항 (#189)
JjungminLee 386a7c5
feat: 제휴지도250702수정 (#192)
JjungminLee 616c3e2
fix: 만료 토큰 403 코드로 반환 (#193)
JjungminLee e1c9c83
fix: 시큐리티 필터에서도 슬랙 알림 보낼 수 있게 수정 (#195)
JjungminLee d3439b8
hotfix: 불필요한 로그 삭제 및 슬랙 알림 제거
JjungminLee 013faae
feat: .env 파일 사용 (#196)
jayn2u 187cc78
feat: dev 슬랙봇 알림 제거 (#205)
JjungminLee 66fa2df
feat: 식단 추가 api에 FACULTY enum추가 (#206)
JjungminLee da21202
feat: 제휴지도 250710요청사항 (#207)
JjungminLee e0ac8b8
fix: Java Toolchain 설정 추가 (Java 17) (#198)
jayn2u 1c47c23
hotfix: 토큰 재발급 시간 수정
JjungminLee 1b15a34
feat: 토큰 만료시 401로 반환하게끔 수정
JjungminLee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,27 @@ | ||
| --- | ||
| description: | ||
| globs: | ||
| alwaysApply: true | ||
| --- | ||
| # Copilot instructions | ||
|
|
||
| - You must respond in Korean for all answers, regardless of the input language. | ||
| - Do not write any comments in code blocks, even if asked to do so. | ||
| - Do not use wildcard when importing libraries | ||
| - When you write reviews for pull request, specific review will very helpful for my team. | ||
| - Suggest based on logical reasons. | ||
|
|
||
| ## Commenting Convention | ||
|
|
||
| - Comments should be written in a single line whenever possible. | ||
| - Each comment must include the author's name and the date. | ||
| - Use IntelliJ's default `FIX ME` comment format. | ||
| - Use this for parts of the code where there may be a potential issue but immediate exception handling is unnecessary. | ||
| - Also use this for parts that are not yet finalized due to unclear business requirements. | ||
|
|
||
| ## Test Code Convention | ||
|
|
||
| - Test method names must be written in **English**. | ||
| - But if the codes is related to test, write the comment for "given, when, then". | ||
|
|
||
| Please follow these conventions when reviewing or suggesting changes to the code. |
This file contains hidden or 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,10 @@ | ||
| have_fun: true | ||
| code_review: | ||
| disable: false | ||
| comment_severity_threshold: MEDIUM | ||
| max_review_comments: -1 | ||
| pull_request_opened: | ||
| help: false | ||
| summary: true | ||
| code_review: true | ||
| ignore_patterns: [] |
This file contains hidden or 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,14 @@ | ||
| - You must respond in Korean for all answers, regardless of the input language. | ||
| - Do not write any comments in code blocks, even if asked to do so. | ||
| - Do not use wildcard when importing libraries | ||
| - When you write reviews for pull request, specific review will very helpful for my team. | ||
| - Suggest based on logical reasons. | ||
|
|
||
| - Comments should be written in a single line whenever possible. | ||
| - Each comment must include the author's name and the date. | ||
| - Use IntelliJ's default `FIX ME` comment format. | ||
| - Use this for parts of the code where there may be a potential issue but immediate exception handling is unnecessary. | ||
| - Also use this for parts that are not yet finalized due to unclear business requirements. | ||
|
|
||
| - Test method names must be written in **English**. | ||
| - But if the codes is related to test, write the comment for "given, when, then". |
This file contains hidden or 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,22 @@ | ||
| # Copilot instructions | ||
|
|
||
| - You must respond in Korean for all answers, regardless of the input language. | ||
| - Do not write any comments in code blocks, even if asked to do so. | ||
| - Do not use wildcard when importing libraries | ||
| - When you write reviews for pull request, specific review will very helpful for my team. | ||
| - Suggest based on logical reasons. | ||
|
|
||
| ## Commenting Convention | ||
|
|
||
| - Comments should be written in a single line whenever possible. | ||
| - Each comment must include the author's name and the date. | ||
| - Use IntelliJ's default `FIX ME` comment format. | ||
| - Use this for parts of the code where there may be a potential issue but immediate exception handling is unnecessary. | ||
| - Also use this for parts that are not yet finalized due to unclear business requirements. | ||
|
|
||
| ## Test Code Convention | ||
|
|
||
| - Test method names must be written in **English**. | ||
| - But if the codes is related to test, write the comment for "given, when, then". | ||
|
|
||
| Please follow these conventions when reviewing or suggesting changes to the code. |
This file contains hidden or 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 hidden or 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,22 @@ | ||
| # Copilot instructions | ||
|
|
||
| - You must respond in Korean for all answers, regardless of the input language. | ||
| - Do not write any comments in code blocks, even if asked to do so. | ||
| - Do not use wildcard when importing libraries | ||
| - When you write reviews for pull request, specific review will very helpful for my team. | ||
| - Suggest based on logical reasons. | ||
|
|
||
| ## Commenting Convention | ||
|
|
||
| - Comments should be written in a single line whenever possible. | ||
| - Each comment must include the author's name and the date. | ||
| - Use IntelliJ's default `FIX ME` comment format. | ||
| - Use this for parts of the code where there may be a potential issue but immediate exception handling is unnecessary. | ||
| - Also use this for parts that are not yet finalized due to unclear business requirements. | ||
|
|
||
| ## Test Code Convention | ||
|
|
||
| - Test method names must be written in **English**. | ||
| - But if the codes is related to test, write the comment for "given, when, then". | ||
|
|
||
| Please follow these conventions when reviewing or suggesting changes to the code. |
This file contains hidden or 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,22 @@ | ||
| # Copilot instructions | ||
|
|
||
| - You must respond in Korean for all answers, regardless of the input language. | ||
| - Do not write any comments in code blocks, even if asked to do so. | ||
| - Do not use wildcard when importing libraries | ||
| - When you write reviews for pull request, specific review will very helpful for my team. | ||
| - Suggest based on logical reasons. | ||
|
|
||
| ## Commenting Convention | ||
|
|
||
| - Comments should be written in a single line whenever possible. | ||
| - Each comment must include the author's name and the date. | ||
| - Use IntelliJ's default `FIX ME` comment format. | ||
| - Use this for parts of the code where there may be a potential issue but immediate exception handling is unnecessary. | ||
| - Also use this for parts that are not yet finalized due to unclear business requirements. | ||
|
|
||
| ## Test Code Convention | ||
|
|
||
| - Test method names must be written in **English**. | ||
| - But if the codes is related to test, write the comment for "given, when, then". | ||
|
|
||
| Please follow these conventions when reviewing or suggesting changes to the code. |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,5 +1,6 @@ | ||
| package ssu.eatssu.domain.admin.controller; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Controller; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
|
|
@@ -10,8 +11,6 @@ | |
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
| import org.springframework.web.bind.annotation.ResponseBody; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import ssu.eatssu.domain.admin.dto.MenuBoards; | ||
| import ssu.eatssu.domain.admin.dto.RegisterFixMenuRequest; | ||
| import ssu.eatssu.domain.admin.dto.UpdateFixMenuRequest; | ||
|
|
@@ -24,42 +23,42 @@ | |
| @RequiredArgsConstructor | ||
| public class ManageFixMenuController { | ||
|
|
||
| private final ManageFixMenuService manageFixMenuService; | ||
| private final ManageFixMenuService manageFixMenuService; | ||
|
|
||
| @ResponseBody | ||
| @GetMapping("") | ||
| public BaseResponse<MenuBoards> fixMenuPage() { | ||
| MenuBoards menuBoards = manageFixMenuService.getMenuBoards(); | ||
| return BaseResponse.success(menuBoards); | ||
| } | ||
| @ResponseBody | ||
| @GetMapping("") | ||
| public BaseResponse<MenuBoards> fixMenuPage() { | ||
| MenuBoards menuBoards = manageFixMenuService.getMenuBoards(); | ||
| return BaseResponse.success(menuBoards); | ||
| } | ||
|
|
||
| @ResponseBody | ||
| @PostMapping("") | ||
| public BaseResponse register(@RequestParam Restaurant restaurant, | ||
| @RequestBody RegisterFixMenuRequest request) { | ||
| manageFixMenuService.register(restaurant, request); | ||
| return BaseResponse.success(); | ||
| } | ||
| @ResponseBody | ||
| @PostMapping("") | ||
| public BaseResponse register(@RequestParam Restaurant restaurant, | ||
| @RequestBody RegisterFixMenuRequest request) { | ||
| manageFixMenuService.register(restaurant, request); | ||
| return BaseResponse.success(); | ||
| } | ||
|
|
||
| @ResponseBody | ||
| @PatchMapping("/{menuId}") | ||
| public BaseResponse update(@PathVariable Long menuId, | ||
| @RequestBody UpdateFixMenuRequest request) { | ||
| manageFixMenuService.updateMenu(menuId, request); | ||
| return BaseResponse.success(); | ||
| } | ||
| @ResponseBody | ||
| @PatchMapping("/{menuId}") | ||
| public BaseResponse update(@PathVariable Long menuId, | ||
| @RequestBody UpdateFixMenuRequest request) { | ||
| manageFixMenuService.updateMenu(menuId, request); | ||
| return BaseResponse.success(); | ||
| } | ||
|
|
||
| @ResponseBody | ||
| @DeleteMapping("/{menuId}") | ||
| public BaseResponse delete(@PathVariable Long menuId) { | ||
| manageFixMenuService.delete(menuId); | ||
| return BaseResponse.success(); | ||
| } | ||
| @ResponseBody | ||
| @DeleteMapping("/{menuId}") | ||
| public BaseResponse delete(@PathVariable Long menuId) { | ||
| manageFixMenuService.delete(menuId); | ||
| return BaseResponse.success(); | ||
| } | ||
|
|
||
| @ResponseBody | ||
| @PatchMapping("/{menuId}/discontinued-status") | ||
| public BaseResponse<Boolean> toggleDiscontinuedStatus(@PathVariable Long menuId) { | ||
| return BaseResponse.success(manageFixMenuService.changeDiscontinuedStatus(menuId)); | ||
| } | ||
| @ResponseBody | ||
| @PatchMapping("/{menuId}/discontinued-status") | ||
| public BaseResponse<Boolean> toggleDiscontinuedStatus(@PathVariable Long menuId) { | ||
| return BaseResponse.success(manageFixMenuService.changeDiscontinuedStatus(menuId)); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
들여쓰기 변경이 있습니다. 확인해주세요.