Skip to content

fix: redirect user to quiz waiting lobby #112

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
husenkuresh1 merged 4 commits into from
Jan 23, 2026
Merged

fix: redirect user to quiz waiting lobby #112

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
265b33e
fix: redirect user to quiz waiting lobby
smitdodiya Jan 6, 2026
7a8ff0f
fix: resync waiting users
smitdodiya Jan 21, 2026
4005315
fix : improve error handling
smitdodiya Jan 23, 2026
9c2ef0d
fix: simplify websocket lifecycle management
smitdodiya Jan 23, 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
26 changes: 26 additions & 0 deletions api/controllers/api/v1/quiz_socket_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,32 @@ func handleConnectedUser(c *websocket.Conn, qc *quizSocketController, sessionId
response.Action = constants.ActionSendUserData
response.Component = constants.Waiting

users, err := qc.redis.PubSubModel.Client.Get(
qc.redis.PubSubModel.Ctx,
sessionId,
).Result()

if err == nil && users != "" {
var usersData []UserInfo
if err := json.Unmarshal([]byte(users), &usersData); err == nil {

response := QuizSendResponse{
Component: constants.Waiting,
Action: constants.ActionSendUserData,
Data: usersData,
}

err = func() error {
arrangeMu.Lock()
defer arrangeMu.Unlock()
return utils.JSONSuccessWs( c, constants.EventSendInvitationCode, response )
}()
if err != nil {
qc.logger.Error("error while sending initial user data to admin", zap.Error(err))
}
}
}

pubsub := qc.redis.PubSubModel.Client.Subscribe(qc.redis.PubSubModel.Ctx, fmt.Sprintf("%s-%s", constants.ChannelUserJoin, sessionId), fmt.Sprintf("%s-%s", constants.ChannelUserDisconnect, sessionId), constants.EventTerminateQuiz, constants.EventStartQuizByAdmin, constants.StartQuizByAdminNoPlayerFound)
defer func() {
if pubsub != nil {
Expand Down
42 changes: 16 additions & 26 deletions app/pages/admin/arrange/[session_id].vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const confirmNeeded = reactive({
const currentComponent = ref("Loading");
const adminOperationHandler = ref();
const analysisTab = ref("ranking");
const session_id = route.params.session_id;
const session_id = computed(() => route.params.session_id);
const runningQuizJoinUser = ref(0);
const isPauseQuiz = ref(false);
const quizState = computed(() =>
Expand All @@ -62,33 +62,23 @@ const handleCustomChange = (isFullScreenEvent) => {

// main functions
onMounted(() => {
// core logic
if (process.client) {
try {
if (socketObject) {
adminOperationHandler.value = new AdminOperations(
session_id,
handleQuizEvents,
handleNetworkEvent,
confirmSkip
);
continueAdmin();
} else {
adminOperationHandler.value = new AdminOperations(
session_id,
handleQuizEvents,
handleNetworkEvent,
confirmSkip
);
connectAdmin();
}
} catch (err) {
console.error(err);
toast.info(app.$ReloadRequired);
}
}
if (!process.client) return;

removeAllUsers();
resetUsersSubmittedAnswers();
currentComponent.value = "Loading";

adminOperationHandler.value = new AdminOperations(
session_id.value,
handleQuizEvents,
handleNetworkEvent,
confirmSkip
);

connectAdmin();
});


const handleQuizEvents = async (message) => {
if (message.status == app.$Error) {
return await router.push(
Expand Down
Loading