From 4e0e850b0984013be40fc793adebfc2c941930e0 Mon Sep 17 00:00:00 2001 From: dorkem <20233144@gs.cwnu.ac.kr> Date: Wed, 4 Jun 2025 20:18:55 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20README=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index a9dae023b..aa3bcf5b6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ## 링크 -- [🍑 ν”„λ‘œμ νŠΈ μ‚¬μ΄νŠΈ](http://issue-tracker.online) +- [🍑 ν”„λ‘œμ νŠΈ μ‚¬μ΄νŠΈ](https://www.issue-tracker.online) - [πŸˆβ€β¬› Github 링크](https://github.com/codesquad-masters2025-team05/issue-tracker.git) - [πŸ«† Jira 링크](https://jqk1797.atlassian.net/jira/software/projects/CS/summary?atlOrigin=eyJpIjoiZWNkM2RjNjUyMmJlNDcyMjkwYjFhNTAxOGViMDk1NTciLCJwIjoiaiJ9) - [πŸ“– Notion 링크](https://flowery-unicorn-313.notion.site/CodeSquard-team05-1909003424f180438a2dd668361f3bf4?pvs=4) @@ -34,30 +34,12 @@ main ← μ΅œμ’… 배포 브랜치 - MySQL - JDBC - GitHub Actions (CI/CD) -- AWS EC2, RDS +- AWS EC2, RDS, S3 - Ngnix -### πŸ“ ν”„λ‘œμ νŠΈ ꡬ쑰 +### πŸ“ μ‹œμŠ€ν…œ μ•„ν‚€ν…μ²˜ -```aiignore -src/ -└── main/ - β”œβ”€β”€ java/ - β”‚ └── com.team5.issue_tracker/ - β”‚ β”œβ”€β”€ common/ # 곡톡 μœ ν‹Έ, μ˜ˆμ™Έ, 응닡 처리 λ“± - β”‚ β”‚ - β”‚ β”œβ”€β”€ issue/ # 이슈 κ΄€λ ¨ λͺ¨λ“ˆ - β”‚ β”‚ - β”‚ β”œβ”€β”€ label/ - β”‚ β”‚ - β”‚ β”œβ”€β”€ milestone/ # λ§ˆμΌμŠ€ν†€ κ΄€λ ¨ λͺ¨λ“ˆ - β”‚ β”‚ - β”‚ └── user/ # μ‚¬μš©μž κ΄€λ ¨ λͺ¨λ“ˆ - β”‚ - └── resources/ - β”œβ”€β”€ application.yml # μ„€μ • 파일 - └── schema.sql # 데이터 베이슀 -``` +![Image](https://github.com/user-attachments/assets/0c016136-279c-4937-9a52-4d660fd0b93c) --- @@ -108,4 +90,4 @@ src/ ``` ---- \ No newline at end of file +--- From ccd20734693b52ae9396a7ce53786b7f1f018d24 Mon Sep 17 00:00:00 2001 From: dorkem <20233144@gs.cwnu.ac.kr> Date: Wed, 4 Jun 2025 20:19:06 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EC=BB=A4=EB=A9=98=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue_tracker/comment/service/CommentService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/com/team5/issue_tracker/comment/service/CommentService.java b/backend/src/main/java/com/team5/issue_tracker/comment/service/CommentService.java index d6a385561..0fa7d8e42 100644 --- a/backend/src/main/java/com/team5/issue_tracker/comment/service/CommentService.java +++ b/backend/src/main/java/com/team5/issue_tracker/comment/service/CommentService.java @@ -33,13 +33,13 @@ public Long addComment(Long issueId, CommentRequest request, Long userId) { public void editComment(Long commentId, CommentRequest updateCommentRequest, Long userId) { validateUserExists(userId); - if(!commentId.equals(userId)){ - throw new NotFoundException(ErrorCode.COMMENT_NOT_FOUND); - } - Comment comment = commentRepository.findById(commentId) .orElseThrow(() -> new NotFoundException(ErrorCode.COMMENT_NOT_FOUND)); + if(!comment.getUserId().equals(userId)){ + throw new NotFoundException(ErrorCode.USER_NOT_FOUND); + } + comment.setContent(updateCommentRequest.getContent()); comment.setUpdatedAt(Instant.now()); commentRepository.save(comment); From 2f254dfd1e3fc8cc9cced1ce170b118269f8a724 Mon Sep 17 00:00:00 2001 From: dorkem <20233144@gs.cwnu.ac.kr> Date: Thu, 5 Jun 2025 11:34:05 +0900 Subject: [PATCH 3/5] =?UTF-8?q?docs:=20README=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa3bcf5b6..36286e710 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ - [🍑 ν”„λ‘œμ νŠΈ μ‚¬μ΄νŠΈ](https://www.issue-tracker.online) - [πŸˆβ€β¬› Github 링크](https://github.com/codesquad-masters2025-team05/issue-tracker.git) -- [πŸ«† Jira 링크](https://jqk1797.atlassian.net/jira/software/projects/CS/summary?atlOrigin=eyJpIjoiZWNkM2RjNjUyMmJlNDcyMjkwYjFhNTAxOGViMDk1NTciLCJwIjoiaiJ9) - [πŸ“– Notion 링크](https://flowery-unicorn-313.notion.site/CodeSquard-team05-1909003424f180438a2dd668361f3bf4?pvs=4) ## 브랜치 ꡬ쑰 @@ -39,9 +38,12 @@ main ← μ΅œμ’… 배포 브랜치 ### πŸ“ μ‹œμŠ€ν…œ μ•„ν‚€ν…μ²˜ -![Image](https://github.com/user-attachments/assets/0c016136-279c-4937-9a52-4d660fd0b93c) + +### 🍎 ERD + + --- ## πŸ§‘β€πŸ’» ν”„λ‘ νŠΈμ—”λ“œ From 3f6aeb01c71160b942fe88fe34e22877871dc3ab Mon Sep 17 00:00:00 2001 From: 2jiyong Date: Thu, 5 Jun 2025 12:22:21 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20!=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/team5/issue_tracker/issue/service/IssueService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java b/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java index 55784fdea..f016bdf27 100644 --- a/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java +++ b/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java @@ -204,7 +204,7 @@ private void validateUserOwnsIssue(Long userId, Long issueId) { validateIssueExists(issueId); validateUserExists(userId); - if (issueId.equals(userId)) { + if (!issueId.equals(userId)) { throw new NotFoundException(ErrorCode.ISSUE_NOT_FOUND); } } From ac21d76b5c95e10ff6d39d97575e6649a8cec86e Mon Sep 17 00:00:00 2001 From: 2jiyong Date: Thu, 5 Jun 2025 12:28:08 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EC=9D=B4=EC=8A=88=EC=9D=98=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=20id=EC=99=80=20userId=20=EB=B9=84=EA=B5=90?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/team5/issue_tracker/issue/service/IssueService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java b/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java index f016bdf27..70bcc7055 100644 --- a/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java +++ b/backend/src/main/java/com/team5/issue_tracker/issue/service/IssueService.java @@ -203,8 +203,9 @@ private void validateUserExists(Long userId) { private void validateUserOwnsIssue(Long userId, Long issueId) { validateIssueExists(issueId); validateUserExists(userId); + Issue issue = issueRepository.findById(issueId).get(); - if (!issueId.equals(userId)) { + if (!issue.getUserId().equals(userId)) { throw new NotFoundException(ErrorCode.ISSUE_NOT_FOUND); } }