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

버그 수정 및 api url 수정 #70

Merged
merged 22 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
670f303
Merge pull request #40 from Murakano/dev
jjikky Jul 7, 2024
fdd5a53
Merge pull request #41 from Murakano/dev
jjikky Jul 7, 2024
41d52d0
Merge pull request #43 from Murakano/dev
jjikky Jul 8, 2024
0ce492d
Merge pull request #44 from Murakano/dev
jjikky Jul 8, 2024
b7c4ead
Merge pull request #45 from Murakano/dev
jjikky Jul 8, 2024
bb9deef
Merge pull request #50 from Murakano/dev
sen2y Jul 10, 2024
7692bb6
Merge pull request #51 from Murakano/dev
jjikky Jul 10, 2024
3dfb7df
Merge pull request #52 from Murakano/dev
jjikky Jul 10, 2024
5bd58a3
💬 todo추가
grulla99 Jul 13, 2024
d62ba94
Merge pull request #56 from Murakano/dev
jjikky Jul 13, 2024
f7a27a2
Merge remote-tracking branch 'origin/dev' into feature/requests
grulla99 Jul 14, 2024
7413521
Merge pull request #60 from Murakano/dev
jjikky Jul 14, 2024
0d6edb8
Merge pull request #62 from Murakano/dev
jjikky Jul 15, 2024
9f9be33
Merge remote-tracking branch 'origin/dev' into feature/requests
grulla99 Jul 15, 2024
0bea2c5
Merge pull request #64 from Murakano/dev
jjikky Jul 15, 2024
a393a50
Merge pull request #66 from Murakano/dev
jjikky Jul 15, 2024
61dbd8f
Merge pull request #68 from Murakano/dev
jjikky Jul 16, 2024
9844de8
🐛 불필요한 코드 삭제 및 단어 업데이트 버그 수정
grulla99 Jul 17, 2024
20235d0
💄 api url 표기법 수정
grulla99 Jul 17, 2024
51162b4
Merge remote-tracking branch 'origin' into feature/requests
grulla99 Jul 17, 2024
c368395
💄 api url 수정 사항 적용
grulla99 Jul 17, 2024
e7f50f6
🐛 오타 수정
grulla99 Jul 17, 2024
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
2 changes: 1 addition & 1 deletion src/routes/user/user.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ exports.updateRequest = async (requestId, formData) => {
exports.updateRequestState = async (userId, requestId, status, formData, requestType) => {
if (userId) {
await userRepository.updateRequestState(userId, requestId, status, formData);
if (requestType === 'add') {
if (requestType === 'add') { //TODO: add 일 때, 단어 중복검사 로직 우선적 검증 추가
await wordRepository.addWord(requestId, formData);
await userRepository.updateRequest(requestId, formData); //수정값 사용자 요청 업데이트
} else if (requestType === 'mod') {
Expand Down
1 change: 1 addition & 0 deletions src/routes/word/word.repository.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ exports.updateWord = async (requestId, formData) => {
}

// word 데이터를 request 데이터로 업데이트합니다.
wordToUpdate.word = formData.devTerm;
wordToUpdate.awkPron = formData.awkPron;
wordToUpdate.comPron = formData.commonPron;
wordToUpdate.info = formData.addInfo;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/word/word.route.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ wordRouter.get('/search/related', getRelatedWords);
wordRouter.post('/search/:searchTerm', isUser, getSearchWords);

//등록요청 단어 중복검사
wordRouter.post('/checkDuplicateWord', checkDuplicateWord);
wordRouter.post('/duplicate', checkDuplicateWord);


module.exports = wordRouter;
2 changes: 1 addition & 1 deletion src/swagger/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

/**
* @swagger
* /words/checkDuplicateWord:
* /words/duplicate:
* post:
* summary: 개발 용어 중복 검사
* tags: [개발 용어 API]
Expand Down
2 changes: 1 addition & 1 deletion src/swagger/swagger.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const options = {
description: 'Local Development',
},
{
url: 'https://api.surakano.site/',
url: 'https://api.murakano.site/',
description: 'Real Server',
},
],
Expand Down