[jangbagoony팀 이노 & MJ] OAuth 구현, 로그인, 로그아웃 API 구현

.gitignore

@@ -162,3 +162,5 @@ gradle-app.setting
 .idea/workspace.xml
 .idea/modules.xml
 .idea/jarRepositories.xml
+
+BE/src/main/resources/oauth.properties

BE/src/main/java/com/mj_eno/sidedish/config/MyCorsFilter.java

@@ -1,24 +1,24 @@
-package com.mj_eno.sidedish.config;
-
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-
-public class MyCorsFilter extends CorsFilter {
-
-    public MyCorsFilter() {
-        super(configurationSource());
-    }
-
-    private static UrlBasedCorsConfigurationSource configurationSource() {
-        CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true);
-        config.addAllowedOrigin("http://15.164.68.136/");
-        config.addAllowedOrigin("http://localhost:3000/");
-        config.addAllowedHeader("*");
-        config.addAllowedMethod("*");
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", config);
-        return source;
-    }
-}
+//package com.mj_eno.sidedish.config;
+//
+//import org.springframework.web.cors.CorsConfiguration;
+//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+//import org.springframework.web.filter.CorsFilter;
+//
+//public class MyCorsFilter extends CorsFilter {
+//
+//    public MyCorsFilter() {
+//        super(configurationSource());
+//    }
+//
+//    private static UrlBasedCorsConfigurationSource configurationSource() {
+//        CorsConfiguration config = new CorsConfiguration();
+//        config.setAllowCredentials(true);
+//        config.addAllowedOrigin("http://15.164.68.136/");
+//        config.addAllowedOrigin("http://localhost:3000/");
+//        config.addAllowedHeader("*");
+//        config.addAllowedMethod("*");
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        source.registerCorsConfiguration("/**", config);
+//        return source;
+//    }
+//}

BE/src/main/java/com/mj_eno/sidedish/domain/Image/Image.java

@@ -8,7 +8,6 @@ public class Image {
     private Long id;
     private String url;
     private boolean top;
-    private int dishId;
 
     public Long getId() {
         return id;
@@ -21,8 +20,4 @@ public String getUrl() {
     public boolean isTop() {
         return top;
     }
-
-    public int getDishId() {
-        return dishId;
-    }
 }

BE/src/main/java/com/mj_eno/sidedish/domain/detailImage/DetailImage.java

@@ -7,7 +7,6 @@ public class DetailImage {
     @Id
     private Long id;
     private String url;
-    private int dishId;
 
     public Long getId() {
         return id;
@@ -16,8 +15,4 @@ public Long getId() {
     public String getUrl() {
         return url;
     }
-
-    public int getDishId() {
-        return dishId;
-    }
 }

BE/src/main/java/com/mj_eno/sidedish/domain/dish/Dish.java

@@ -1,8 +1,15 @@
 package com.mj_eno.sidedish.domain.dish;
 
+import com.mj_eno.sidedish.domain.Image.Image;
+import com.mj_eno.sidedish.domain.detailImage.DetailImage;
+import com.mj_eno.sidedish.domain.dishBadge.DishBadge;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.mapping.Embedded;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class Dish {
 
     @Id
@@ -18,12 +25,41 @@ public class Dish {
     private Delivery delivery;
     private int menuCategoryId;
     private Integer bestMenuCategoryId;
+    private List<Image> images = new ArrayList<>();
+    private List<DetailImage> detailImages = new ArrayList<>();
+    private List<DishBadge> dishBadges = new ArrayList<>();
 
     public Dish(String hash, int stock) {
         this.hash = hash;
         this.stock = stock;
     }
 
+    public String getTopImageUrl() {
+        return images.stream()
+                .filter(Image::isTop)
+                .map(Image::getUrl)
+                .collect(Collectors.toList())
+                .get(0);
+    }
+
+    public List<String> getImagesUrl() {
+        return images.stream()
+                .map(Image::getUrl)
+                .collect(Collectors.toList());
+    }
+
+    public List<String> getDetailImagesUrl() {
+        return detailImages.stream()
+                .map(DetailImage::getUrl)
+                .collect(Collectors.toList());
+    }
+
+    public List<Integer> getBadgesId() {
+        return dishBadges.stream()
+                .map(DishBadge::getBadgeId)
+                .collect(Collectors.toList());
+    }
+
     public void order(Dish dish) {
         this.stock -= dish.stock;
     }
@@ -97,13 +133,15 @@ public int getBestMenuCategoryId() {
         return bestMenuCategoryId;
     }
 
-    @Override
-    public String toString() {
-        return "Dish{" +
-                "title='" + title + '\'' +
-                ", description='" + description + '\'' +
-                ", menuCategoryId=" + menuCategoryId +
-                ", bestMenuCategoryId=" + bestMenuCategoryId +
-                '}';
+    public List<Image> getImages() {
+        return images;
+    }
+
+    public List<DetailImage> getDetailImages() {
+        return detailImages;
+    }
+
+    public List<DishBadge> getDishBadges() {
+        return dishBadges;
     }
 }

BE/src/main/java/com/mj_eno/sidedish/domain/dishBadge/DishBadge.java

@@ -6,17 +6,12 @@ public class DishBadge {
 
     @Id
     private Long id;
-    private int dishId;
     private int badgeId;
 
     public Long getId() {
         return id;
     }
 
-    public int getDishId() {
-        return dishId;
-    }
-
     public int getBadgeId() {
         return badgeId;
     }

BE/src/main/java/com/mj_eno/sidedish/domain/user/User.java

@@ -0,0 +1,67 @@
+package com.mj_eno.sidedish.domain.user;
+
+import com.mj_eno.sidedish.web.dto.EmailDTO;
+import com.mj_eno.sidedish.web.dto.TokenDTO;
+import com.mj_eno.sidedish.web.dto.UserInfoDTO;
+import org.springframework.data.annotation.Id;
+
+public class User {
+
+    @Id
+    private Long id;
+    private String name;
+    private String email;
+    private String userId;
+    private String token;
+
+    public User() {}
+
+    public User(UserInfoDTO userInfoDTO, EmailDTO emailDTO, TokenDTO tokenDTO) {
+        this.name = userInfoDTO.getName();
+        this.email = emailDTO.getEmail();
+        this.userId = userInfoDTO.getLogin();
+        this.token = tokenDTO.getAccess_token();
+    }
+
+    public void update(UserInfoDTO userInfoDTO, EmailDTO emailDTO, TokenDTO tokenDTO) {
+        this.name = userInfoDTO.getName();
+        this.email = emailDTO.getEmail();
+        this.userId = userInfoDTO.getLogin();
+        this.token = tokenDTO.getAccess_token();
+    }
+
+    public void removeToken() {
+        this.token = null;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", email='" + email + '\'' +
+                ", userId='" + userId + '\'' +
+                ", token='" + token + '\'' +
+                '}';
+    }
+}

BE/src/main/java/com/mj_eno/sidedish/domain/user/UserRepository.java

@@ -0,0 +1,12 @@
+package com.mj_eno.sidedish.domain.user;
+
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.Optional;
+
+public interface UserRepository extends CrudRepository<User, Long> {
+
+    Optional<User> findByEmail(String email);
+
+    Optional<User> findByToken(String token);
+}