♻️ refactor(notification): make NotificationAction nullable false

depromeet · Apr 6, 2024 · b053cef · b053cef
1 parent 77c0f23
commit b053cef
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/...batch/src/main/java/com/depromeet/domains/notification/dto/request/AllPushRequestDto.java b/...batch/src/main/java/com/depromeet/domains/notification/dto/request/AllPushRequestDto.java
@@ -14,7 +14,9 @@ public class AllPushRequestDto {
     @NotNull
     private String content;
 
+    @NotNull
     private String path;
 
+    @NotNull
     private String pid;
 }
diff --git a/...op-batch/src/main/java/com/depromeet/domains/notification/dto/request/PushRequestDto.java b/...op-batch/src/main/java/com/depromeet/domains/notification/dto/request/PushRequestDto.java
@@ -19,9 +19,12 @@ public class PushRequestDto {
     @NotNull
     private String content;
 
+    @NotNull
     private NotificationType notificationType;
 
+    @NotNull
     private String path;
 
+    @NotNull
     private String pid;
 }
diff --git a/...nd/streetdrop-batch/src/main/resources/db/migration/V20240404__add_notification_table.sql b/...nd/streetdrop-batch/src/main/resources/db/migration/V20240404__add_notification_table.sql
@@ -11,8 +11,8 @@ CREATE TABLE IF NOT EXISTS users_device (
 
 CREATE TABLE IF NOT EXISTS notification_action (
     notification_action_id BIGINT NOT NULL AUTO_INCREMENT,
-    path VARCHAR(255),
-    pid VARCHAR(255),
+    path VARCHAR(255) NOT NULL,
+    pid VARCHAR(255) NOT NULL,
     PRIMARY KEY(notification_action_id)
 );
 
@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS notification (
     notification_type VARCHAR(255) NOT NULL,
     is_viewed BIT NOT NULL,
     user_device_id BIGINT NOT NULL,
-    notification_action_id BIGINT NULL,
+    notification_action_id BIGINT NOT NULL,
     created_at DATETIME(6) NOT NULL,
     modified_at DATETIME(6) NOT NULL,
     PRIMARY KEY(notification_id),

diff --git a/backend/streetdrop-domain/src/main/java/com/depromeet/notification/Notification.java b/backend/streetdrop-domain/src/main/java/com/depromeet/notification/Notification.java
@@ -42,7 +42,7 @@ public class Notification extends BaseTimeEntity {
     private UserDevice userDevice;
 
     @OneToOne(fetch = LAZY, cascade = ALL)
-    @JoinColumn(name = "notification_action_id")
+    @JoinColumn(name = "notification_action_id", nullable = false)
     private NotificationAction notificationAction;
 
     @Builder

diff --git a/backend/streetdrop-domain/src/main/java/com/depromeet/notification/NotificationAction.java b/backend/streetdrop-domain/src/main/java/com/depromeet/notification/NotificationAction.java
@@ -21,8 +21,10 @@ public class NotificationAction {
     @Column(name = "notification_action_id")
     private Long id;
 
+    @Column(nullable = false)
     private String path;
 
+    @Column(nullable = false)
     private String pid;
 
     @Builder