Skip to content

fix: 방 배정 추가 오류 수정 #118

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
iubns merged 2 commits into from
Aug 8, 2026
Merged

fix: 방 배정 추가 오류 수정 #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dc4335
fix: 방 추가가 되지 않는 버그 수정
iubns Aug 8, 2026
b376fc9
Merge pull request #117 from nuon-dev/main
iubns Aug 8, 2026
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
33 changes: 30 additions & 3 deletions client/src/app/retreat/admin/room-assignment/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type DraftRoom = {
id: string
roomNumber: number
members: Array<RetreatAttend>
isDraft?: boolean
}

type DraftState = {
Expand Down Expand Up @@ -79,6 +80,7 @@ function RoomAssignment() {
id: `room-${roomNumber}`,
roomNumber,
members: sortByBirthYear(members),
isDraft: false,
}))

return {
Expand Down Expand Up @@ -276,6 +278,7 @@ function RoomAssignment() {
id: `room-${nextRoomNumber}-${Date.now()}`,
roomNumber: nextRoomNumber,
members: [],
isDraft: true,
},
]),
}
Expand Down Expand Up @@ -339,6 +342,27 @@ function RoomAssignment() {

const nextState = normalizeResponse(updatedUsers)

if (sourceRoom.isDraft && sourceRoom.members.length === 0) {
nextState.rooms.push({
...sourceRoom,
roomNumber: nextRoomNumber,
isDraft: true,
})
}

draftState.rooms.forEach((room) => {
if (
room.id !== roomId &&
room.isDraft &&
room.members.length === 0 &&
nextState.rooms.every((nextRoom) => nextRoom.id !== room.id)
) {
nextState.rooms.push(room)
}
})

nextState.rooms = sortRooms(nextState.rooms)

setDraftState(nextState)
syncRoomNumberDrafts(nextState.rooms)
void persistDraftState(nextState)
Expand Down Expand Up @@ -393,6 +417,11 @@ function RoomAssignment() {

function renderRoom(room: DraftRoom) {
const visibleMembers = getVisibleMembers(room)
const shouldShowRoom = visibleMembers.length > 0 || room.isDraft

if (!shouldShowRoom) {
return null
}

return (
<Stack
Expand Down Expand Up @@ -599,9 +628,7 @@ function RoomAssignment() {
flexDirection: "row",
}}
>
{draftState.rooms
.filter((room) => getVisibleMembers(room).length > 0)
.map((room) => renderRoom(room))}
{draftState.rooms.map((room) => renderRoom(room))}
</Stack>
</Stack>
{selectedUser && selectedUser.id && (
Expand Down
Loading