From 64604a53160d9c085aa86fca3b243ff206d586d8 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:44:25 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[refactor]=20AppService=EC=97=90=EC=84=9C?= =?UTF-8?q?=20BaseEntity=20=EC=83=81=EC=86=8D=ED=95=B4=EC=A0=9C=20(#399)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/AppService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/sopt/app/domain/entity/AppService.java b/src/main/java/org/sopt/app/domain/entity/AppService.java index a764f035..27f806fa 100755 --- a/src/main/java/org/sopt/app/domain/entity/AppService.java +++ b/src/main/java/org/sopt/app/domain/entity/AppService.java @@ -9,7 +9,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class AppService extends BaseEntity { +public class AppService{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From 19c10b76f08e16fbee38fc369e0f91434d82e2f1 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:44:46 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[refactor]=20FortuneCard=EC=97=90?= =?UTF-8?q?=EC=84=9C=20NotNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#399)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/app/domain/entity/fortune/FortuneCard.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/sopt/app/domain/entity/fortune/FortuneCard.java b/src/main/java/org/sopt/app/domain/entity/fortune/FortuneCard.java index 0066461e..b7f3ac0a 100755 --- a/src/main/java/org/sopt/app/domain/entity/fortune/FortuneCard.java +++ b/src/main/java/org/sopt/app/domain/entity/fortune/FortuneCard.java @@ -1,6 +1,7 @@ package org.sopt.app.domain.entity.fortune; import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.*; @Getter @@ -12,12 +13,16 @@ public class FortuneCard { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @NotNull private String name; + @NotNull private String description; + @NotNull @Column(columnDefinition = "TEXT") private String imageUrl; + @NotNull private String imageColorCode; } From 68d77b39a552d50df355420909bb2de53413220e Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:45:14 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[refactor]=20MainDescription=EC=97=90?= =?UTF-8?q?=EC=84=9C=20BaseEntity=20=EC=83=81=EC=86=8D=ED=95=B4=EC=A0=9C?= =?UTF-8?q?=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/MainDescription.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/sopt/app/domain/entity/MainDescription.java b/src/main/java/org/sopt/app/domain/entity/MainDescription.java index 373c96fe..fdf4b29b 100755 --- a/src/main/java/org/sopt/app/domain/entity/MainDescription.java +++ b/src/main/java/org/sopt/app/domain/entity/MainDescription.java @@ -8,7 +8,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor -public class MainDescription extends BaseEntity { +public class MainDescription{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From 62fe08d85e7eb4f0d0a20299efea151dcc021558 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:45:40 +0900 Subject: [PATCH 04/12] =?UTF-8?q?[refactor]=20Mission=EC=97=90=EC=84=9C=20?= =?UTF-8?q?NotNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20default=20value=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/app/domain/entity/soptamp/Mission.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/sopt/app/domain/entity/soptamp/Mission.java b/src/main/java/org/sopt/app/domain/entity/soptamp/Mission.java index 7adde025..59a6932f 100755 --- a/src/main/java/org/sopt/app/domain/entity/soptamp/Mission.java +++ b/src/main/java/org/sopt/app/domain/entity/soptamp/Mission.java @@ -2,8 +2,10 @@ import io.hypersistence.utils.hibernate.type.array.ListArrayType; import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.List; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Type; @Entity @@ -18,10 +20,14 @@ public class Mission { @Column(name = "mission_id") private Long id; + @NotNull private String title; + @NotNull private Integer level; + @NotNull + @ColumnDefault("false") private boolean display; @Type(value= ListArrayType.class) From 3b6456a1065bdfbc4a0fd64e076c5a361b8b94e0 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:45:51 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[refactor]=20Mission=EC=97=90=EC=84=9C=20?= =?UTF-8?q?NotNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20default=20value=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/Notification.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/sopt/app/domain/entity/Notification.java b/src/main/java/org/sopt/app/domain/entity/Notification.java index a04146cf..0b3de8cc 100755 --- a/src/main/java/org/sopt/app/domain/entity/Notification.java +++ b/src/main/java/org/sopt/app/domain/entity/Notification.java @@ -30,9 +30,11 @@ public class Notification extends BaseEntity{ @Column(name = "notification_title", columnDefinition = "TEXT") private String title; + @NotNull @Column(name = "notification_content", columnDefinition = "TEXT") private String content; + @NotNull @Column(name = "notification_type") @Enumerated(EnumType.STRING) private NotificationType type; @@ -48,7 +50,7 @@ public class Notification extends BaseEntity{ @NotNull @ColumnDefault("false") - private Boolean isRead; + private boolean isRead; public void updateIsRead() { this.isRead = true; From f34cbb733b4434d67095404c4a911e711a2139cb Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:46:05 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[refactor]=20PokeHistory=EC=97=90?= =?UTF-8?q?=EC=84=9C=20NotNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20default=20value=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/app/domain/entity/poke/PokeHistory.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java b/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java index 6850af3b..3aaa245e 100755 --- a/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java +++ b/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java @@ -3,6 +3,7 @@ import lombok.*; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; +import org.hibernate.annotations.ColumnDefault; import org.sopt.app.domain.entity.BaseEntity; @Getter @@ -22,13 +23,17 @@ public class PokeHistory extends BaseEntity { @NotNull private Long pokedId; + @NotNull @Column(columnDefinition = "TEXT") private String message; - private Boolean isReply; + @NotNull + @ColumnDefault("false") + private boolean isReply; @NotNull - private Boolean isAnonymous; + @ColumnDefault("false") + private boolean isAnonymous; public void activateReply() { this.isReply = true; From 60f5bc6b8ec43f59ebf49f1a3ab8a961be787192 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:46:21 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[refactor]=20RecommendedUserIds=EC=97=90?= =?UTF-8?q?=EC=84=9C=20NotNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/sopt/app/domain/entity/RecommendedUserIds.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/sopt/app/domain/entity/RecommendedUserIds.java b/src/main/java/org/sopt/app/domain/entity/RecommendedUserIds.java index a0e1db6c..820dd115 100755 --- a/src/main/java/org/sopt/app/domain/entity/RecommendedUserIds.java +++ b/src/main/java/org/sopt/app/domain/entity/RecommendedUserIds.java @@ -1,5 +1,6 @@ package org.sopt.app.domain.entity; +import jakarta.validation.constraints.NotNull; import java.util.Set; import lombok.*; import org.sopt.app.application.playground.dto.PlaygroundUserFindCondition; @@ -13,8 +14,10 @@ public class RecommendedUserIds { @Id + @NotNull private String condition; + @NotNull private Set userIds; public RecommendedUserIds(final PlaygroundUserFindCondition request, final Set userIds) { From f62ae955ccee22f8bd646d07e6e1ae2d9555c223 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:46:35 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[refactor]=20SoptampUser=EC=97=90?= =?UTF-8?q?=EC=84=9C=20NotNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/sopt/app/domain/entity/soptamp/SoptampUser.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/sopt/app/domain/entity/soptamp/SoptampUser.java b/src/main/java/org/sopt/app/domain/entity/soptamp/SoptampUser.java index bd975b94..f0317ebb 100755 --- a/src/main/java/org/sopt/app/domain/entity/soptamp/SoptampUser.java +++ b/src/main/java/org/sopt/app/domain/entity/soptamp/SoptampUser.java @@ -1,6 +1,7 @@ package org.sopt.app.domain.entity.soptamp; import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.*; import org.sopt.app.domain.entity.BaseEntity; import org.sopt.app.domain.enums.PlaygroundPart; @@ -16,16 +17,22 @@ public class SoptampUser extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @NotNull private Long userId; + @NotNull private String profileMessage; + @NotNull private Long totalPoints; + @NotNull private String nickname; + @NotNull private Long generation; + @NotNull private String part; public void initTotalPoints() { From 4d7830c23c6427719f93464a1ad55ef6a7a45996 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:46:44 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[refactor]=20Stamp=EC=97=90=EC=84=9C=20No?= =?UTF-8?q?tNull=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/soptamp/Stamp.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/sopt/app/domain/entity/soptamp/Stamp.java b/src/main/java/org/sopt/app/domain/entity/soptamp/Stamp.java index 3878eda8..f2679721 100755 --- a/src/main/java/org/sopt/app/domain/entity/soptamp/Stamp.java +++ b/src/main/java/org/sopt/app/domain/entity/soptamp/Stamp.java @@ -2,6 +2,7 @@ import io.hypersistence.utils.hibernate.type.array.ListArrayType; import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.List; import lombok.*; import org.hibernate.annotations.Type; @@ -18,16 +19,20 @@ public class Stamp extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @NotNull private String contents; @Column(columnDefinition = "text[]") @Type(value= ListArrayType.class) private List images; + @NotNull private Long userId; + @NotNull private Long missionId; + @NotNull @Column(length = 10) private String activityDate; From d7b76e3774d6d176224d6eb03e2877845d6aae31 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:46:52 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[refactor]=20User=EC=97=90=EC=84=9C=20Not?= =?UTF-8?q?Null=20=EC=A0=9C=EC=95=BD=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/User.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/sopt/app/domain/entity/User.java b/src/main/java/org/sopt/app/domain/entity/User.java index 040fa12c..b333a5d8 100755 --- a/src/main/java/org/sopt/app/domain/entity/User.java +++ b/src/main/java/org/sopt/app/domain/entity/User.java @@ -1,5 +1,6 @@ package org.sopt.app.domain.entity; +import jakarta.validation.constraints.NotNull; import lombok.*; import java.util.Collection; import java.util.Collections; @@ -21,11 +22,14 @@ public class User extends BaseEntity implements UserDetails { @Column(name = "user_id") private Long id; + @NotNull private String username; + @NotNull @Column(unique = true) private Long playgroundId; + @NotNull private String playgroundToken; @Builder From 3bf37d519601661107ff2207819f8e623beab4f1 Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:52:49 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[fix]=20AppService=EC=9D=98=20created=5Fa?= =?UTF-8?q?t=EC=9D=84=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8A=94=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EC=9D=B4=20=EC=9E=88=EC=96=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/AppService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/sopt/app/domain/entity/AppService.java b/src/main/java/org/sopt/app/domain/entity/AppService.java index 27f806fa..a764f035 100755 --- a/src/main/java/org/sopt/app/domain/entity/AppService.java +++ b/src/main/java/org/sopt/app/domain/entity/AppService.java @@ -9,7 +9,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class AppService{ +public class AppService extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From 3583c39085e526ed50a6f918d90a434456e47dad Mon Sep 17 00:00:00 2001 From: kseysh Date: Wed, 9 Oct 2024 02:53:12 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[fix]=20primitive=20boolean=EA=B3=BC=20lo?= =?UTF-8?q?mbok=EC=9D=98=20Getter=EC=9D=98=20=ED=98=B8=ED=99=98=EC=84=B1?= =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#401)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/sopt/app/domain/entity/Notification.java | 2 +- .../java/org/sopt/app/domain/entity/poke/PokeHistory.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/sopt/app/domain/entity/Notification.java b/src/main/java/org/sopt/app/domain/entity/Notification.java index 0b3de8cc..96d807cf 100755 --- a/src/main/java/org/sopt/app/domain/entity/Notification.java +++ b/src/main/java/org/sopt/app/domain/entity/Notification.java @@ -50,7 +50,7 @@ public class Notification extends BaseEntity{ @NotNull @ColumnDefault("false") - private boolean isRead; + private Boolean isRead; public void updateIsRead() { this.isRead = true; diff --git a/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java b/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java index 3aaa245e..aeebd277 100755 --- a/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java +++ b/src/main/java/org/sopt/app/domain/entity/poke/PokeHistory.java @@ -29,11 +29,11 @@ public class PokeHistory extends BaseEntity { @NotNull @ColumnDefault("false") - private boolean isReply; + private Boolean isReply; @NotNull @ColumnDefault("false") - private boolean isAnonymous; + private Boolean isAnonymous; public void activateReply() { this.isReply = true;