Merge pull request #128 from sliit-foss/development

Perf: added lean to a few queries

Author: Akalanka47000

src/models/setting.js

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
 
-const LeaderboardSchema = mongoose.Schema({
+const LeaderboardSchema = new mongoose.Schema({
  freezed: {
  type: Boolean,
  default: false
@@ -15,7 +15,7 @@ const LeaderboardSchema = mongoose.Schema({
  }
 });
 
-const SettingSchema = mongoose.Schema(
+const SettingSchema = new mongoose.Schema(
  {
  submission_deadline: {
  type: Date,

src/models/submission.js

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import mongoosePaginate from 'mongoose-paginate-v2';
 
-const SubmissionSchema = mongoose.Schema(
+const SubmissionSchema = new mongoose.Schema(
  {
  user: {
  type: mongoose.Schema.Types.ObjectId,

src/repository/question/index.js

@@ -51,7 +51,7 @@ export const getQuestionById = (id, user) => {
 };
 
 export const findAndUpdateQuestion = (filters, data) => {
- return Question.findOneAndUpdate(filters, data, { new: true });
+ return Question.findOneAndUpdate(filters, data, { new: true }).lean();
 };
 
 export const deleteAQuestion = (filters) => {

src/repository/settings.js

@@ -5,7 +5,7 @@ export const getSettingsDoc = () => {
 };
 
 export const updateSettingsDoc = async (settings) => {
- await Setting.findOneAndUpdate({}, settings, { new: true, upsert: true });
+ await Setting.findOneAndUpdate({}, settings, { new: true, upsert: true }).lean();
 };
 
 export const getRegistrationDeadline = async () => {

src/repository/submission.js

@@ -1,10 +1,7 @@
-import { moduleLogger } from '@sliit-foss/module-logger';
 import { ROLE } from '@/constants';
 import { Submission } from '@/models';
 import { prefixObjectKeys } from '@/utils';
 
-const logger = moduleLogger('Submission-repository');
-
 export const insertSubmission = (userId, question, link) => {
  return Submission.create({
  user: userId,
@@ -30,14 +27,11 @@ export const getSubmissions = ({ sort = {}, filter = {}, page, limit = 10 }) =>
  collation: {
  locale: 'en'
  },
- populate
+ populate,
+ lean: true
  };
- return page
- ? Submission.paginate(filter, options).catch((err) => {
- logger.error(`An error occurred when retrieving submissions - err: ${err.message}`);
- throw err;
- })
- : Submission.find(filter).sort(sort).populate(populate).lean();
+
+ return page ? Submission.paginate(filter, options) : Submission.find(filter).sort(sort).populate(populate).lean();
 };
 
 export const getSubmissionById = (id) => {
@@ -53,7 +47,7 @@ export const insertGrade = async (submission, score, automated, userId) => {
  { _id: submission },
  { score, graded_by: userId, automatically_graded: automated },
  { upsert: true }
- );
+ ).lean();
 };
 
 export const getDistinctSubmissions = (questionId) => {

src/repository/user.js

@@ -1,9 +1,6 @@
-import { moduleLogger } from '@sliit-foss/module-logger';
 import { ROLE } from '@/constants';
 import { User } from '@/models';
 
-const logger = moduleLogger('User-repository');
-
 export const createUser = async (user) => {
  const newUser = (await new User(user).save()).toObject();
  delete newUser.password;
@@ -59,10 +56,7 @@ export const getAllUsers = ({ sort = {}, filter = {}, page, limit = 10 }) => {
  { $unset: ['password', 'verification_code', 'submissions'] }
  ]);
 
- return (page ? User.aggregatePaginate(pipeline, options) : pipeline).catch((err) => {
- logger.error(`An error occurred when retrieving users - err: ${err.message}`);
- throw err;
- });
+ return page ? User.aggregatePaginate(pipeline, options) : pipeline;
 };
 
 export const getOneUser = async (filters, returnPassword = false) => {