Merge pull request #61 from themoment-team/feat/popup

팝업 제목 추가
themoment-team · Jan 12, 2024 · 9ee5305 · 9ee5305
2 parents 806b380 + de1dabb
commit 9ee5305
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/com/example/officialgsmclientserver/domain/popup/dto/PopupInfoResponse.java b/src/main/java/com/example/officialgsmclientserver/domain/popup/dto/PopupInfoResponse.java
@@ -16,15 +16,18 @@ public class PopupInfoResponse {
 
     private String imageUrl;
 
+    private String title;
+
     private String link;
 
     private LocalDateTime expirationDateTime;
 
     public static PopupInfoResponse from(Popup popup) {
         return PopupInfoResponse.builder()
-                .imageUrl(popup.getImageUrl())
-                .link(popup.getLink())
-                .expirationDateTime(popup.getExpirationDateTime())
+                .imageUrl(popup.getPopupImageUrl())
+                .title(popup.getPopupTitle())
+                .link(popup.getPopupLink())
+                .expirationDateTime(popup.getPopupExpirationDateTime())
                 .build();
     }
 }
diff --git a/src/main/java/com/example/officialgsmclientserver/domain/popup/entity/Popup.java b/src/main/java/com/example/officialgsmclientserver/domain/popup/entity/Popup.java
@@ -16,12 +16,15 @@ public class Popup {
     @Column(name = "popup_seq")
     private Long popupSeq;
 
-    @Column(name = "image_url", nullable = false)
-    private String imageUrl;
+    @Column(name = "popup_image_url", nullable = false)
+    private String popupImageUrl;
 
-    @Column(name = "link", nullable = true)
-    private String link;
+    @Column(name = "popup_title", nullable = false)
+    private String popupTitle;
 
-    @Column(name = "expiration_date_time", nullable = false)
-    private LocalDateTime expirationDateTime;
+    @Column(name = "popup_link", nullable = true)
+    private String popupLink;
+
+    @Column(name = "popup_expiration_date_time", nullable = false)
+    private LocalDateTime popupExpirationDateTime;
 }