Merge branch 'dev' into feat/#150

Author: whale22

.DS_Store

@@ -0,0 +1,104 @@
+name: Gemini Code Review
+
+on:
+  push:
+    branches: [ feat/gemini ]
+    paths:
+      - 'backend/**'
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  code-review:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node
+        uses: actions/setup-node@v3
+
+      - name: Install GoogleGenerativeAI
+        run: |
+          npm install @google/generative-ai
+
+      # PR 이벤트에서의 변경사항 처리
+      - name: Get git diff for PR
+        if: github.event_name == 'pull_request'
+        run: |
+          git fetch origin "${{ github.event.pull_request.base.ref }}"
+          git fetch origin "${{ github.event.pull_request.head.ref }}"
+          git diff --unified=0 "origin/${{ github.event.pull_request.base.ref }}" > "diff.txt"
+          echo "EVENT_TYPE=pull_request" >> $GITHUB_ENV
+
+      # Push 이벤트에서의 변경사항 처리
+      - name: Get git diff for Push
+        if: github.event_name == 'push'
+        run: |
+          git diff --unified=0 HEAD^ HEAD > "diff.txt"
+          echo "EVENT_TYPE=push" >> $GITHUB_ENV
+
+      # Gemini를 사용한 코드 분석
+      - name: Run Gemini-1.5-flash
+        id: gemini_review
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require("fs");
+            const diff_output = fs.readFileSync("diff.txt",'utf8');
+            
+            const { GoogleGenerativeAI } = require("@google/generative-ai");
+            const genAI = new GoogleGenerativeAI("${{ secrets.GEMINI_API_KEY }}");
+            const model = genAI.getGenerativeModel({ model: "gemini-1.5-flash"});
+            
+            // PR과 Push에 따라 다른 프롬프트 사용
+            let prompt;
+            if (process.env.EVENT_TYPE === 'pull_request') {
+              prompt = `Explain in korean. You are a senior software engineer and need to perform a code review based on the results of a given git diff. Review the changed code from different perspectives and let us know if there are any changes that need to be made. If you see any code that needs to be fixed in the result of the git diff, you need to calculate the exact line number by referring to the "@@ -0,0 +0,0 @@" part. The output format is \[{"path":"{ filepath }", "line": { line }, "text": { review comment }, "side": "RIGHT"}\] format must be respected.\n<git diff>${diff_output}</git diff>`;
+            } else {
+              prompt = `Explain in korean. You are a senior software engineer and need to perform a code review based on the results of a given git diff. Provide a detailed review of the code changes, focusing on code quality, readability, performance, and security. Format your response in Markdown with clear headings for each file reviewed.\n<git diff>${diff_output}</git diff>`;
+            }
+            
+            const result = await model.generateContent(prompt);
+            const response = await result.response;
+            const text = response.text();
+            
+            fs.writeFileSync('review_result.txt', text);
+            console.log('Review results saved!');
+
+      # PR 이벤트: 라인별 리뷰 코멘트 추가
+      - name: Format and add PR review comments
+        if: env.EVENT_TYPE == 'pull_request'
+        id: store
+        run: |
+          COMMENT=$(sed '/^```/d' review_result.txt | jq -c .)
+          echo "comment=$COMMENT" >> $GITHUB_OUTPUT
+
+      - name: Add Pull Request Review Comment
+        if: env.EVENT_TYPE == 'pull_request'
+        uses: nbaztec/[email protected]
+        with:
+          comments: ${{ steps.store.outputs.comment }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token-user-login: 'github-actions[bot]'
+          allow-repeats: false
+
+      # Push 이벤트: 액션 로그에 리뷰 결과 출력 및 아티팩트 업로드
+      - name: Display review results in workflow log
+        if: env.EVENT_TYPE == 'push'
+        run: |
+          echo "===== Gemini Code Review Results ====="
+          cat review_result.txt
+          echo "======================================"
+
+      - name: Upload review results as artifact
+        if: env.EVENT_TYPE == 'push'
+        uses: actions/upload-artifact@v4
+        with:
+          name: gemini-code-review
+          path: review_result.txt

.github/workflows/gemini-code-review.yml

@@ -0,0 +1,113 @@
+# 🌱 CommitField_BE
+> 커밋필드 (사용자의 깃허브 기록을 활용해 펫 육성 및 업적 달성을 지원하며, 채팅 등 지속적인 동기 부여를 돕는 서비스)
+
+총 개발기간 : `2025.2.18` ~ `2025.03.13` (22일)
+</br>
+개발인원: 5명
+
+</br>
+<img width="1629" alt="스크린샷 2025-02-13 오후 5 17 27" src="https://github.com/user-attachments/assets/5b9be8f8-f524-4bd6-bee5-99dbd2d4f591" />
+
+# 🌴 팀원 소개
+<table>
+  <tr>
+    <td><img src="https://avatars.githubusercontent.com/u/15629036?v=4" width="200" height="200"></td>
+    <td><img src="https://avatars.githubusercontent.com/u/181931584?v=4" width="200" height="200"></td>
+    <td><img src="https://avatars.githubusercontent.com/u/93702730?v=4" width="200" height="200"></td>
+    <td><img src="https://avatars.githubusercontent.com/u/82190411?v=4" width="200" height="200"></td>
+    <td><img src="https://avatars.githubusercontent.com/u/55117130?v=4" width="200" height="200"></td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/whale22">김소영</a></td>
+    <td><a href="https://github.com/skyeong42">성수경</a></td>
+    <td><a href="https://github.com/seoyeonson">손서연</a></td>
+    <td><a href="https://github.com/ces0135-hub">백성현</a></td>
+    <td><a href="https://github.com/ces0135-hub">윤현승</a></td>
+  </tr>
+</table>
+
+## 💐 기술 스택
+
+<img width="1046" alt="스크린샷 2025-03-14 오후 1 18 14" src="https://github.com/user-attachments/assets/48a7e53b-08c6-41bb-8fae-88fc9be322d3" />
+</br>
+
+## 🌼 시스템 아키텍쳐
+
+<img width="1545" alt="스크린샷 2025-02-13 오후 1 18 55" src="https://github.com/user-attachments/assets/cc121c13-be01-47fd-a44a-64bf3a6433c7" />
+</br>
+
+## 🌳 ERD
+
+<img width="1502" alt="스크린샷 2025-03-14 오후 1 19 59" src="https://github.com/user-attachments/assets/4c50079c-240c-47d3-9c87-e09e13f4d9b5" />
+</br>
+
+
+# 🍀 페이지 별 기능
+
+## 🌺 메인 페이지  
+
+<img width="1600" alt="메인 페이지" src="https://github.com/user-attachments/assets/824e6caa-6a15-4b1b-a747-a5da09d29892" /> 
+</br>
+
+### 🍃 기능   
+#### 🔹 펫/랭킹
+- 계절 별 랭킹 설계로 총 커밋 수와 계절 별 커밋 수.
+- 현재 시즌에 맞는 커밋 수에 따라 랭킹을 부여.
+#### 🔹 커밋 개수 자동 갱신
+- 유저 커밋 수 주기적 갱신.
+- 스프링 이벤트를 통한 데이터 일괄 갱신.
+#### 🔹 실시간 알림
+- 시즌 알림
+- 랭킹 알림
+- 연속 커밋 축하 알림
+- 커밋 부재 알림
+
+## 🌹 펫
+
+<img width="1600" alt="펫" src="https://github.com/user-attachments/assets/766fc5cf-11a4-43ad-bd58-1aa7f8908efa" />  
+</br>
+
+### 🍃 기능   
+#### 🔹 펫
+-  사용자 별 펫 확인 가능.
+
+## 🌻 로그인  
+
+<img width="1600" alt="로그인" src="https://github.com/user-attachments/assets/a3842c23-023c-4eda-965f-4767768cb5cf" />  
+</br>
+
+### 🍃 기능  
+#### 🔹 로그인 
+-  Github API를 이용한 로그인 구현.
+-  세션 방식 사용.
+  
+
+## 🌷 채팅
+<img width="1600" alt="로그인" src="https://github.com/user-attachments/assets/f29670ac-4dbe-4af0-87d5-3e9360a9246e" />  
+</br>
+<img width="1600" alt="로그인" src="https://github.com/user-attachments/assets/a09a257f-9ebf-43ec-89f3-7399678e17b2" />  
+</br>
+
+
+### 🍃 기능  
+#### 🔹 채팅 방 관리
+- 반장이 채팅 방을 생성 및 삭제 가능.
+- 마지막 사용자가 나가면 채팅 방 자동 삭제.
+- 채팅 방 목록 조회 (전체, 내가 생성한 방, 참여 중인 방, 좋아요 순, 내가 좋아요한 방).
+- 중복 참여 불가.
+- 키워드 기반 채팅 방 검색.
+- 반장만 채팅 방 이름 수정 가능.
+- 비밀번호 설정 가능.
+
+#### 🔹 채팅 기능
+- 실시간 양방향 통신 사용자 메시지 전송.
+- 채팅 방 내 메시지 조회 (사용자가 들어온 시점부터 확인 가능).
+
+#### 🔹 사용자 관리
+- 온라인/오프라인 상태 확인 (로그인, 로그아웃).
+- 채팅 방 참여자 목록 조회 가능.
+- 채팅 방 좋아요 기능 제공 (좋아요 순 정렬 가능).
+
+
+
+

README.md

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.admin.controller;
+package cmf.commitField.domain.admin.admin.controller;
 
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;

src/.DS_Store

@@ -0,0 +1,19 @@
+package cmf.commitField.domain.admin.notice.entity;
+
+
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.Entity;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Entity
+@SuperBuilder
+@Getter
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+public class Notice extends BaseEntity {
+    // 관리자 공지사항
+    private String title;
+    private String content;
+}

src/main/.DS_Store

@@ -12,8 +12,12 @@
 public class ChatMsgResponse {
     //채팅방 ID
     private Long roomId;
+    //chatMsgId
+    private Long id;
     //사용자(user)
+    private Long userId;
     private String from;
     private String message;
     private LocalDateTime sendAt;
+    private String avatarUrl;  // 아바타 URL 필드 추가
 }

src/main/java/.DS_Store

@@ -15,4 +15,5 @@ public class ChatMsgDto {
     private String nickname;
     private String message;
     private LocalDateTime sendAt;
+    private String avatarUrl;  // avatarUrl 필드 추가
 }

src/main/java/cmf/.DS_Store

@@ -43,30 +43,30 @@ public ChatMsgResponse sendMessage(ChatMsgRequest message, Long userId, Long roo
 
         ChatRoom chatRoom = chatRoomRepository.findChatRoomById(roomId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_ROOM));
-        // 채팅 메시지 생성
+
         ChatMsg chatMsg = ChatMsg.builder()
                 .message(message.getMessage())
                 .createdAt(LocalDateTime.now())
                 .user(findUser)
                 .chatRoom(chatRoom)
                 .build();
 
-        // Response message
-        // 응답 값으로 변환
-
-        ChatMsgResponse response = ChatMsgResponse.builder()
+        chatMessageRepository.save(chatMsg);
 
+        // Response message
+        // 응답값 변환
+        return ChatMsgResponse.builder()
+                .id(chatMsg.getId())         // chatMsgId 추가
                 .roomId(roomId)
-                .from(findUser.getNickname())
+                .userId(userId)              // userId 추가
+                .from(findUser.getUsername())
                 .message(message.getMessage())
                 .sendAt(chatMsg.getCreatedAt())
+                .avatarUrl(findUser.getAvatarUrl()) // 아바타 URL 추가
                 .build();
-        chatMessageRepository.save(chatMsg);
-        return response;
 
     }
 
-
     @Transactional(readOnly = true)
     @Override
     public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId) {
@@ -83,10 +83,11 @@ public List<ChatMsgDto> getRoomChatMsgList(Long roomId, Long userId, Long lastId
         for (ChatMsg chatMsg : chatMsgsList) {
             ChatMsgDto build = ChatMsgDto.builder()
                     .chatMsgId(chatMsg.getId())
-                    .nickname(chatMsg.getUser().getNickname())
+                    .nickname(chatMsg.getUser().getUsername()) // nickname 대신 username 사용
                     .sendAt(chatMsg.getCreatedAt())
                     .message(chatMsg.getMessage())
                     .userId(chatMsg.getUser().getId())
+                    .avatarUrl(chatMsg.getUser().getAvatarUrl()) // avatarUrl 추가
                     .build();
             if (build.getSendAt().isAfter(joinDt)) {
                 chatMsgDtos.add(build);

src/main/java/cmf/commitField/.DS_Store

@@ -1,4 +1,4 @@
-//package cmf.commitField.domain.chat.chatRoom.controller.response;
-//
-//public class ChatRoomResponse {
-//}
+package cmf.commitField.domain.chat.chatRoom.controller.response;
+
+public class ChatRoomResponse {
+}

src/main/java/cmf/commitField/domain/.DS_Store

@@ -10,4 +10,6 @@
 public class ChatRoomUserDto {
     private String nickname;
     private Boolean status;
+    // 사용자 github image
+    private String imageUrl;
 }

src/main/java/cmf/commitField/domain/admin/controller/ApiV1PetImgController.java renamed to src/main/java/cmf/commitField/domain/admin/admin/controller/ApiV1PetImgController.java

@@ -271,6 +271,7 @@ public List<ChatRoomDto> searchRoomByTitle(String roomName, Long userId, Pageabl
                     .heartCount(chatRoom.getHearts().size())
                     .currentUserCount((long) chatRoom.getUserChatRooms().size())
                     .userCountMax(chatRoom.getUserCountMax())
+                    .imageUrl(chatRoom.getImageUrl())
                     .build();
             chatRoomDtos.add(build);
         }
@@ -312,8 +313,9 @@ public List<ChatRoomUserDto> getRoomUsers(Long roomId, Long userId) {
         List<ChatRoomUserDto> chatRoomUserDtos = new ArrayList<>();
         for (UserChatRoom userChatRoom : userIds) {
             ChatRoomUserDto build = ChatRoomUserDto.builder()
-                    .nickname(userChatRoom.getUser().getNickname())
+                    .nickname(userChatRoom.getUser().getUsername())
                     .status(userChatRoom.getUser().getStatus())
+                    .imageUrl(userChatRoom.getUser().getAvatarUrl())
                     .build();
             chatRoomUserDtos.add(build);
         }
@@ -334,6 +336,7 @@ public List<ChatRoomDto> getRoomHeartSortList(Pageable pageable) {
                     .userCountMax(chatRoom.getUserCountMax())
                     .currentUserCount((long) chatRoom.getUserChatRooms().size())
                     .heartCount(chatRoom.getHearts().size())
+                    .imageUrl(chatRoom.getImageUrl())
                     .build();
             chatRoomDtos.add(build);
         }
@@ -363,6 +366,7 @@ public List<ChatRoomDto> myHeartRoomList(Long userId, Pageable pageable) {
                     .heartCount(chatRoom.getHearts().size())
                     .currentUserCount((long) chatRoom.getUserChatRooms().size())
                     .userCountMax(chatRoom.getUserCountMax())
+                    .imageUrl(chatRoom.getImageUrl())
                     .build();
             chatRoomDtos.add(build);
         }