Merge branch 'dev' into feat/132-chatRoom-leftButton

audwls239 · web-flow · commit bb1bb596f9d6 · 2025-06-12T12:52:10.000+09:00
diff --git a/.github/workflows/java-style-check.yml b/.github/workflows/java-style-check.yml
diff --git a/.github/workflows/style-check.yml b/.github/workflows/style-check.yml
@@ -0,0 +1,75 @@
+name: Java Style Check
+
+on:
+  push:
+    branches-ignore: 
+      - main
+      - dev
+
+jobs:
+  java-style:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run Google Java Format
+        uses: axel-op/googlejavaformat-action@v4
+        with:
+          args: "--replace --aosp"
+          commit-message: "chore: Java 스타일 수정"
+
+  kotlin-style:
+    needs: java-style
+    permissions:
+      contents: write
+      statuses: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Super-Linter
+        uses: super-linter/super-linter@v7.4.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FIX_KOTLIN: true
+          DISABLE_ERRORS: true
+          VALIDATE_BASH: false
+          VALIDATE_BASH_EXEC: false
+          VALIDATE_CHECKOV: false
+          VALIDATE_GITHUB_ACTIONS: false
+          VALIDATE_GITLEAKS: false
+          VALIDATE_GIT_MERGE_CONFLICT_MARKERS: false
+          VALIDATE_JSCPD: false
+          VALIDATE_SHELL_SHFMT: false
+          VALIDATE_YAML: false
+          VALIDATE_YAML_PRETTIER: false
+          VALIDATE_GOOGLE_JAVA_FORMAT: false
+          VALIDATE_JAVA: false
+          VALIDATE_CSS: false
+          VALIDATE_CSS_PRETTIER: false
+          VALIDATE_DOCKERFILE_HADOLINT: false
+          VALIDATE_GROOVY: false
+          VALIDATE_HTML: false
+          VALIDATE_HTML_PRETTIER: false
+          VALIDATE_JAVASCRIPT_ES: false
+          VALIDATE_JAVASCRIPT_PRETTIER: false
+          VALIDATE_JAVASCRIPT_STANDARD: false
+          VALIDATE_JSON: false
+          VALIDATE_JSON_PRETTIER: false
+          VALIDATE_MARKDOWN: false
+          VALIDATE_MARKDOWN_PRETTIER: false
+          VALIDATE_NATURAL_LANGUAGE: false
+          VALIDATE_SQLFLUFF: false
+          VALIDATE_TSX: false
+          VALIDATE_TYPESCRIPT_ES: false
+          VALIDATE_TYPESCRIPT_PRETTIER: false
+          VALIDATE_TYPESCRIPT_STANDARD: false
+
+      - name: Commit and push linting fixes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          branch: ${{ github.ref_name }}
+          commit_message: "chore: Kotlin 스타일 수정"
+          commit_user_name: super-linter
+          commit_user_email: super-linter@super-linter.dev
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+### Super Linter ###
+.super-linter.report/
+super-linter-summary.md
+branch_protection_rules.json
diff --git a/NBE_5_7_2_02TEAM/build.gradle b/NBE_5_7_2_02TEAM/build.gradle
@@ -28,7 +28,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
@@ -48,7 +47,6 @@ dependencies {
     /* ETC */
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
-    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
     implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'
diff --git a/frontend/src/components/ChatRoom.tsx b/frontend/src/components/ChatRoom.tsx
@@ -41,7 +41,7 @@ interface ChatRes {
 interface ServerChatItem {
     id: number
     member_id: number
-    member_name: string // 서버 응답에 이 필드가 포함되어야 가장 좋습니다.
+    member_name: string
     content: string
     created_at: string
 }
@@ -90,16 +90,14 @@ function ChatRoom({ chatRoomId, postTitle, onBack }: ChatRoomProps) {
         const token = localStorage.getItem("accessToken");
         if (token) {
             const payload = decodeJwtPayload(token);
-            // Assuming the memberId is stored in a claim named 'memberId' or 'sub' (standard for subject)
-            // Adjust 'memberId' or 'sub' based on your actual JWT payload structure
             if (payload && payload.memberId) {
                 setCurrentMemberId(Number(payload.memberId));
-            } else if (payload && payload.sub) { // Fallback to 'sub' if 'memberId' is not present
+            } else if (payload && payload.sub) {
                 setCurrentMemberId(Number(payload.sub));
             }
         } else {
         }
-    }, []); // Run once on component mount
+    }, []);
 
     const scrollToBottom = () => {
         messagesEndRef.current?.scrollIntoView({ behavior: "smooth" })
@@ -152,7 +150,7 @@ function ChatRoom({ chatRoomId, postTitle, onBack }: ChatRoomProps) {
                     const mappedResult: ChatRes[] = resultFromServer.map((item) => ({
                         id: item.id,
                         memberId: item.member_id,
-                        memberName: item.member_name, // 초기 로딩 시에는 서버가 이름을 줄 것으로 기대
+                        memberName: item.member_name,
                         content: item.content,
                         createdAt: new Date(item.created_at),
                     }));
@@ -247,7 +245,7 @@ function ChatRoom({ chatRoomId, postTitle, onBack }: ChatRoomProps) {
                         const mappedData: ChatRes = {
                             id: serverData.id,
                             memberId: serverData.member_id,
-                            memberName: memberName, // 수정된 이름 사용
+                            memberName: memberName,
                             content: serverData.content,
                             createdAt: new Date(serverData.created_at),
                         };
@@ -467,7 +465,6 @@ function ChatRoom({ chatRoomId, postTitle, onBack }: ChatRoomProps) {
                                     <line x1="21" y1="12" x2="9" y2="12" />
                                 </svg>
                             </button>
-
                         </div>
 
                         <div className="flex-grow p-2">
diff --git a/frontend/src/pages/ChatRoomList.tsx b/frontend/src/pages/ChatRoomList.tsx
@@ -9,8 +9,10 @@ import { Skeleton } from "@/components/ui/skeleton";
 // 2a. 서버 응답 객체의 인터페이스 (스네이크 케이스)
 interface ServerChatRoom {
   id: number;
-  post_id: number; // 서버에서 오는 필드명
+  post_id: number;
   title: string;
+  member_count: number;
+  updated_at: Date;
 }
 
 function ChatRoomList() {
@@ -21,19 +23,16 @@ function ChatRoomList() {
   const [selectedRoom, setSelectedRoom] = useState<number | null>(null);
   const [selectedRoomTitle, setSelectedRoomTitle] = useState("");
 
-
   const fetchData = async () => {
     setLoading(true);
     setError(null);
-    const token = localStorage.getItem("accessToken"); // 토큰 가져오기
+    const token = localStorage.getItem("accessToken");
 
     if (!token) {
       console.error("[fetchData] Authorization token not found in localStorage.");
       setError("로그인이 필요합니다. 로그인 후 다시 시도해주세요.");
       setLoading(false);
       setItems([]);
-      // 여기서 로그인 페이지로 리디렉션하거나 사용자에게 명확한 안내를 할 수 있습니다.
-      // 예: router.push('/login'); (Next.js 사용 시)
       return;
     }
 
@@ -42,18 +41,16 @@ function ChatRoomList() {
         cache: "no-store",
         headers: {
           "Content-Type": "application/json",
-          "Authorization": `Bearer ${token}`, // Authorization 헤더 추가
+          "Authorization": `Bearer ${token}`,
         },
       });
 
       if (!res.ok) {
         if (res.status === 401 || res.status === 403) {
-          const errorText = await res.text(); // 에러 본문을 읽어옴 (JSON 형태일 수도 있음)
+          const errorText = await res.text();
           console.error(`[fetchData] Authentication error (${res.status}):`, errorText);
           setError(`인증에 실패했습니다 (${res.status}). 세션이 만료되었거나 권한이 없습니다. 다시 로그인해주세요.`);
-          // 필요하다면 여기서 로그아웃 처리 또는 로그인 페이지로 강제 이동
         } else {
-          // 기타 HTTP 에러
           const errorText = await res.text();
           console.error(`[fetchData] HTTP error! status: ${res.status}, message: ${errorText}`);
           throw new Error(`HTTP error! status: ${res.status}, message: ${errorText}`);
@@ -66,15 +63,20 @@ function ChatRoomList() {
       const responseData: ServerChatRoom[] = await res.json();
 
       if (responseData && Array.isArray(responseData)) {
-        setItems(responseData);
+        const sortedData = responseData.map(room => ({
+          ...room,
+          updated_at: new Date(room.updated_at)
+        })).sort((a, b) => {
+          return b.updated_at.getTime() - a.updated_at.getTime()
+        });
+        setItems(sortedData);
       } else {
         setItems([]);
         console.warn("[fetchData] API 응답에서 data 필드를 찾을 수 없거나 형식이 배열이 아닙니다.", responseData);
         setError("채팅방 목록을 가져오는 데 실패했습니다. (응답 데이터 형식 오류)");
       }
     } catch (e: any) {
       console.error("[fetchData] 채팅방 목록을 가져오는 중 오류 발생: ", e);
-      // 네트워크 에러 등의 경우 e.message가 있을 수 있음
       setError(e.message || "알 수 없는 오류가 발생했습니다. 네트워크 연결을 확인해주세요.");
       setItems([]);
     } finally {
@@ -84,7 +86,7 @@ function ChatRoomList() {
 
   useEffect(() => {
     fetchData();
-  }, [retryCount]); // retryCount 변경 시 fetchData 재호출
+  }, [retryCount]);
 
   const handleRetry = () => {
     setRetryCount((prev) => prev + 1);
@@ -103,16 +105,16 @@ function ChatRoomList() {
 
   return (
     <div className="flex h-[calc(100vh-4rem)] bg-[#f0f2f5] overflow-hidden p-4">
-      <div className={`transition-all duration-300 ease-in-out ${selectedRoom ? "w-1/3 md:w-1/4 lg:w-1/5" : "w-full"}`}>
+      <div className={`transition-all duration-300 ease-in-out ${selectedRoom ? "w-[280px] min-w-[280px]" : "w-full"}`}>
         <div className="h-full flex flex-col max-w-[480px] mx-auto">
           <div className="flex-grow overflow-hidden rounded-xl bg-white shadow-lg flex flex-col">
-            <div className="flex flex-col xl:flex-row xl:items-center justify-between p-4 border-b border-[#e4e6eb]">
-              <h1 className="text-xl font-bold text-[#1877f2] mb-2 xl:mb-0">참여중인 채팅방 목록</h1>
+            <div className="flex flex-col p-4 border-b border-[#e4e6eb]">
+              <h1 className="text-xl font-bold text-[#1877f2] mb-3 whitespace-nowrap truncate">참여중인 채팅방 목록</h1>
               <Button
                 variant="outline"
                 onClick={handleRetry}
                 disabled={loading}
-                className="flex items-center gap-2 text-[#1877f2] border-[#e4e6eb] hover:bg-[#f0f2f5] w-full xl:w-auto"
+                className="flex items-center gap-2 text-[#1877f2] border-[#e4e6eb] hover:bg-[#f0f2f5] w-full"
               >
                 <RefreshIcon className="h-4 w-4" />
                 새로고침
@@ -172,8 +174,8 @@ function ChatRoomList() {
           </div>
         )}
       </div>
-    </div >
-  );
+    </div>
+  )
 }
 
 function ChatRoomSkeleton() {
@@ -185,10 +187,10 @@ function ChatRoomSkeleton() {
       </div>
       <Skeleton className="h-4 w-32 mt-2" />
     </div>
-  );
+  )
 }
 
-function RefreshIcon(props: React.SVGProps<SVGSVGElement>) { // props 타입 추가
+function RefreshIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -205,10 +207,10 @@ function RefreshIcon(props: React.SVGProps<SVGSVGElement>) { // props 타입 추
       <path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16" />
       <path d="M3 21v-5h5" />
     </svg>
-  );
+  )
 }
 
-function AlertCircleIcon(props: React.SVGProps<SVGSVGElement>) { // props 타입 추가
+function AlertCircleIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -224,10 +226,10 @@ function AlertCircleIcon(props: React.SVGProps<SVGSVGElement>) { // props 타입
       <line x1="12" y1="8" x2="12" y2="12" />
       <line x1="12" y1="16" x2="12.01" y2="16" />
     </svg>
-  );
+  )
 }
 
-function ChatBubbleIcon(props: React.SVGProps<SVGSVGElement>) { // props 타입 추가
+function ChatBubbleIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -242,7 +244,7 @@ function ChatBubbleIcon(props: React.SVGProps<SVGSVGElement>) { // props 타입
       <path d="M14 9a2 2 0 0 1-2 2H6l-4 4V4c0-1.1.9-2 2-2h8a2 2 0 0 1 2 2v5Z" />
       <path d="M18 9h2a2 2 0 0 1 2 2v11l-4-4h-6a2 2 0 0 1-2-2v-1" />
     </svg>
-  );
+  )
 }
 
-export default ChatRoomList;
+export default ChatRoomList
