Front랑 상의할 부분 제외 간편 로그인 완료 : 비밀번호 처리, code 처리, 프로필 사진 처리 의논 필요

Author: JiyoungMa

build.gradle

@@ -33,6 +33,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security:2.6.3'
 	implementation 'org.springframework.boot:spring-boot-gradle-plugin:1.1.3.RELEASE'
+	implementation'com.google.code.gson:gson:2.8.7'
+	implementation 'org.springframework:spring-mock:2.0.8'
 }
 
 tasks.named('test') {

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'volume'
+rootProject.name = 'volume'

src/main/java/volume/configuration/SecurityConfig.java

@@ -8,6 +8,7 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import volume.service.KakaoService;
 
 @Configuration
 @EnableWebSecurity
@@ -25,14 +26,16 @@ public void configure(WebSecurity web) {
         web
                 .ignoring()
                 .antMatchers(
-                        "/api/**"
+                        "/api/**","/oauth/**"
                 );
     }
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/api").permitAll()
+                .antMatchers("/oauth").permitAll()
                 .anyRequest().authenticated();
+
     }
 }

src/main/java/volume/controller/KakaoController.java

@@ -0,0 +1,32 @@
+package volume.controller;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import volume.service.KakaoService;
+
+@RestController
+@RequiredArgsConstructor
+public class KakaoController {
+
+    private final KakaoService kakaoService;
+
+    //https://kauth.kakao.com/oauth/authorize?client_id=f31b9f81fdf64d528eaafa1878d102c3&redirect_uri=http://localhost:8080/oauth/kakao&response_type=code
+    @GetMapping("/oauth/kakao")
+    public KakaoUserDTO kakaoLogin(@RequestParam String code) throws Exception{
+        String access_Token = kakaoService.getKakaoAccessToken(code);
+        String userId = kakaoService.createKakaoUser(access_Token);
+        return new KakaoUserDTO(userId);
+    }
+
+    @Data
+    static class KakaoUserDTO{
+        private String id; //userId
+
+        public KakaoUserDTO(String id){ this.id = id;};
+    }
+
+}

src/main/java/volume/api/UserApiController.java renamed to src/main/java/volume/controller/api/UserApiController.java

@@ -1,14 +1,12 @@
-package volume.api;
+package volume.controller.api;
 
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -18,7 +16,6 @@
 import volume.service.UserService;
 
 import javax.validation.Valid;
-import java.io.File;
 import java.net.FileNameMap;
 import java.net.URLConnection;
 
@@ -111,6 +108,12 @@ public User getUser(){
         }
     }
 
+    @Data
+    static class MusicRequest{
+        private String id; //userId
+        private MultipartFile musicFile;
+    }
+
     @Data
     static class CreateUserResponse{
         private String id;

src/main/java/volume/entity/Album.java

@@ -25,4 +25,8 @@ public class Comment {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "parent_id")
+    private Comment parent;
 }

src/main/java/volume/entity/Artist.java

@@ -17,14 +17,11 @@ public class Music{
     private String musicFilePath;
     private Long musicLength;
     private Long likeCount;
+    private Long playCount;
 
     //ManyToOne 쓰면 안된다고 했던거같은데.... 확인하기
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "artist_id")
-    private Artist artist;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "album_id")
-    private Album album;
+    @JoinColumn(name = "user_id")
+    private User user;
 
 }

src/main/java/volume/entity/Comment.java

@@ -21,4 +21,5 @@ public class User{
     private String email;
     private String profilePics; //String말고 파일 경로 나타내는 좋은 방법 있는지 보기
     private String backgroundPics;
+    private int age;
 }

src/main/java/volume/entity/Music.java

@@ -2,8 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
-import volume.entity.Album;
-import volume.entity.Artist;
 import volume.entity.Music;
 
 import javax.persistence.EntityManager;
@@ -30,12 +28,4 @@ public List<Music> findAll(){
     public List<Music> findByTitle(String title){
         return em.createQuery("select m from Music m where m.title = :title", Music.class).setParameter("title",title).getResultList();
     }
-
-    public List<Music> findByArtist(Artist artist){
-        return em.createQuery("select m from Music m where m.artist = :artist", Music.class).setParameter("artist", artist).getResultList();
-    }
-
-    public List<Music> findByAlbum(Album album){
-        return em.createQuery("select m from Music m where m.album = :album", Music.class).setParameter("album",album).getResultList();
-    }
 }