julien/adastra_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(skydive): migrate author field from ObjectId to UUID string

Browse Source 
- Register SkydiverProfile model in mysql.js (fixes startup crash on association)
- Replace $toObjectId with direct string match in all 12 aggregation queries
- Guard toJSONFor on all Mongo models to fall back to MySQL user.toProfileJSONFor()
  when author is a UUID string (restores username/image in API responses)
- Pass user to toJSONFor() everywhere instead of null
- Remove dead .populate('author') calls (author: String has no ref)
- Fix ownership check in /last route: compare author string to req.payload.id
  instead of the now-absent author.username property
This commit is contained in:
Julien Gautier
2026-04-26 04:27:47 +02:00
parent da1f9437ab
commit 66821427be
17 changed files with 64 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/passport-headerapikey.js
-1
View File
@@ -13,7 +13,6 @@ passport.use('headerapikey', new HeaderAPIKeyStrategy(
const salt = secret; const salt = secret;
Promise.resolve(bcrypt.hash(apikey, salt)).then(function (encryptedKey) { Promise.resolve(bcrypt.hash(apikey, salt)).then(function (encryptedKey) {
Application.findOne({ encryptedKey: encryptedKey }) Application.findOne({ encryptedKey: encryptedKey })
.populate('author')
.then(function (application) { .then(function (application) {
if (!application) { if (!application) {
return done({message: "Application can't be found.", status: 404}, false, false); return done({message: "Application can't be found.", status: 404}, false, false);
src/database/models/mongo/Aeronef.js
+3 -1
View File
@@ -26,7 +26,9 @@ AeronefSchema.methods.toJSONFor = function(user){
imat: this.imat, imat: this.imat,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toProfileJSONFor(user) author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user)
: (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
src/database/models/mongo/Application.js
+6 -2
View File
@@ -32,7 +32,9 @@ ApplicationSchema.methods.toJSONFor = function (user) {
description: this.description, description: this.description,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toProfileJSONFor(user) author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user)
: (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
@@ -44,7 +46,9 @@ ApplicationSchema.methods.toAuthJSON = function () {
description: this.description, description: this.description,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toJSONFor() author: this.author && typeof this.author.toJSONFor === 'function'
? this.author.toJSONFor()
: this.author ?? null
}; };
}; };
src/database/models/mongo/Canopy.js
+3 -1
View File
@@ -26,7 +26,9 @@ CanopySchema.methods.toJSONFor = function(user){
taille: this.taille, taille: this.taille,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toProfileJSONFor(user) author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user)
: (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
src/database/models/mongo/Dropzone.js
+3 -1
View File
@@ -26,7 +26,9 @@ DropzoneSchema.methods.toJSONFor = function(user){
oaci: this.oaci, oaci: this.oaci,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toProfileJSONFor(user) author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user)
: (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
src/database/models/mongo/Jump.js
+1 -1
View File
@@ -81,7 +81,7 @@ JumpSchema.methods.toJSONFor = function(user) {
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author && typeof this.author.toProfileJSONFor === 'function' author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user) ? this.author.toProfileJSONFor(user)
: this.author ?? null : (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
src/database/models/mongo/JumpFile.js
+3 -1
View File
@@ -35,7 +35,9 @@ JumpFileSchema.methods.toJSONFor = function(user){
type: this.type, type: this.type,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toProfileJSONFor(user) author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user)
: (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
src/database/models/mongo/X2DataLog.js
+3 -1
View File
@@ -100,7 +100,9 @@ X2DataLogSchema.methods.toJSONForUser = function(user) {
createdOn: this.createdOn, createdOn: this.createdOn,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toProfileJSONFor(user) author: this.author && typeof this.author.toProfileJSONFor === 'function'
? this.author.toProfileJSONFor(user)
: (user && typeof user.toProfileJSONFor === 'function' ? user.toProfileJSONFor() : this.author ?? null)
}; };
}; };
src/database/models/mongo/herowars/Clan.js
+3 -1
View File
@@ -48,7 +48,9 @@ HWClanSchema.methods.toJSONFor = function() {
topDungeon: this.topDungeon, topDungeon: this.topDungeon,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toJSONFor() author: this.author && typeof this.author.toJSONFor === 'function'
? this.author.toJSONFor()
: this.author ?? null
}; };
}; };
src/database/models/mongo/herowars/Member.js
+3 -1
View File
@@ -128,7 +128,9 @@ HWMemberSchema.methods.toJSONFor = function() {
serverId: this.serverId, serverId: this.serverId,
createdAt: this.createdAt, createdAt: this.createdAt,
updatedAt: this.updatedAt, updatedAt: this.updatedAt,
author: this.author.toJSONFor() author: this.author && typeof this.author.toJSONFor === 'function'
? this.author.toJSONFor()
: this.author ?? null
}; };
}; };
src/database/mysql.js
+2
View File
@@ -16,6 +16,7 @@ const TagModel = require('./models/mysql/Tag');
const TagListModel = require('./models/mysql/TagList'); const TagListModel = require('./models/mysql/TagList');
const UserModel = require('./models/mysql/User'); const UserModel = require('./models/mysql/User');
const UserRoleXrefModel = require('./models/mysql/UserRoleXref'); const UserRoleXrefModel = require('./models/mysql/UserRoleXref');
const SkydiverProfileModel = require('./models/mysql/SkydiverProfile');
const DB = { const DB = {
sequelize, sequelize,
@@ -35,6 +36,7 @@ const DB = {
Tag: TagModel(sequelize, DataTypes), Tag: TagModel(sequelize, DataTypes),
TagList: TagListModel(sequelize, DataTypes), TagList: TagListModel(sequelize, DataTypes),
UserRoleXref: UserRoleXrefModel(sequelize, DataTypes), UserRoleXref: UserRoleXrefModel(sequelize, DataTypes),
SkydiverProfile: SkydiverProfileModel(),
}; };
module.exports = DB; module.exports = DB;
src/routes/api/skydive/applications.routes.js
+1 -4
View File
@@ -10,7 +10,6 @@ mailer.setApiKey(process.env.SENDGRID_API_KEY);
// Preload application objects on routes with ':application' // Preload application objects on routes with ':application'
router.param('application', function (req, res, next, slug) { router.param('application', function (req, res, next, slug) {
Application.findOne({ slug: slug }) Application.findOne({ slug: slug })
.populate('author')
.then(function (application) { .then(function (application) {
if (!application) { if (!application) {
return res.sendStatus(404); return res.sendStatus(404);
@@ -52,7 +51,6 @@ router.get('/', auth.required, function (req, res, next) {
.skip(Number(offset)) .skip(Number(offset))
.limit(Number(limit)) .limit(Number(limit))
.sort({ createdAt: 'desc' }) .sort({ createdAt: 'desc' })
.populate('author')
.exec(), .exec(),
Application.countDocuments(query).exec(), Application.countDocuments(query).exec(),
req.payload ? UserService.getUserById(req.payload.id) : null req.payload ? UserService.getUserById(req.payload.id) : null
@@ -117,8 +115,7 @@ router.post('/', auth.required, function (req, res, next) {
*/ */
router.get('/:application', auth.required, function (req, res, next) { router.get('/:application', auth.required, function (req, res, next) {
Promise.all([ Promise.all([
req.payload ? UserService.getUserById(req.payload.id) : null, req.payload ? UserService.getUserById(req.payload.id) : null
req.application.populate('author')
]).then(function (results) { ]).then(function (results) {
let user = results[0]; let user = results[0];
return res.json({ application: req.application.toJSONFor(user) }); return res.json({ application: req.application.toJSONFor(user) });
src/routes/api/skydive/jumps.routes.js
+8 -10
View File
@@ -13,7 +13,6 @@ const { UserService } = require('../../../services');
// Preload jump objects on routes with ':jump' // Preload jump objects on routes with ':jump'
router.param('jump', function (req, res, next, slug) { router.param('jump', function (req, res, next, slug) {
Jump.findOne({ slug: slug }) Jump.findOne({ slug: slug })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.then(function (jump) { .then(function (jump) {
@@ -98,7 +97,6 @@ router.get('/', auth.required, function (req, res, next) {
.skip(Number(offset)) .skip(Number(offset))
.limit(Number(limit)) .limit(Number(limit))
.sort({ numero: 'desc' }) .sort({ numero: 'desc' })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.exec(), .exec(),
@@ -107,9 +105,10 @@ router.get('/', auth.required, function (req, res, next) {
]).then(function (results) { ]).then(function (results) {
let jumps = results[0]; let jumps = results[0];
let jumpsCount = results[1]; let jumpsCount = results[1];
let user = results[2];
return res.json({ return res.json({
jumps: jumps.map(function (jump) { jumps: jumps.map(function (jump) {
return jump.toJSONFor(null); return jump.toJSONFor(user);
}), }),
jumpsCount: jumpsCount jumpsCount: jumpsCount
}); });
@@ -283,7 +282,6 @@ router.get('/last', auth.required, function (req, res, next) {
Jump.find({author: user.id}) Jump.find({author: user.id})
.limit(1) .limit(1)
.sort({ numero: 'desc' }) .sort({ numero: 'desc' })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.exec() .exec()
@@ -292,10 +290,10 @@ router.get('/last', auth.required, function (req, res, next) {
return res.status(404).json({ errors: { "Not Found": "aucun saut trouvé" } }); return res.status(404).json({ errors: { "Not Found": "aucun saut trouvé" } });
} }
req.lastjump = jumps[0]; req.lastjump = jumps[0];
if (req.lastjump.author.username !== req.payload.username) { if (req.lastjump.author !== req.payload.id) {
return res.status(403).json({ errors: { "Forbidden": "Vous ne disposez pas des autorisations suffisantes" } }); return res.status(403).json({ errors: { "Forbidden": "Vous ne disposez pas des autorisations suffisantes" } });
} }
return res.json({ jump: req.lastjump.toJSONFor(null) }); return res.json({ jump: req.lastjump.toJSONFor(user) });
}).catch(next); }).catch(next);
}).catch(next); }).catch(next);
}); });
@@ -317,7 +315,7 @@ router.get('/:jump', auth.required, function (req, res, next) {
Jump.findOne({numero: (req.jump.numero + 1)}).exec(), Jump.findOne({numero: (req.jump.numero + 1)}).exec(),
]).then(function (results) { ]).then(function (results) {
return res.json({ return res.json({
jump: req.jump.toJSONFor(null), jump: req.jump.toJSONFor(user),
prevJump: results[0], prevJump: results[0],
nextJump: results[1] nextJump: results[1]
}); });
@@ -336,7 +334,7 @@ router.post('/', auth.required, function (req, res, next) {
let jump = new Jump(req.body.jump); let jump = new Jump(req.body.jump);
jump.author = user.id; jump.author = user.id;
return jump.save().then(function () { return jump.save().then(function () {
return res.json({ jump: jump.toJSONFor(null) }); return res.json({ jump: jump.toJSONFor(user) });
}); });
}).catch(next); }).catch(next);
}); });
@@ -366,7 +364,7 @@ router.post('/data/:jump', auth.required, function (req, res, next) {
req.jump.files = files; req.jump.files = files;
req.jump.x2data = x2data; req.jump.x2data = x2data;
Jump.updateOne({_id: req.jump._id}, {files: files, x2data: x2data._id}).then(function () { Jump.updateOne({_id: req.jump._id}, {files: files, x2data: x2data._id}).then(function () {
return res.json({ jump: req.jump.toJSONFor(null) }); return res.json({ jump: req.jump.toJSONFor(user) });
}).catch(next); }).catch(next);
}).catch(next); }).catch(next);
}).catch(next); }).catch(next);
@@ -492,7 +490,7 @@ router.put('/:jump', auth.required, function (req, res, next) {
} }
return req.jump.save().then(function (jump) { return req.jump.save().then(function (jump) {
return res.json({ jump: jump.toJSONFor(null) }); return res.json({ jump: jump.toJSONFor(user) });
}); });
}).catch(next); }).catch(next);
}); });
src/routes/api/skydive/pages.routes.js
+4 -8
View File
@@ -23,7 +23,6 @@ router.get('/aeronefs', auth.required, function (req, res, next) {
.limit(1) .limit(1)
.skip(0) .skip(0)
.sort({ numero: 'desc' }) .sort({ numero: 'desc' })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.exec(), .exec(),
@@ -37,7 +36,7 @@ router.get('/aeronefs', auth.required, function (req, res, next) {
.exec() .exec()
]).then(function (results) { ]).then(function (results) {
if (results[0].length) { if (results[0].length) {
let lastjump = results[0][0].toJSONFor(null); let lastjump = results[0][0].toJSONFor(user);
let aeronefsByImat = results[1].map(function (data) { let aeronefsByImat = results[1].map(function (data) {
return { aeronef: data._id.aeronef, imat: data._id.imat, count: data.count }; return { aeronef: data._id.aeronef, imat: data._id.imat, count: data.count };
}); });
@@ -79,7 +78,6 @@ router.get('/canopies', auth.required, function (req, res, next) {
.limit(1) .limit(1)
.skip(0) .skip(0)
.sort({ numero: 'desc' }) .sort({ numero: 'desc' })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.exec(), .exec(),
@@ -101,7 +99,7 @@ router.get('/canopies', auth.required, function (req, res, next) {
.exec() .exec()
]).then(function (results) { ]).then(function (results) {
if (results[0].length) { if (results[0].length) {
let lastjump = results[0][0].toJSONFor(null); let lastjump = results[0][0].toJSONFor(user);
let canopiesBySize = results[1].map(function (data) { let canopiesBySize = results[1].map(function (data) {
return { taille: data._id.taille, count: data.count }; return { taille: data._id.taille, count: data.count };
}); });
@@ -146,7 +144,6 @@ router.get('/dropzones', auth.required, function (req, res, next) {
.limit(1) .limit(1)
.skip(0) .skip(0)
.sort({ numero: 'desc' }) .sort({ numero: 'desc' })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.exec(), .exec(),
@@ -160,7 +157,7 @@ router.get('/dropzones', auth.required, function (req, res, next) {
.exec() .exec()
]).then(function (results) { ]).then(function (results) {
if (results[0].length) { if (results[0].length) {
let lastjump = results[0][0].toJSONFor(null); let lastjump = results[0][0].toJSONFor(user);
let dropZonesByOaci = results[1].map(function (data) { let dropZonesByOaci = results[1].map(function (data) {
return { lieu: data._id.lieu, oaci: data._id.oaci, count: data.count }; return { lieu: data._id.lieu, oaci: data._id.oaci, count: data.count };
}); });
@@ -197,7 +194,6 @@ router.get('/jumps', auth.required, function (req, res, next) {
.limit(1) .limit(1)
.skip(0) .skip(0)
.sort({ numero: 'desc' }) .sort({ numero: 'desc' })
.populate('author')
.populate('files') .populate('files')
.populate('x2data') .populate('x2data')
.exec(), .exec(),
@@ -223,7 +219,7 @@ router.get('/jumps', auth.required, function (req, res, next) {
.exec() .exec()
]).then(function (results) { ]).then(function (results) {
if (results[0].length) { if (results[0].length) {
let lastjump = results[0][0].toJSONFor(null); let lastjump = results[0][0].toJSONFor(user);
let jumpsByYears = results[1].map(function (data) { let jumpsByYears = results[1].map(function (data) {
return { year: data._id.year, count: data.count }; return { year: data._id.year, count: data.count };
}); });
src/routes/queries.js
+21 -81
View File
@@ -2,11 +2,7 @@ const queries = {
getJumpsByCategoryQuery: (userId) => { getJumpsByCategoryQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$group': { '$group': {
'_id': { '_id': {
@@ -28,11 +24,7 @@ const queries = {
getJumpsByDateQuery: (userId) => { getJumpsByDateQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -65,11 +57,7 @@ const queries = {
getJumpsByModuleByDateQuery: (userId) => { getJumpsByModuleByDateQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -105,11 +93,7 @@ const queries = {
getJumpsByModuleQuery: (userId) => { getJumpsByModuleQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -137,11 +121,7 @@ const queries = {
getJumpByYearsQuery: (userId) => { getJumpByYearsQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -170,17 +150,13 @@ const queries = {
getAeronefsByImatQuery: (userId) => { getAeronefsByImatQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$group': { '$group': {
'_id': { '_id': {
'aeronef': '$aeronef', 'aeronef': '$aeronef',
'imat': '$imat' 'imat': '$imat'
}, },
'count': { 'count': {
'$sum': 1 '$sum': 1
} }
@@ -198,11 +174,7 @@ const queries = {
getAeronefsByImatByYearQuery: (userId) => { getAeronefsByImatByYearQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -235,16 +207,12 @@ const queries = {
getCanopiesBySizeQuery: (userId) => { getCanopiesBySizeQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$group': { '$group': {
'_id': { '_id': {
'taille': '$taille' 'taille': '$taille'
}, },
'count': { 'count': {
'$sum': 1 '$sum': 1
} }
@@ -262,11 +230,7 @@ const queries = {
getCanopiesBySizeByYearQuery: (userId) => { getCanopiesBySizeByYearQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -297,17 +261,13 @@ const queries = {
getCanopiesBySizeByModelQuery: (userId) => { getCanopiesBySizeByModelQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$group': { '$group': {
'_id': { '_id': {
'taille': '$taille', 'taille': '$taille',
'voile': '$voile' 'voile': '$voile'
}, },
'count': { 'count': {
'$sum': 1 '$sum': 1
} }
@@ -325,11 +285,7 @@ const queries = {
getCanopiesBySizeByModelByYearQuery: (userId) => { getCanopiesBySizeByModelByYearQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -362,17 +318,13 @@ const queries = {
getDropZonesByOaciQuery: (userId) => { getDropZonesByOaciQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$group': { '$group': {
'_id': { '_id': {
'lieu': '$lieu', 'lieu': '$lieu',
'oaci': '$oaci' 'oaci': '$oaci'
}, },
'count': { 'count': {
'$sum': 1 '$sum': 1
} }
@@ -390,11 +342,7 @@ const queries = {
getDropZonesByOaciByYearQuery: (userId) => { getDropZonesByOaciByYearQuery: (userId) => {
let query = [ let query = [
{ {
'$match': { '$match': { 'author': userId }
'$expr': {
'$eq': [ '$author' , { '$toObjectId': userId } ]
}
}
}, { }, {
'$project': { '$project': {
'_id': 0, '_id': 0,
@@ -435,18 +383,10 @@ const queries = {
let query = [ let query = [
{ {
$match: { $match: {
$expr: { author: userId,
$and: [ date: {
{ $gte: new Date(dateRangeStart),
$eq: [ '$author' , { '$toObjectId': userId } ] $lte: new Date(dateRangeEnd)
},
{
$gte: ['$date', new Date(dateRangeStart)]
},
{
$lte: ['$date', new Date(dateRangeEnd)]
}
]
} }
} }
}, { }, {
src/services/mongo/clan.service.js
-3
View File
@@ -16,7 +16,6 @@ class ClanService {
.skip(Number(offset)) .skip(Number(offset))
.limit(Number(limit)) .limit(Number(limit))
.sort({ title: 'asc' }) .sort({ title: 'asc' })
.populate('author')
.exec(), .exec(),
HWClan.count(query).exec() HWClan.count(query).exec()
]).then(function (results) { ]).then(function (results) {
@@ -31,7 +30,6 @@ class ClanService {
static async getClanById(id) { static async getClanById(id) {
return HWClan.findOne({ id: id }) return HWClan.findOne({ id: id })
.populate('author')
.then(function (clan) { .then(function (clan) {
if (!clan) { if (!clan) {
return null; return null;
@@ -42,7 +40,6 @@ class ClanService {
static async getClanByTitle(title) { static async getClanByTitle(title) {
return HWClan.findOne({ title: title }) return HWClan.findOne({ title: title })
.populate('author')
.then(function (clan) { .then(function (clan) {
if (!clan) { if (!clan) {
return null; return null;
src/services/mongo/member.service.js
-3
View File
@@ -16,7 +16,6 @@ class MemberService {
.skip(Number(offset)) .skip(Number(offset))
.limit(Number(limit)) .limit(Number(limit))
.sort({ name: 'asc' }) .sort({ name: 'asc' })
.populate('author')
.exec(), .exec(),
HWMember.count(query).exec() HWMember.count(query).exec()
]).then(function (results) { ]).then(function (results) {
@@ -31,7 +30,6 @@ class MemberService {
static async getMemberById(id) { static async getMemberById(id) {
return HWMember.findOne({ id: id }) return HWMember.findOne({ id: id })
.populate('author')
.then(function (member) { .then(function (member) {
if (!member) { if (!member) {
return null; return null;
@@ -42,7 +40,6 @@ class MemberService {
static async getMemberByName(name) { static async getMemberByName(name) {
return HWMember.findOne({ name: name }) return HWMember.findOne({ name: name })
.populate('author')
.then(function (member) { .then(function (member) {
if (!member) { if (!member) {
return null; return null;