Merge branch 'dev' of https://github.com/CommitField/commitField into Feature/89

Author: skyeong42

src/main/java/cmf/commitField/domain/Timer/controller/TimerController.java

@@ -0,0 +1,7 @@
+package cmf.commitField.domain.Timer.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TimerController {
+}

src/main/java/cmf/commitField/domain/Timer/dto/TimerDto.java

@@ -0,0 +1,14 @@
+package cmf.commitField.domain.Timer.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class TimerDto {
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private String totalTime;
+}

src/main/java/cmf/commitField/domain/Timer/entity/Timer.java

@@ -0,0 +1,33 @@
+package cmf.commitField.domain.Timer.entity;
+
+import cmf.commitField.domain.user.entity.User;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Timer {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private User user;
+    private LocalDateTime startTime;
+    private LocalDateTime endTime;
+    private String totalTime;
+
+    // 타이머 종료 메서드
+    public void stop(LocalDateTime endTime, String totalTime) {
+        this.endTime = endTime;
+        this.totalTime = totalTime;
+    }
+}

src/main/java/cmf/commitField/domain/Timer/service/TimerService.java

@@ -0,0 +1,8 @@
+package cmf.commitField.domain.Timer.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class TimerService {
+
+}

src/main/java/cmf/commitField/domain/chat/chatMessage/service/ChatMessageServiceImpl.java

@@ -34,6 +34,7 @@ public class ChatMessageServiceImpl implements ChatMessageService {
     private final UserChatRoomRepository userChatRoomRepository;
 
     @Override
+    @Transactional
     public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roomId) {
         User findUser = userRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));

src/main/java/cmf/commitField/domain/chat/chatRoom/service/ChatRoomServiceImpl.java

@@ -184,7 +184,11 @@ public void joinRoom(Long roomId, Long userId, ChatRoomRequest chatRoomRequest)
     @Override
     @Transactional
     public void outRoom(Long userId, Long roomId) {
-        ChatRoom room = getChatRoom(roomId);
+        ChatRoom room = chatRoomRepository
+                .findChatRoomById(roomId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM_FOUND));
+
+
         List<UserChatRoom> userByChatRoomId = userChatRoomRepository
                 .findUserByChatRoomId(roomId);
         List<Long> userIds = new ArrayList<>();
@@ -206,21 +210,31 @@ public void outRoom(Long userId, Long roomId) {
         userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
         chatRoomRepository.deleteById(roomId);
 
+        // 방의 생성자와 현재 사용자가 같은지 확인
+        boolean isCreator = Objects.equals(room.getRoomCreator(), userId);
+
+        // 방장 여부와 상관없이 항상 사용자-채팅방 연결만 제거
+        // 방이 삭제되지 않고 목록에 계속 표시됨
+        userChatRoomRepository.deleteUserChatRoomByChatRoom_IdAndUserId(roomId, userId);
     }
 
+    // 방 삭제는 별도의 메소드로 분리
     @Override
     @Transactional
     public void deleteRoom(Long userId, Long roomId) {
-        ChatRoom room = getChatRoom(roomId);
+        ChatRoom room = chatRoomRepository
+                .findChatRoomById(roomId)
+                .orElseThrow(() -> new CustomException(ErrorCode.NO_ROOM));
+
         //방장이 아닐 경우, 삭제 불가
         if (!Objects.equals(room.getRoomCreator(), userId)) {
             throw new CustomException(ErrorCode.NOT_ROOM_CREATOR);
         }
+
         //모든 사용자 제거 후 방 삭제
         chatMessageRepository.deleteChatMsgByChatRoom_Id(roomId);
         userChatRoomRepository.deleteUserChatRoomByChatRoom_Id(roomId);
         chatRoomRepository.deleteById(roomId);
-
     }
 
     @Override
@@ -272,7 +286,6 @@ private ChatRoom getChatRoom(Long roomId) {
         return chatRoomRepository
                 .findChatRoomById(roomId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NONE_ROOM));
-
     }
 
     @Override

src/main/java/cmf/commitField/domain/commit/sinceCommit/service/SinceCommitService.java

@@ -22,7 +22,6 @@
 @Service
 public class SinceCommitService {
     private static final String BASE_URL = "https://api.github.com";
-    // ?since=2024-01-01T00:00:00Z&until=2025-02-1T23:59:59Z
 
     @Value("${github.token}")
     private String PAT;
@@ -53,7 +52,6 @@ public List<SinceCommitResponseDto> getSinceCommits(String owner, String repo, L
 
     // 연속 커밋 수 계산
 
-    // 새로운 분석 메서드 추가
     public CommitAnalysisResponseDto getCommitAnalysis(String owner, String repo, LocalDateTime since, LocalDateTime until) {
         List<SinceCommitResponseDto> commits = getSinceCommits(owner, repo, since, until);
         StreakResult streakResult = calculateStreaks(commits);

src/main/java/cmf/commitField/domain/commit/totalCommit/controller/TotalCommitController.java

@@ -6,6 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -16,10 +17,11 @@
 public class TotalCommitController {
     private final TotalCommitService totalCommitService;
 
-//    @GetMapping("/api/commits/{username}")
-//    public TotalCommitResponseDto getTotalCommits(@PathVariable String username) {
-//        return totalCommitService.getTotalCommitCount(username);
-//    }
+    // Postman 테스트용
+    @GetMapping("/api/commits/{username}")
+    public TotalCommitResponseDto getTotalCommits(@PathVariable String username) {
+        return totalCommitService.getTotalCommitCount(username);
+    }
 
     // 로그인한 사용자의 username 이용
     @GetMapping("/api/commits")

src/main/java/cmf/commitField/domain/commit/totalCommit/dto/TotalCommitResponseDto.java

@@ -18,9 +18,4 @@ public TotalCommitResponseDto(long totalCommitContributions, long restrictedCont
         this.currentStreakDays = currentStreakDays;
         this.maxStreakDays = maxStreakDays;
     }
-
-    public TotalCommitResponseDto(long totalCommitContributions, long restrictedContributionsCount) {
-        this.totalCommitContributions = totalCommitContributions;
-        this.restrictedContributionsCount = restrictedContributionsCount;
-    }
 }