Skip to content

[#137] fix(minihome): 이미 친구인 사람에게 친구요청 버튼이 노출되는 현상 수정 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sageherb merged 1 commit into from
Nov 19, 2025
Merged

[#137] fix(minihome): 이미 친구인 사람에게 친구요청 버튼이 노출되는 현상 수정 #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions src/features/minihome/home/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export default function HomePage({
const [bio, setBio] = useState<string | null>(null);

const [friendRequested, setFriendRequested] = useState<boolean>(false);
const [isFriend, setIsFriend] = useState<boolean>(false);
const [toggleAnimating, setToggleAnimating] = useState(false);

const [images, setImages] = useState<GalleryImage[]>([]);
Expand Down Expand Up @@ -84,15 +85,32 @@ export default function HomePage({
setBio(profile.bio);

// 친구 신청 여부 정보 가져오기
const { count: friendRequestCount, error: friendRequestError } = await supabase
.from("friend_requests")
.select("*", { count: "exact", head: true })
.eq("requester_id", user.id)
.eq("addressee_id", ownerId);
if (friendRequestError) {
console.error("친구 신청 정보 불러오기 실패:", friendRequestError);
const { data: friendship, error: friendshipError } = await supabase
.from("friends")
.select("id")
.or(
`and(user1_id.eq.${user.id},user2_id.eq.${ownerId}),and(user1_id.eq.${ownerId},user2_id.eq.${user.id})`
)
.maybeSingle();
if (friendshipError) {
console.error("친구 관계 정보 불러오기 실패:", friendshipError);
}
const alreadyFriend = Boolean(friendship);
setIsFriend(alreadyFriend);

if (!alreadyFriend) {
const { count: friendRequestCount, error: friendRequestError } = await supabase
.from("friend_requests")
.select("*", { count: "exact", head: true })
.eq("requester_id", user.id)
.eq("addressee_id", ownerId);
if (friendRequestError) {
console.error("친구 신청 정보 불러오기 실패:", friendRequestError);
} else {
setFriendRequested(friendRequestCount === 1);
}
} else {
setFriendRequested(friendRequestCount === 1);
setFriendRequested(false);
}

// 사진첩 정보 가져오기 (최근 8개)
Expand Down Expand Up @@ -176,6 +194,10 @@ export default function HomePage({
console.error("친구신청 상대가 존재하지 않습니다.");
return;
}
if (isFriend) {
console.error("이미 친구 관계입니다.");
return;
}

setToggleAnimating(true);

Expand Down Expand Up @@ -222,7 +244,7 @@ export default function HomePage({
</div>

{/* 친구 신청 버튼 */}
{!isMine && (
{!isMine && !isFriend && (
<Button
type="button"
className="mt-3 h-16 w-full py-2 text-sm text-[#3f3570] hover:bg-[#e9e0ff]"
Expand Down
Loading