Skip to content

Commit f6732fb

Browse files
seungwookc97seungwookc97
authored
Merge pull request #161 from prgrms-web-devcourse-final-project/refactor#152
[refactor] 쿠키 설정 완료, AWS S3 테라폼 설정 #152 #156
2 parents dd7f9e5 + df42119 commit f6732fb

File tree

23 files changed

+186
-137
lines changed

23 files changed

+186
-137
lines changed

‎build.gradle.kts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,20 @@ dependencies {
4848
implementation("org.springframework.boot:spring-boot-starter-data-redis")
4949
implementation("org.springframework.session:spring-session-data-redis")
5050

51+
// AWS S3
52+
implementation("io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.0")
53+
5154
runtimeOnly("com.h2database:h2")
5255
runtimeOnly("com.mysql:mysql-connector-j")
5356

5457
annotationProcessor("org.projectlombok:lombok")
5558

59+
//json
60+
implementation("io.jsonwebtoken:jjwt-api:0.11.5")
61+
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
62+
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")
63+
// json 파싱용
64+
5665
//Spring AI
5766
implementation(platform("org.springframework.ai:spring-ai-bom:1.0.0-M4"))
5867

‎cookies.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Netscape HTTP Cookie File
2+
# https://curl.se/docs/http-cookies.html
3+
# This file was generated by libcurl! Edit at your own risk.
4+

‎src/main/java/com/back/domain/cocktail/comment/entity/CocktailComment.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
@Entity
1818
@Getter
19-
@Table(name = "cocktailcomment")
2019
@EntityListeners(AuditingEntityListener.class)
2120
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
2221
@AllArgsConstructor

‎src/main/java/com/back/domain/post/category/entity/Category.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
package com.back.domain.post.category.entity;
22

3-
import jakarta.persistence.Column;
4-
import jakarta.persistence.Entity;
5-
import jakarta.persistence.EntityListeners;
6-
import jakarta.persistence.GeneratedValue;
7-
import jakarta.persistence.GenerationType;
8-
import jakarta.persistence.Id;
9-
import jakarta.persistence.Table;
10-
import lombok.AllArgsConstructor;
11-
import lombok.Builder;
12-
import lombok.Getter;
13-
import lombok.NoArgsConstructor;
14-
import lombok.Setter;
3+
import jakarta.persistence.*;
4+
import lombok.*;
155
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
166

177
@Entity
188
@Getter
199
@Setter
20-
@Table(name = "category")
2110
@EntityListeners(AuditingEntityListener.class)
2211
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
2312
@AllArgsConstructor

‎src/main/java/com/back/domain/post/comment/entity/Comment.java‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,8 @@
22

33
import com.back.domain.post.comment.enums.CommentStatus;
44
import com.back.domain.post.post.entity.Post;
5-
import com.back.domain.post.post.enums.PostStatus;
65
import com.back.domain.user.entity.User;
7-
import jakarta.persistence.Column;
8-
import jakarta.persistence.Entity;
9-
import jakarta.persistence.EntityListeners;
10-
import jakarta.persistence.EnumType;
11-
import jakarta.persistence.Enumerated;
12-
import jakarta.persistence.FetchType;
13-
import jakarta.persistence.GeneratedValue;
14-
import jakarta.persistence.GenerationType;
15-
import jakarta.persistence.Id;
16-
import jakarta.persistence.JoinColumn;
17-
import jakarta.persistence.ManyToOne;
18-
import jakarta.persistence.Table;
19-
import java.time.LocalDateTime;
6+
import jakarta.persistence.*;
207
import lombok.AllArgsConstructor;
218
import lombok.Builder;
229
import lombok.Getter;
@@ -25,9 +12,10 @@
2512
import org.springframework.data.annotation.LastModifiedDate;
2613
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
2714

15+
import java.time.LocalDateTime;
16+
2817
@Entity
2918
@Getter
30-
@Table(name = "comment")
3119
@EntityListeners(AuditingEntityListener.class)
3220
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
3321
@AllArgsConstructor

‎src/main/java/com/back/domain/post/post/entity/Post.java‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,7 @@
33
import com.back.domain.post.category.entity.Category;
44
import com.back.domain.post.post.enums.PostStatus;
55
import com.back.domain.user.entity.User;
6-
import jakarta.persistence.CascadeType;
7-
import jakarta.persistence.Column;
8-
import jakarta.persistence.Entity;
9-
import jakarta.persistence.EntityListeners;
10-
import jakarta.persistence.EnumType;
11-
import jakarta.persistence.Enumerated;
12-
import jakarta.persistence.FetchType;
13-
import jakarta.persistence.GeneratedValue;
14-
import jakarta.persistence.GenerationType;
15-
import jakarta.persistence.Id;
16-
import jakarta.persistence.JoinColumn;
17-
import jakarta.persistence.ManyToOne;
18-
import jakarta.persistence.OneToMany;
19-
import jakarta.persistence.Table;
20-
import java.time.LocalDateTime;
21-
import java.util.ArrayList;
22-
import java.util.List;
6+
import jakarta.persistence.*;
237
import lombok.AllArgsConstructor;
248
import lombok.Builder;
259
import lombok.Getter;
@@ -28,9 +12,12 @@
2812
import org.springframework.data.annotation.LastModifiedDate;
2913
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
3014

15+
import java.time.LocalDateTime;
16+
import java.util.ArrayList;
17+
import java.util.List;
18+
3119
@Entity
3220
@Getter
33-
@Table(name = "post")
3421
@EntityListeners(AuditingEntityListener.class)
3522
@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
3623
@AllArgsConstructor

‎src/main/java/com/back/domain/post/post/entity/PostLike.java‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,17 @@
22

33
import com.back.domain.post.post.enums.PostLikeStatus;
44
import com.back.domain.user.entity.User;
5-
import jakarta.persistence.Column;
6-
import jakarta.persistence.Entity;
7-
import jakarta.persistence.EntityListeners;
8-
import jakarta.persistence.EnumType;
9-
import jakarta.persistence.Enumerated;
10-
import jakarta.persistence.FetchType;
11-
import jakarta.persistence.GeneratedValue;
12-
import jakarta.persistence.GenerationType;
13-
import jakarta.persistence.Id;
14-
import jakarta.persistence.JoinColumn;
15-
import jakarta.persistence.ManyToOne;
16-
import jakarta.persistence.Table;
17-
import jakarta.persistence.UniqueConstraint;
18-
import java.time.LocalDateTime;
19-
import lombok.AccessLevel;
20-
import lombok.AllArgsConstructor;
21-
import lombok.Builder;
22-
import lombok.Getter;
23-
import lombok.NoArgsConstructor;
5+
import jakarta.persistence.*;
6+
import lombok.*;
247
import org.springframework.data.annotation.CreatedDate;
258
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
269

10+
import java.time.LocalDateTime;
11+
2712
@Entity
2813
@Getter
2914
// 같은 사용자(user_id)가 같은 게시글(post_id)을 중복 추천하지 못하도록 DB 레벨에서 보장.
30-
@Table(name = "post_like", uniqueConstraints = {
15+
@Table(uniqueConstraints = {
3116
@UniqueConstraint(columnNames = {"post_id", "user_id"})
3217
})
3318
@EntityListeners(AuditingEntityListener.class)

‎src/main/java/com/back/domain/post/post/entity/PostTag.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
package com.back.domain.post.post.entity;
22

3-
import jakarta.persistence.Column;
4-
import jakarta.persistence.Entity;
5-
import jakarta.persistence.EntityListeners;
6-
import jakarta.persistence.FetchType;
7-
import jakarta.persistence.GeneratedValue;
8-
import jakarta.persistence.GenerationType;
9-
import jakarta.persistence.Id;
10-
import jakarta.persistence.JoinColumn;
11-
import jakarta.persistence.ManyToOne;
12-
import jakarta.persistence.Table;
3+
import jakarta.persistence.*;
134
import lombok.AccessLevel;
145
import lombok.Builder;
156
import lombok.Getter;
@@ -18,7 +9,6 @@
189

1910
@Entity
2011
@Getter
21-
@Table(name = "post_tag")
2212
@EntityListeners(AuditingEntityListener.class)
2313
@NoArgsConstructor(access = AccessLevel.PROTECTED)
2414
public class PostTag {

‎src/main/java/com/back/domain/post/post/entity/Tag.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@
44
import jakarta.persistence.Entity;
55
import jakarta.persistence.GeneratedValue;
66
import jakarta.persistence.Id;
7-
import jakarta.persistence.Table;
8-
import lombok.AccessLevel;
9-
import lombok.AllArgsConstructor;
10-
import lombok.Builder;
11-
import lombok.Getter;
12-
import lombok.NoArgsConstructor;
7+
import lombok.*;
138

149
@Entity
1510
@Getter
16-
@Table(name = "tag")
1711
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1812
@AllArgsConstructor
1913
@Builder

‎src/main/java/com/back/domain/user/controller/UserAuthController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public class UserAuthController {
3434
})
3535
@PostMapping("/refresh")
3636
public RsData<RefreshTokenResDto> refreshToken(HttpServletRequest request, HttpServletResponse response) {
37-
RefreshTokenResDto refreshToken = userAuthService.refreshTokens(request, response);
37+
RefreshTokenResDto refreshTokenData = userAuthService.refreshTokens(request, response);
3838

39-
if (refreshToken != null) {
40-
return RsData.of(200, "토큰이 갱신 성공.", refreshToken);
39+
if (refreshTokenData != null) {
40+
return RsData.of(200, "토큰이 갱신 성공.", refreshTokenData);
4141
} else {
4242
return RsData.of(401, "토큰 갱신에 실패했습니다. 다시 로그인해주세요.");
4343
}

0 commit comments

Comments
 (0)