Merge pull request #38 from gongPyeon/kang

merge

src/main/java/timetogether/config/SecurityConfig.java

@@ -35,7 +35,7 @@ public class SecurityConfig {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
-        configuration.addAllowedOrigin("http://192.168.12.91:3000"); // 프론트 ip 3000 URL
+        configuration.addAllowedOrigin("http://192.168.12.140:3000"); // 프론트 ip 3000 URL
         configuration.addAllowedMethod("*"); // 모든 HTTP 메서드 허용
         configuration.addAllowedHeader("*"); // 모든 헤더 허용
         configuration.addExposedHeader("Authorization"); // 클라이언트에서 Authorization 헤더를 읽을 수 있게 노출

src/main/java/timetogether/group/Group.java

@@ -39,10 +39,10 @@ public class Group {
   private String groupIntro;
   private String groupUrl;
 
-  @ManyToMany(mappedBy = "groupList", cascade = CascadeType.ALL)  // User 엔티티의 필드명을 참조
+  @ManyToMany(mappedBy = "groupList")  // User 엔티티의 필드명을 참조
   private List<User> groupUserList = new ArrayList<>();
 
-  @OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
+  @OneToMany(mappedBy = "group")
   private List<GroupWhere> groupWhereList = new ArrayList<>();
 
   @Builder

src/main/java/timetogether/groupMeeting/GroupMeeting.java

@@ -25,15 +25,15 @@ public class GroupMeeting {
 
   private String groupMeetingDays;
 
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
+  @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "group_id")
   private Group group;
 
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+  @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "user_id")
   private User user;
 
-  @OneToMany(mappedBy = "groupMeeting", cascade = CascadeType.ALL)
+  @OneToMany(mappedBy = "groupMeeting", cascade = CascadeType.REMOVE, orphanRemoval = true)
   private List<GroupWhere> groupWhereList = new ArrayList<>();
 
   @Builder

src/main/java/timetogether/groupMeeting/repository/GroupMeetingRepository.java

@@ -1,6 +1,8 @@
 package timetogether.groupMeeting.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import timetogether.group.Group;
 import timetogether.groupMeeting.GroupMeeting;
 import timetogether.meeting.Meeting;
@@ -13,7 +15,11 @@ public interface GroupMeetingRepository extends JpaRepository<GroupMeeting, Long
     @Override
     Optional<GroupMeeting> findById(Long groupMeetId);
 
-    GroupMeeting findByGroupAndGroupMeetingTitleAndUser(Group group, String groupMeetingTitle, User user);
+//    List<GroupMeeting> findByGroupAndGroupMeetingTitleAndUser(Group group, String groupMeetingTitle, User user);
+    @Query("SELECT gm FROM GroupMeeting gm WHERE gm.group = :group AND gm.groupMeetingTitle = :groupMeetingTitle AND gm.user = :user")
+    GroupMeeting findByGroupAndGroupMeetingTitleAndUser(@Param("group") Group group,
+                                          @Param("groupMeetingTitle") String groupMeetingTitle,
+                                          @Param("user") User user);
     GroupMeeting findByGroupAndGroupMeetingTitle(Group group, String groupMeetingTitle);
     List<GroupMeeting> findByGroupMeetingTitle(String groupMeetingTitle);
 

src/main/java/timetogether/meeting/Meeting.java

@@ -43,11 +43,11 @@ public class Meeting {
   private String groupName;
 
 
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
+  @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "calendar_id")
   private Calendar calendar;
 
-  @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
+  @OneToOne(fetch = FetchType.LAZY)
   private Where2meet where2meet;
 
   @Builder

src/main/java/timetogether/oauth2/entity/User.java

@@ -29,15 +29,15 @@ public class User {
   @NotNull
   private String userName;
 
-  @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+  @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "calendar_id")
   private Calendar calendar;
 
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+  @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "groupMeet_id")
   private GroupMeeting groupMeeting;
 
-  @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
+  @OneToMany(mappedBy = "user")
   private List<GroupMeeting> groupMeetingList = new ArrayList<>();
 
   @ManyToMany

src/main/java/timetogether/oauth2/handler/OAuth2LoginSuccessHandler.java

@@ -84,10 +84,9 @@ private void loginSuccess(HttpServletRequest request, HttpServletResponse respon
         jwtService.updateRefreshToken(socialId, refreshToken); // 사용자의(소셜아이디) 리프레시 토큰를 db에 저장
         //String redirectUrl = "http://172.20.10.4:3000/oauth2/redirect?access_token=" + accessToken;
 
-//        String userName = userRepository.findBySocialId(socialId).get().getUserName();
-//        //프론트랑 통신할 때 여기 설정
-//        String redirectUrl = "http://192.168.12.91:3000/login/oauth2/redirect?access_token=" + accessToken + "&refresh_token=" + refreshToken;//Front ip 로 설정
-//        response.sendRedirect(redirectUrl);
+        //프론트랑 통신할 때 여기 설정
+        String redirectUrl = "http://192.168.12.140:3000/login/oauth2/redirect?access_token=" + accessToken + "&refresh_token=" + refreshToken;//Front ip 로 설정
+        response.sendRedirect(redirectUrl);
 
 //        HttpSession session = request.getSession();
 //        log.info("Session ID in loginSuccess: {}", session.getId());

src/main/java/timetogether/when2meet/When2meet.java

@@ -29,11 +29,11 @@ public class When2meet {
 //  @JoinColumn(name = "social_id")
 //  private User user;
 
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+  @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "group_id")
   private Group group;
 
-  @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+  @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name ="groupMeet_id")
   private GroupMeeting groupMeeting;
 

src/main/java/timetogether/when2meet/controller/When2MeetController.java

@@ -126,8 +126,7 @@ public BaseResponse<Object> doneGroupMeet(HttpServletRequest request,
 
         String accessToken = jwtService.extractAccessToken(request).get();
         String socialId = jwtService.extractId(accessToken).get();
-        if (type.equals(MeetType.OFFLINE))
-            when2MeetService.doneGroupMeet(groupId, groupMeetingTitle, MeetType.fromString(type), socialId, meetDT);
+        when2MeetService.doneGroupMeet(groupId, groupMeetingTitle, MeetType.fromString(type), socialId, meetDT);
         return baseResponseService.getSuccessResponse();
     }
 

src/main/java/timetogether/when2meet/dto/MeetTableDTO.java

@@ -9,6 +9,6 @@
 @AllArgsConstructor
 @Getter
 public class MeetTableDTO {
-    private final List<Result> result;
     private final List<Process> meeting;
+    private final List<Result> result;
 }

src/main/java/timetogether/when2meet/service/When2MeetService.java

@@ -89,7 +89,7 @@ public Optional<MeetTableDTO> viewMeetResult(Long groupId) {
             }
         }
 
-        MeetTableDTO meetTableDTO = new MeetTableDTO(resultList, meetingList);
+        MeetTableDTO meetTableDTO = new MeetTableDTO(meetingList, resultList);
 
         return Optional.ofNullable(meetTableDTO);
     }
@@ -100,13 +100,18 @@ public void addGroupMeet(String groupMeetingTitle, List<String> dates, Long grou
         Group group = groupRepository.findById(groupId).get(); // 그룹 아이디로 그룹을 조회
         List<User> users = group.getGroupUserList(); // 그룹에서 사용자 리스트 조회
 
+        GroupMeeting groupMeeting = groupMeetingRepository.findByGroupAndGroupMeetingTitleAndUser(group, groupMeetingTitle, users.get(0));
+        log.info("groupMeeting = {}", groupMeeting);
+        if(groupMeeting != null) return; // groupMeeting이 존재하면 리턴한다
+
         initGroupMeeting(users, group, groupMeetingTitle);// 회의 일정 초기화, 모든 사용자에 대해 회의 일정 추가
         initWhen2Meet(users, group, groupMeetingTitle, dates); // 특정 날짜 초기화, 모든 사용자에 대해 특정 날짜 추가
     }
 
     private void initWhen2Meet(List<User> users, Group group, String groupMeetingTitile, List<String> dates) {
         for(int i=0; i<users.size(); i++) {
             log.info("groupMeeting 진입");
+            log.info("{}, {}, {}", group, groupMeetingTitile, users.get(i));
             GroupMeeting groupMeeting = groupMeetingRepository.findByGroupAndGroupMeetingTitleAndUser(group, groupMeetingTitile, users.get(i));
             log.info("groupMeeting = {}", groupMeeting.getGroupMeetingTitle());
             for(String date : dates){
@@ -195,7 +200,11 @@ public GroupTableDTO<Days> addUserMeet(Long groupId, String groupMeetingTitle, M
         GroupMeeting meeting = groupMeetingRepository.findByGroupAndGroupMeetingTitleAndUser(group, groupMeetingTitle, user);
         List<When2meet> when2meets = when2MeetRepository.findByTypeAndGroupMeeting(type, meeting);
         // 여러 날짜가 넘어옵니다
+        RankTime byWhen2meet = rankTimeRepository.findByWhen2meet(when2meets.get(0));
+        if(byWhen2meet!= null)
+            return new GroupTableDTO<Days>(group.getGroupTimes(), type, null); // 이미 존재한 경우
 
+        log.info("byWhen2meet = {}", byWhen2meet);
         List<Days> days = new ArrayList<>();
         for(int i=0; i<when2meets.size(); i++){
             RankTime rankTime = new RankTime(33, 33, when2meets.get(i));