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

배포 전 여러가지 버그 수정 #794

Merged
merged 3 commits into from
Oct 19, 2023
Merged

배포 전 여러가지 버그 수정 #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e7ca5a
refactor: (#793) roles 변수명 수정 및 @JsonFormat 추가
tjdtls690 Oct 19, 2023
3bd05bc
refactor: (#793) GET /notices 요청은 필터 안거치도록 수정
tjdtls690 Oct 19, 2023
db61465
refactor: (#793) 댓글 작성 시 게시글 작성자에게 알림 추가하는 로직 버그 수정
tjdtls690 Oct 19, 2023
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
4 changes: 2 additions & 2 deletions backend/src/main/java/com/votogether/domain/alarm/controller/AlarmQueryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.votogether.domain.alarm.controller;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.response.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.alarm.service.AlarmQueryService;
import com.votogether.domain.member.entity.Member;
Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/java/com/votogether/domain/alarm/controller/AlarmQueryControllerDocs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.votogether.domain.alarm.controller;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.response.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.member.entity.Member;
import com.votogether.global.exception.ExceptionResponse;
Expand Down
2 changes: 1 addition & 1 deletion .../alarm/dto/ReportActionAlarmResponse.java → ...o/response/ReportActionAlarmResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.votogether.domain.alarm.dto;
package com.votogether.domain.alarm.dto.response;

import com.votogether.domain.alarm.entity.ReportActionAlarm;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
4 changes: 3 additions & 1 deletion ...omain/alarm/dto/ReportActionResponse.java → ...rm/dto/response/ReportActionResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.votogether.domain.alarm.dto;
package com.votogether.domain.alarm.dto.response;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.votogether.domain.alarm.entity.ReportActionAlarm;
import com.votogether.domain.report.entity.vo.ReportType;
import io.swagger.v3.oas.annotations.media.Schema;
Expand All @@ -23,6 +24,7 @@ public record ReportActionResponse(
Set<String> reasons,

@Schema(description = "신고조치시간", example = "2023-08-01 13:56")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
LocalDateTime createdAt
) {

Expand Down
4 changes: 2 additions & 2 deletions backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.votogether.domain.alarm.service;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.response.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.alarm.entity.Alarm;
import com.votogether.domain.alarm.entity.ReportActionAlarm;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/java/com/votogether/domain/member/dto/response/MemberInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public record MemberInfoResponse(
long voteCount,

@Schema(description = "권한", example = "MEMBER")
Roles roles,
Roles role,

@Schema(description = "최신 알림 존재 여부", example = "false")
boolean hasLatestAlarm
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/java/com/votogether/domain/post/service/PostCommentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private void publishAlarmEvent(final Member loginMember, final Post post) {
return;
}
final PostAlarmEvent postAlarmEvent = new PostAlarmEvent(
loginMember,
post.getWriter(),
post.getId(),
AlarmType.COMMENT,
post.getTitle()
Expand Down
3 changes: 2 additions & 1 deletion backend/src/main/java/com/votogether/global/jwt/JwtAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {

private static final Map<String, String> MATCH_URI_METHOD = new HashMap<>(
Map.ofEntries(
Map.entry("^/posts/.+/comments$", "GET")
Map.entry("^/posts/.+/comments$", "GET"),
Map.entry("^/notices/.*$", "GET")
)
);

Expand Down
4 changes: 2 additions & 2 deletions backend/src/test/java/com/votogether/domain/alarm/controller/AlarmQueryControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.BDDMockito.given;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.response.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmDetailResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.alarm.entity.ReportActionAlarm;
Expand Down
6 changes: 3 additions & 3 deletions backend/src/test/java/com/votogether/domain/alarm/service/AlarmQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.SoftAssertions.assertSoftly;

import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.ReportActionAlarmResponse;
import com.votogether.domain.alarm.dto.response.ReportActionResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmDetailResponse;
import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
import com.votogether.domain.alarm.entity.ReportActionAlarm;
Expand Down Expand Up @@ -61,7 +61,7 @@ void whenCreateComment() throws Exception {
Thread.sleep(1000);

// when
List<PostAlarmResponse> postAlarmResponses = alarmQueryService.getPostAlarm(commentWriter, 0);
List<PostAlarmResponse> postAlarmResponses = alarmQueryService.getPostAlarm(post.getWriter(), 0);

// then
PostAlarmResponse postAlarmResponse = postAlarmResponses.get(0);
Expand Down
Loading