Skip to content

Commit f16c7fb

Browse files
committed
Merge branch 'main' of https://github.com/prgrms-web-devcourse-final-project/WEB1_1_Bongdari_BE into bug/152-community-paging
# Conflicts: # src/main/java/com/somemore/community/repository/board/CommunityBoardRepositoryImpl.java # src/main/java/com/somemore/community/repository/comment/CommunityCommentRepositoryImpl.java # src/test/java/com/somemore/community/service/board/CommunityBoardQueryServiceTest.java
2 parents dfab909 + 2b4eb7a commit f16c7fb

File tree

74 files changed

+1855
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1855
-106
lines changed

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ def jacocoExcludePatterns = [
121121
'**/fixture/*',
122122
'**/controller/**',
123123
'**/fixture/*',
124-
'**/*Factory*'
124+
'**/*Factory*',
125+
'**/event/**'
125126
]
126127

127128
def jacocoExcludePatternsForVerify = [
@@ -139,7 +140,8 @@ def jacocoExcludePatternsForVerify = [
139140
'*.fixture.*',
140141
'*.controller.*',
141142
'*.fixture.*',
142-
'*.*Factory*'
143+
'*.*Factory*',
144+
'*.*event*.*'
143145
]
144146

145147
jacocoTestReport {

src/main/java/com/somemore/auth/cookie/CookieService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ public void deleteAccessToken(HttpServletResponse response) {
2828

2929
private static ResponseCookie generateCookie(TokenType tokenType, String value) {
3030
return ResponseCookie.from(TokenType.ACCESS.name(), value) // 덮어쓰기 위해서 고정 값
31+
.domain(".somemore.site")
3132
.httpOnly(true)
3233
.secure(true)
3334
.path("/")
3435
.maxAge(tokenType.getPeriodInSeconds())
35-
.sameSite("Lax")
36+
.sameSite("None")
3637
.build();
3738
}
3839
}

src/main/java/com/somemore/center/domain/Center.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.somemore.center.domain;
22

33
import com.somemore.center.dto.request.CenterProfileUpdateRequestDto;
4-
import com.somemore.global.common.BaseEntity;
4+
import com.somemore.global.common.entity.BaseEntity;
55
import jakarta.persistence.*;
66
import lombok.*;
77

src/main/java/com/somemore/community/domain/CommunityBoard.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.somemore.community.domain;
22

33
import com.somemore.community.dto.request.CommunityBoardUpdateRequestDto;
4-
import com.somemore.global.common.BaseEntity;
4+
import com.somemore.global.common.entity.BaseEntity;
55
import static lombok.AccessLevel.PROTECTED;
66

77
import jakarta.persistence.Column;

src/main/java/com/somemore/community/domain/CommunityComment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.somemore.community.domain;
22

33
import com.somemore.community.dto.request.CommunityCommentUpdateRequestDto;
4-
import com.somemore.global.common.BaseEntity;
4+
import com.somemore.global.common.entity.BaseEntity;
55
import jakarta.persistence.*;
66
import lombok.Builder;
77
import lombok.Getter;

src/main/java/com/somemore/domains/Notification.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/java/com/somemore/global/common/BaseEntity.java renamed to src/main/java/com/somemore/global/common/entity/BaseEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.somemore.global.common;
1+
package com.somemore.global.common.entity;
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.EntityListeners;
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.somemore.global.common.event;
2+
3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import lombok.Getter;
5+
import lombok.experimental.SuperBuilder;
6+
7+
import java.time.LocalDateTime;
8+
9+
@Getter
10+
@SuperBuilder
11+
public abstract class ServerEvent<T extends Enum<T>> {
12+
13+
@JsonProperty("type")
14+
private final ServerEventType type;
15+
16+
@JsonProperty("subType")
17+
private final T subType;
18+
19+
@JsonProperty("createdAt")
20+
private final LocalDateTime createdAt;
21+
22+
protected ServerEvent(
23+
@JsonProperty("type") ServerEventType type,
24+
@JsonProperty("subType") T subType,
25+
@JsonProperty("createdAt") LocalDateTime createdAt
26+
) {
27+
this.type = type;
28+
this.subType = subType;
29+
this.createdAt = (createdAt == null) ? LocalDateTime.now() : createdAt;
30+
}
31+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.somemore.global.common.event;
2+
3+
public interface ServerEventPublisher {
4+
5+
<T extends Enum<T>> void publish(ServerEvent<T> event);
6+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.somemore.global.common.event;
2+
3+
import com.somemore.notification.domain.NotificationSubType;
4+
import lombok.Getter;
5+
import lombok.RequiredArgsConstructor;
6+
7+
import java.util.Arrays;
8+
9+
@RequiredArgsConstructor
10+
@Getter
11+
public enum ServerEventType {
12+
NOTIFICATION(NotificationSubType.class);
13+
14+
private final Class<? extends Enum<?>> subtype;
15+
16+
public static ServerEventType from(String value) {
17+
return Arrays.stream(ServerEventType.values())
18+
.filter(type -> type.name().equalsIgnoreCase(value))
19+
.findFirst()
20+
.orElseThrow(() -> new IllegalArgumentException("잘못된 이벤트 타입입니다: " + value));
21+
}
22+
}

0 commit comments

Comments
 (0)