From f25a9546dd4415028b1c5f3f6a7041998a90c484 Mon Sep 17 00:00:00 2001
From: nohy6630 <nohy6630@gmail.com>
Date: Sat, 16 Sep 2023 22:33:10 +0900
Subject: [PATCH] =?UTF-8?q?fix(#15):=20=EC=98=A4=ED=83=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kusitms/hdmedi/domain/domain/News.java    | 46 -------------------
 .../repository/news/NewsRepository.java       |  9 ----
 2 files changed, 55 deletions(-)
 delete mode 100644 src/main/java/kusitms/hdmedi/domain/domain/News.java

diff --git a/src/main/java/kusitms/hdmedi/domain/domain/News.java b/src/main/java/kusitms/hdmedi/domain/domain/News.java
deleted file mode 100644
index 0d65fe8..0000000
--- a/src/main/java/kusitms/hdmedi/domain/domain/News.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package kusitms.hdmedi.domain.domain;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Entity
-@NoArgsConstructor
-@Getter
-public class News {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    private String title;
-
-    private String source;
-
-    private String link;
-
-    private LocalDateTime publishedAt;
-
-    @Builder
-    public News(String title, String source, String link, LocalDateTime publishedAt) {
-        this.title = title;
-        this.source = source;
-        this.link = link;
-        this.publishedAt = publishedAt;
-    }
-
-    public void update(String title, String source, String link, LocalDateTime publishedAt) {
-        this.title = title;
-        this.source = source;
-        this.link = link;
-        this.publishedAt = publishedAt;
-    }
-}
diff --git a/src/main/java/kusitms/hdmedi/repository/news/NewsRepository.java b/src/main/java/kusitms/hdmedi/repository/news/NewsRepository.java
index 345dd9f..60fa0f7 100644
--- a/src/main/java/kusitms/hdmedi/repository/news/NewsRepository.java
+++ b/src/main/java/kusitms/hdmedi/repository/news/NewsRepository.java
@@ -1,19 +1,10 @@
 package kusitms.hdmedi.repository.news;
 
-<<<<<<< HEAD
 import kusitms.hdmedi.domain.news.News;
-=======
-import kusitms.hdmedi.domain.domain.News;
->>>>>>> bfc8a2c214eba153895fecca239e41f0575e628d
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-<<<<<<< HEAD
-=======
-import java.util.List;
-
->>>>>>> bfc8a2c214eba153895fecca239e41f0575e628d
 public interface NewsRepository extends JpaRepository<News, Long> {
     Page<News> findAll(Pageable pageable);
 }