From a3362f526ab7de3f41560d5c3a17e40c6ee97067 Mon Sep 17 00:00:00 2001
From: HyunsuChoi <mysj923@ajou.ac.kr>
Date: Mon, 17 Jul 2023 16:57:55 +0900
Subject: [PATCH] code refactoring with service

---
 .../controller/MyWebController.java           | 58 ++++--------------
 .../myspringweb/service/MusicService.java     | 61 +++++++++++++++++++
 2 files changed, 74 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/kr/ajousw/myspringweb/service/MusicService.java

diff --git a/src/main/java/kr/ajousw/myspringweb/controller/MyWebController.java b/src/main/java/kr/ajousw/myspringweb/controller/MyWebController.java
index e3ae8a5..60157a4 100644
--- a/src/main/java/kr/ajousw/myspringweb/controller/MyWebController.java
+++ b/src/main/java/kr/ajousw/myspringweb/controller/MyWebController.java
@@ -18,63 +18,31 @@ import kr.ajousw.myspringweb.dto.FavoriteMusicRequestDto;
 import kr.ajousw.myspringweb.dto.MusicList;
 import kr.ajousw.myspringweb.entity.FavoriteMusic;
 import kr.ajousw.myspringweb.repository.FavoriteRepository;
+import kr.ajousw.myspringweb.service.MusicService;
 
 @RestController
 public class MyWebController {
     @Autowired
-    FavoriteRepository albumsRepo;
+   MusicService service;
 
-    @GetMapping(value="/musicSearch/{term}")
-    public MusicList musicSearchByPath(@PathVariable String term) {
-        RestTemplate restTemplate = new RestTemplate();
-        try { 
-            String url = "https://itunes.apple.com/search?term=" + term + "&entity=album";
-            String response = restTemplate.getForObject(url, String.class);
-            ObjectMapper mapper = new ObjectMapper();
-            MusicList list = mapper.readValue(response, MusicList.class);
-            System.out.println(list.getResultCount());
-            return list;
-        } catch(IOException e) {
-            System.out.println(e.toString());
-            return null;
-        }
+    @GetMapping(value = "/musicSearch/{name}")
+    public MusicList musicSearchByPath(@PathVariable String name){
+        return service.searchMusic(name);
     }
 
-    @GetMapping(value="musicSearch")
-    public MusicList musicSearchByParam(@RequestParam String term){
-        RestTemplate restTemplate = new RestTemplate();
-        try { 
-            String url = "https://itunes.apple.com/search?term=" + term + "&entity=album";
-            String response = restTemplate.getForObject(url, String.class);
-            ObjectMapper mapper = new ObjectMapper();
-            MusicList list = mapper.readValue(response, MusicList.class);
-            System.out.println(list.getResultCount());
-            return list;
-        } catch(IOException e) {
-            System.out.println(e.toString());
-            return null;
-        }
+    @GetMapping(value="/musicSearch")
+    public MusicList musicSearchByParam(@RequestParam(value="term") String name) {
+        return service.searchMusic(name);
     }
- 
-    @GetMapping(value="/likes") 
+
+    @GetMapping(value="/likes")  //Get Favorite Music list from Database
     public List<FavoriteMusic> getLikes() {
-        try {
-            return albumsRepo.findAll();
-        } catch (Exception e) {
-            System.out.println(e.toString());
-            return null;
-        }   
+        return service.getLikes();
     }
 
     @PostMapping(value="/likes")
-    @Transactional
     public int postLikes(@RequestBody FavoriteMusicRequestDto favorite) {
-        FavoriteMusic music = albumsRepo.save(favorite.toEntity());
-        if(music != null) {
-            return 1;
-        }
-        else {
-            return 0;
-        }
+        return service.saveFavorite(favorite);
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/kr/ajousw/myspringweb/service/MusicService.java b/src/main/java/kr/ajousw/myspringweb/service/MusicService.java
new file mode 100644
index 0000000..a353781
--- /dev/null
+++ b/src/main/java/kr/ajousw/myspringweb/service/MusicService.java
@@ -0,0 +1,61 @@
+package kr.ajousw.myspringweb.service;
+
+import java.io.IOException;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.transaction.Transactional;
+import kr.ajousw.myspringweb.dto.FavoriteMusicRequestDto;
+import kr.ajousw.myspringweb.dto.MusicList;
+import kr.ajousw.myspringweb.entity.FavoriteMusic;
+import kr.ajousw.myspringweb.repository.FavoriteRepository;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+
+public class MusicService{
+    private final FavoriteRepository albumsRepo;
+    RestTemplate restTemplate = new RestTemplate();
+
+    public MusicList searchMusic(String term){
+        RestTemplate restTemplate = new RestTemplate();
+        try { 
+            String url = "https://itunes.apple.com/search?term=" + term + "&entity=album";
+            String response = restTemplate.getForObject(url, String.class);
+            ObjectMapper mapper = new ObjectMapper();
+            MusicList list = mapper.readValue(response, MusicList.class);
+            System.out.println(list.getResultCount());
+            return list;
+        } catch(IOException e) {
+            System.out.println(e.toString());
+            return null;
+        }
+    }
+
+     public List<FavoriteMusic> getLikes() {
+        try {
+            return albumsRepo.findAll();
+        } catch (Exception e) {
+            System.out.println(e.toString());
+            return null;
+        }   
+    }
+
+    public int saveFavorite(@RequestBody FavoriteMusicRequestDto favorite) {
+        FavoriteMusic music = albumsRepo.save(favorite.toEntity());
+        if(music != null) {
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    }
+
+}
\ No newline at end of file
-- 
GitLab