diff --git a/server/src/api/controllers/sessionController.js b/server/src/api/controllers/sessionController.js index 6272215..aa37963 100644 --- a/server/src/api/controllers/sessionController.js +++ b/server/src/api/controllers/sessionController.js @@ -8,9 +8,7 @@ export async function getSessionList(req, res) { if (req.query.quest_id) { query.quest = req.query.quest_id } - if (req.query.status) { - query.status = req.query.status - } + query.status = req.query.status || 'active' const sessions = await Session.find(query) res.json( sessions.map( diff --git a/server/src/containers/expiryChecker.js b/server/src/containers/expiryChecker.js index e6aba70..2a24136 100644 --- a/server/src/containers/expiryChecker.js +++ b/server/src/containers/expiryChecker.js @@ -15,7 +15,7 @@ export async function removeExpired() { sessions.map(async (session) => { console.log('Expiring session: ', session._id, session.containerId) await deleteContainer(session.containerId) - session.status = 'deactive' + session.status = 'inactive' session.containerId = null await session.save() }) diff --git a/server/src/models/session.js b/server/src/models/session.js index 4757618..1ae266c 100644 --- a/server/src/models/session.js +++ b/server/src/models/session.js @@ -15,7 +15,7 @@ const Session = model( containerId: String, status: { type: String, - enum: ['active', 'finished', 'deactive'], + enum: ['active', 'finished', 'inactive'], required: true, default: 'active', }, diff --git a/server/swagger.yaml b/server/swagger.yaml index d2dfceb..34f9bf1 100644 --- a/server/swagger.yaml +++ b/server/swagger.yaml @@ -36,7 +36,7 @@ paths: description: find sessions by status schema: type: string - enum: [active, finished, deactive] + enum: [active, finished, inactive] responses: '200': description: list of existing session