Refactor: getCurrentUserId 적용

Author: gustn99

src/pages/Chats/ChatRoom/ChatBox/index.tsx

@@ -4,15 +4,15 @@ import { useRecoilValue } from 'recoil';
 import { useParams } from 'react-router-dom';
 import { OpponentInfoAtom } from '@recoil/util/OpponentInfo';
 import { useSocket } from '@context/SocketProvider';
+import { getCurrentUserId } from '@utils/getCurrentUserId';
 
 const ChatBox: React.FC = () => {
 	const [newMessage, setNewMessage] = useState('');
 	const textareaRef = useRef<HTMLTextAreaElement | null>(null);
 	const socket = useSocket();
 
 	const { chatRoomId } = useParams();
-	const storageValue = localStorage.getItem('my_id');
-	const userId = storageValue ? Number(storageValue) : -1;
+	const currentUserId = getCurrentUserId();
 	const opponentInfo = useRecoilValue(OpponentInfoAtom);
 	const isOpponentValid = !!(opponentInfo && opponentInfo.id);
 
@@ -53,7 +53,7 @@ const ChatBox: React.FC = () => {
 				chatRoomId: Number(chatRoomId),
 				toUserId: opponentInfo?.id,
 				content: newMessage,
-				fromUserId: userId,
+				fromUserId: currentUserId,
 				createdAt: new Date().toISOString(),
 			};
 			socket.emit('sendMessage', sendMessageRequest);

src/pages/Chats/ChatRoom/index.tsx

@@ -30,6 +30,7 @@ import type { chatRoomMessagesData } from '@apis/chatting/dto';
 import { postUserBlockApi } from '@apis/user-block';
 import type { PostUserBlockRequest } from '@apis/user-block/dto';
 import { handleError } from '@apis/util/handleError';
+import { getCurrentUserId } from '@utils/getCurrentUserId';
 
 const ChatRoom: React.FC = () => {
 	const [extendedMessages, setextendedMessages] = useState<ExtendedMessageDto[]>([]);
@@ -49,9 +50,8 @@ const ChatRoom: React.FC = () => {
 	const nav = useNavigate();
 	const socket = useSocket();
 
-	const storageValue = localStorage.getItem('my_id');
-	const userId = storageValue ? Number(storageValue) : -1;
 	const { chatRoomId } = useParams();
+	const currentUserId = getCurrentUserId();
 	const opponentInfo = useRecoilValue(OpponentInfoAtom);
 
 	// 메시지 수신 시 아래로 스크롤 (스크롤 아래 고정)
@@ -74,7 +74,7 @@ const ChatRoom: React.FC = () => {
 	const postUserBlock = async () => {
 		try {
 			const data: PostUserBlockRequest = {
-				fromUserId: userId,
+				fromUserId: currentUserId,
 				toUserId: opponentInfo?.id || -1,
 				action: 'block',
 			};
@@ -98,7 +98,7 @@ const ChatRoom: React.FC = () => {
 		if (socket) {
 			const data = {
 				chatRoomId: Number(chatRoomId),
-				userId: userId,
+				userId: currentUserId,
 			};
 			socket.emit('leaveChatRoom', data);
 			nav('/chats', { replace: true });
@@ -141,7 +141,7 @@ const ChatRoom: React.FC = () => {
 	// 메시지 수신 시 렌더링에 필요한 정보 추가
 	// 이거 위에랑 합칠수없나?
 	useEffect(() => {
-		const temp = createExtendedMessages(allMessages, userId, opponentInfo);
+		const temp = createExtendedMessages(allMessages, currentUserId, opponentInfo);
 		setextendedMessages(temp);
 	}, [allMessages]);
 

src/pages/Chats/RecentChat/index.tsx

@@ -6,6 +6,7 @@ import ChatRoomItem from '../ChatRoomItem/index';
 import { StyledText } from '@components/Text/StyledText';
 import { useSocket } from '@context/SocketProvider';
 import type { ChatRoomData } from '@apis/chatting/dto';
+import { getCurrentUserId } from '@utils/getCurrentUserId';
 
 interface RecentChatProps {
 	matchingCount: number;
@@ -16,8 +17,7 @@ const RecentChat: React.FC<RecentChatProps> = () => {
 	const [chatRoomList, setChatRoomList] = useState<ChatRoomData[]>([]);
 	const [isLoading, setIsLoading] = useState(true);
 	const socket = useSocket();
-	const storageValue = localStorage.getItem('my_id');
-	const userId = Number(storageValue);
+	const currentUserId = getCurrentUserId();
 
 	useEffect(() => {
 		// 채팅방 리스트 조회
@@ -27,7 +27,7 @@ const RecentChat: React.FC<RecentChatProps> = () => {
 		};
 
 		if (socket) {
-			socket.emit('getChatRooms', { userId: userId });
+			socket.emit('getChatRooms', { userId: currentUserId });
 			socket.on('chatRoomList', getChatRooms);
 		}
 

src/pages/Home/OOTD/Feed/index.tsx

@@ -40,6 +40,7 @@ import { togglePostLikeStatusApi } from '@apis/post-like';
 import { postUserBlockApi } from '@apis/user-block';
 import type { PostUserBlockRequest } from '@apis/user-block/dto';
 import type { FeedProps } from './dto';
+import { getCurrentUserId } from '@utils/getCurrentUserId';
 
 const Feed: React.FC<FeedProps> = ({ feed }) => {
 	const [isLikeClicked, setIsLikeClicked] = useState(feed.isPostLike);
@@ -50,7 +51,7 @@ const Feed: React.FC<FeedProps> = ({ feed }) => {
 	const [modalContent, setModalContent] = useState('');
 
 	const nav = useNavigate();
-	const userId = localStorage.getItem('my_id');
+	const currentUserId = getCurrentUserId();
 	const timeAgo = dayjs(feed.createdAt).locale('ko').fromNow();
 
 	const handleMoreButtonClick = (e: React.MouseEvent) => {
@@ -111,7 +112,7 @@ const Feed: React.FC<FeedProps> = ({ feed }) => {
 	const postUserBlock = async () => {
 		try {
 			const data: PostUserBlockRequest = {
-				fromUserId: Number(userId) || -1,
+				fromUserId: currentUserId || -1,
 				toUserId: feed.user.id,
 				action: 'block',
 			};
@@ -133,7 +134,7 @@ const Feed: React.FC<FeedProps> = ({ feed }) => {
 	const createMatching = async (comment: string) => {
 		try {
 			const matchingRequest: CreateMatchingRequest = {
-				requesterId: Number(userId) || -1,
+				requesterId: currentUserId || -1,
 				targetId: feed.user.id || -1,
 				message: comment,
 			};