Skip to content

Commit

Permalink
fixes ig
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsAnkan committed Jul 19, 2023
1 parent 7a36e54 commit 7646047
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion database/Schemas/Session.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const mongoose = require('mongoose');

const sessionSchema = new mongoose.Schema({
_id: { type: String, required: true, unique: true },
_id: { type: String, required: true },
userID: { type: Number, required: true }
}, { collection: 'event-session' });

Expand Down
2 changes: 1 addition & 1 deletion database/Schemas/User.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const mongoose = require('mongoose');

const userSchema = new mongoose.Schema({
_id: { type: Number, required: true, unique: true },
_id: { type: Number, required: true },

This comment has been minimized.

Copy link
@SachdevJai

SachdevJai Jul 19, 2023

Contributor

shouldn't user_id be unique?

This comment has been minimized.

Copy link
@ItsAnkan

ItsAnkan Jul 19, 2023

Author Member

if you're talking about User.js, _id by itself is unique
If you're talking about session, since we are not clearing out old session, a user can have multiple session id's

name: { type: String, required: true },
roll: { type: String, required: true, unique: true },
phone: { type: Number, required: true, unique: true },
Expand Down
9 changes: 2 additions & 7 deletions database/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ async function createUser (userData) {
}

async function getUserByUsername (username) {
return (await User.find({ 'username': `${username}` }))[0];
}

async function getUserByUserID (userID) {
return await User.findById(userID);
return await User.findOne({ 'username': `${username}` });
}

async function validateUser (userData) {
Expand All @@ -38,7 +34,7 @@ async function validateUser (userData) {

async function getUserFromSessionID (sessionId) {
const session = await Session.findById(sessionId);
const user = await getUserByUserID(session.userID);
const user = await User.findById(session.userID);
if (!user) throw new Error('User Not Found');
else return user;
}
Expand All @@ -63,7 +59,6 @@ module.exports = {
createUser,
validateUser,
getUserByUsername,
getUserByUserID,
getUserFromSessionID,
createSession,
removeSession
Expand Down

0 comments on commit 7646047

Please sign in to comment.