Skip to content

feat(timer): 소켓을 통해 연동되는 참가자 정보를 API와 통일 #68

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

Open
lucaseunchae wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(timer): 소켓을 통해 연동되는 참가자 정보를 API와 통일 #68

Show file tree
Hide file tree
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
17 changes: 7 additions & 10 deletions services/timerService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import roomRepository from "../repositories/roomRepository.js";
import timerRepository from "../repositories/timerRepository.js";
import userRoomRepository from "../repositories/userRoomRepository.js";
import isEmptyArray from "../utils/isEmptyArray.js";
import roomService from "./roomService.js";

const timerService = {
async startTimer({ roomId, userIds }) {
Expand Down Expand Up @@ -54,12 +55,10 @@ const timerService = {
roomId,
});

const allParticipants = await userRoomRepository.findParticipants({
connection,
roomId,
});
const roomUsersAndActiveCount =
await roomService.getRoomUsersAndActiveCount({ roomId });

return { allParticipants };
return { roomUsersAndActiveCount };
} catch (error) {
throw error;
} finally {
Expand Down Expand Up @@ -90,12 +89,10 @@ const timerService = {
roomId,
});

const allParticipants = await userRoomRepository.findParticipants({
connection,
roomId,
});
const roomUsersAndActiveCount =
await roomService.getRoomUsersAndActiveCount({ roomId });

return { increasedCurrentCycles, allParticipants };
return { increasedCurrentCycles, roomUsersAndActiveCount };
} catch (error) {
throw error;
} finally {
Expand Down
4 changes: 2 additions & 2 deletions socket/room-detail/handlers/onRoomDetailConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ const onConnection = async (socket) => {
);

try {
const { users: allParticipants } =
const roomUsersAndActiveCount =
await roomService.getRoomUsersAndActiveCount({ roomId });

roomDetailNamespace
.to(roomId)
.emit(SOCKET_TIMER_EVENTS.SYNC_ALL_PARTICIPANTS, allParticipants);
.emit(SOCKET_TIMER_EVENTS.SYNC_ALL_PARTICIPANTS, roomUsersAndActiveCount);
} catch (error) {
socket.emit(SOCKET_TIMER_EVENTS.ERROR, {
message: SOCKET_TIMER_ERRORS.INTERNAL_SERVER_ERROR,
Expand Down
8 changes: 5 additions & 3 deletions socket/room-detail/handlers/onRoomDetailDisconnect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
SOCKET_TIMER_ERRORS,
SOCKET_TIMER_EVENTS,
} from "../../../constants.js";
import pool from "../../../db/pool.js";
import roomService from "../../../services/roomService.js";
import getAllLinkedUserIdsFromNamespace from "../../helpers/getAllLinkedUserIdsFromNamespace.js";
import getUserIdFromSocket from "../../helpers/getUserIdFromSocket.js";
Expand All @@ -29,12 +28,15 @@ const onRoomDetailDisconnect = async (socket) => {

// 참가자 목록 클라이언트에 동기화
try {
const { users: allParticipants } =
const roomUsersAndActiveCount =
await roomService.getRoomUsersAndActiveCount({ roomId });

roomDetailNamespace
.to(roomId)
.emit(SOCKET_TIMER_EVENTS.SYNC_ALL_PARTICIPANTS, allParticipants);
.emit(
SOCKET_TIMER_EVENTS.SYNC_ALL_PARTICIPANTS,
roomUsersAndActiveCount
);
} catch (error) {
socket.emit(SOCKET_TIMER_EVENTS.ERROR, {
message: SOCKET_TIMER_ERRORS.INTERNAL_SERVER_ERROR,
Expand Down
5 changes: 2 additions & 3 deletions socket/room-detail/helpers/getFinishCyclesTimeout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import camelcaseKeys from "camelcase-keys";
import { SOCKET_TIMER_EVENTS } from "../../../constants.js";
import timerService from "../../../services/timerService.js";
import { calculateTimerTotalMsWithDelay } from "./calculateMs.js";
Expand Down Expand Up @@ -31,15 +30,15 @@ const finishCyclesTimeoutGetter = ({ socket, roomInfo }) => {
.to(roomId)
.emit(SOCKET_TIMER_EVENTS.SYNC_CURRENT_CYCLES, 0);

const { allParticipants } = await timerService.finishTimer({
const { roomUsersAndActiveCount } = await timerService.finishTimer({
roomId,
});

roomDetailNamespace
.to(roomId)
.emit(
SOCKET_TIMER_EVENTS.SYNC_ALL_PARTICIPANTS,
camelcaseKeys(allParticipants)
roomUsersAndActiveCount
);

resolve();
Expand Down
5 changes: 2 additions & 3 deletions socket/room-detail/helpers/getPomodoroInterval.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import camelcaseKeys from "camelcase-keys";
import { SOCKET_TIMER_EVENTS } from "../../../constants.js";
import timerService from "../../../services/timerService.js";
import { calculateOnePomodoroMs } from "./calculateMs.js";
Expand All @@ -25,14 +24,14 @@ const getPomodoroInterval = ({ socket, roomInfo }) => {
try {
console.log(pomodoroCount + 1, "뽀모도로 끝");

const { increasedCurrentCycles, allParticipants } =
const { increasedCurrentCycles, roomUsersAndActiveCount } =
await timerService.finishPomodoro({ roomId });

roomDetailNamespace
.to(roomId)
.emit(
SOCKET_TIMER_EVENTS.SYNC_ALL_PARTICIPANTS,
camelcaseKeys(allParticipants)
roomUsersAndActiveCount
);
roomDetailNamespace
.to(roomId)
Expand Down