[Feat] 목표 체계 제거 (#252)

* [Feat] 소셜 로그인 관련 로그 삭제

* [Feat] goal 관련 로직 삭제

src/main/java/org/winey/server/domain/feed/Feed.java

@@ -9,7 +9,6 @@
 import lombok.NoArgsConstructor;
 import org.winey.server.domain.AuditingTimeEntity;
 import org.winey.server.domain.comment.Comment;
-import org.winey.server.domain.goal.Goal;
 import org.winey.server.domain.user.User;
 
 @Getter
@@ -39,10 +38,6 @@ public class Feed extends AuditingTimeEntity {
     @Column(nullable = false)
     private Long feedMoney;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "goal_id")
-    private Goal goal;
-
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "feed", orphanRemoval = true)
     private List<FeedLike> feedLikes;
 
@@ -56,6 +51,5 @@ public Feed(User user, String feedTitle, String feedImage, Long feedMoney, FeedT
         this.feedImage = feedImage;
         this.feedMoney = feedMoney;
         this.feedType = feedType;
-        this.goal = null;
     }
 }

src/main/java/org/winey/server/domain/user/User.java

@@ -23,7 +23,6 @@
 import org.winey.server.domain.comment.Comment;
 import org.winey.server.domain.feed.Feed;
 import org.winey.server.domain.feed.FeedLike;
-import org.winey.server.domain.goal.Goal;
 import org.winey.server.domain.notification.Notification;
 import org.winey.server.domain.recommend.Recommend;
 
@@ -66,11 +65,9 @@ public class User extends AuditingTimeEntity {
     @Column
     private Long savedCount;
 
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "user", orphanRemoval = true)
-    private List<Goal> goals;
-
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "user", orphanRemoval = true)
     private List<Recommend> recommends;
+
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "user", orphanRemoval = true)
     private List<Feed> feeds;
 

src/main/java/org/winey/server/infrastructure/UserRepository.java

@@ -4,7 +4,6 @@
 import org.springframework.data.repository.Repository;
 import org.springframework.lang.Nullable;
 import org.winey.server.domain.feed.Feed;
-import org.winey.server.domain.goal.Goal;
 import org.winey.server.domain.recommend.Recommend;
 import org.winey.server.domain.user.SocialType;
 import org.winey.server.domain.user.User;

src/main/java/org/winey/server/service/auth/AuthService.java

@@ -3,15 +3,12 @@
 import java.util.Random;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.winey.server.config.jwt.JwtService;
 import org.winey.server.controller.request.auth.SignInRequestDto;
 import org.winey.server.controller.response.auth.SignInResponseDto;
 import org.winey.server.controller.response.auth.TokenResponseDto;
-import org.winey.server.domain.goal.Goal;
-import org.winey.server.domain.goal.GoalType;
 import org.winey.server.domain.notification.NotiType;
 import org.winey.server.domain.notification.Notification;
 import org.winey.server.domain.user.SocialType;
@@ -20,23 +17,19 @@
 import org.winey.server.exception.model.NotFoundException;
 import org.winey.server.exception.model.UnprocessableEntityException;
 import org.winey.server.infrastructure.BlockUserRepository;
-import org.winey.server.infrastructure.GoalRepository;
 import org.winey.server.infrastructure.NotiRepository;
 import org.winey.server.infrastructure.UserRepository;
 import org.winey.server.service.auth.apple.AppleSignInService;
 import org.winey.server.service.auth.kakao.KakaoSignInService;
 
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class AuthService {
     private final AppleSignInService appleSignInService;
     private final KakaoSignInService kakaoSignInService;
     private final JwtService jwtService;
-
     private final UserRepository userRepository;
     private final BlockUserRepository blockUserRepository;
-    private final GoalRepository goalRepository;
 
 
     private final Long TOKEN_EXPIRATION_TIME_ACCESS = 100 * 24 * 60 * 60 * 1000L;
@@ -47,12 +40,9 @@ public class AuthService {
     @Transactional
     public SignInResponseDto signIn(String socialAccessToken, SignInRequestDto requestDto) {
         SocialType socialType = SocialType.valueOf(requestDto.getSocialType());
-        log.info("after get social type");
         String socialId = login(socialType, socialAccessToken);
-        log.info("after get social info");
 
         Boolean isRegistered = userRepository.existsBySocialIdAndSocialType(socialId, socialType);
-        log.info("after check isRegistered");
         if (!isRegistered) {
             String randomString= new Random().ints(6, 0, 36).mapToObj(i -> Character.toString("abcdefghijklmnopqrstuvwxyz0123456789".charAt(i))).collect(Collectors.joining());
             while (userRepository.existsByNickname("위니"+randomString)) {
@@ -75,12 +65,6 @@ public SignInResponseDto signIn(String socialAccessToken, SignInRequestDto reque
                     .build();
             newNoti.updateLinkId(null);
             notiRepository.save(newNoti);
-
-            Goal newGoal = Goal.builder()
-                .goalType(GoalType.COMMONER_GOAL)
-                .user(newUser)
-                .build();
-            goalRepository.save(newGoal);
         }
 
         User user = userRepository.findBySocialIdAndSocialType(socialId, socialType)
@@ -140,12 +124,6 @@ public void withdraw(Long userId){
         if (user == null) {
             throw new NotFoundException(Error.NOT_FOUND_USER_EXCEPTION, Error.NOT_FOUND_USER_EXCEPTION.getMessage());
         }
-        System.out.println("User: " + user);
-        System.out.println("Goals: " + user.getGoals());
-        System.out.println("Recommends: " + user.getRecommends());
-        System.out.println("Feeds: " + user.getFeeds());
-        System.out.println("FeedLikes: " + user.getFeedLikes());
-        System.out.println("Comments: "+ user.getComments());
 
         // 유저가 생성한 반응과 관련된 알림 삭제
         notiRepository.deleteByRequestUserId(userId);

src/main/java/org/winey/server/service/auth/kakao/KakaoSignInService.java

@@ -2,18 +2,15 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.JsonArray;
+import java.util.Map;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Map;
-
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class KakaoSignInService {
@@ -26,9 +23,7 @@ public String getKaKaoId(String accessToken) {
         headers.add("Authorization","Bearer "+ accessToken);
         HttpEntity<JsonArray> httpEntity = new HttpEntity<>(headers);
         ResponseEntity<Object> responseData;
-        log.info("before kakao post");
         responseData = restTemplate.postForEntity(KAKAO_URL,httpEntity,Object.class);
-        log.info("after kakao post");
         ObjectMapper objectMapper = new ObjectMapper();
         return objectMapper.convertValue(responseData.getBody(), Map.class).get("id").toString(); //소셜 id만 가져오는듯.
     }