- Removed cruising stuff

- Added support for user submitted profiles
This commit is contained in:
2018-05-29 00:30:12 -04:00
parent 2248ba0ab1
commit bc4c5284f8
4 changed files with 113 additions and 511 deletions

View File

@@ -1,303 +0,0 @@
const Geos = require('../modules/geocoder');
const Images = require('../modules/images');
const Logger = require('../modules/logger');
const Mongoose = require('mongoose');
const CruiseSchema = new Mongoose.Schema({
order: { type: Number, default: 0 },
location: {
address: {
street1: String,
street2: String,
locality: {
type: String,
index: true
},
region: {
type: String,
index: true
},
postal: {
type: String,
index: true
},
country: {
type: String,
index: true
}
},
loc: {
type: {
type: String,
default: 'Point'
},
coordinates: [{
type: Number,
default: [0, 0]
}]
}
},
name: String,
pic: {
detail: {
type: String,
default: 'cruise/default_detail.png'
},
thumb: {
type: String,
default: 'cruise/default_thumbnail.png'
}
},
text: String
});
//CruiseSchema.index({ 'location.loc': '2dsphere' });
CruiseSchema.pre('findOneAndUpdate', function (next) {
var cnt = 0
var pic;
if (this.details && this.details.pic) {
pic = this.details.pic;
cnt = cnt + (typeof pic.detail === 'object' ? 1 : 0) + (typeof pic.thumb === 'object' ? 1 : 0);
}
if (cnt > 0) {
if (typeof pic.detail === 'object') {
Images.saveCruiseDetailImage(pic.detail, (err, filename) => {
if (err) {
Logger.error('[CruiseSchema.pre(save)] There was an error processing the cruise image. [' + err + ']', { error: err });
}
if (filename) {
pic.detail = filename;
cnt -= 1;
if (cnt === 0) next();
}
});
}
if (typeof pic.thumb === 'object') {
Images.saveCruiseThumbnailImage(pic.thumb, (err, filename) => {
if (err) {
Logger.error('[CruiseSchema.pre(save)] There was an error processing the cruise image. [' + err + ']', { error: err });
}
if (filename) {
pic.thumb = filename;
cnt -= 1;
if (cnt === 0) next();
}
});
}
} else {
next();
}
});
CruiseSchema.pre('save', function (next) {
var cnt = 0;
var pic;
if (this.details && this.details.pic) {
pic = this.details.pic
cnt = cnt + (typeof pic.detail === 'object' ? 1 : 0) + (typeof pic.thumb === 'object' ? 1 : 0);
}
if (cnt > 0) {
if (typeof pic.detail === 'object') {
Images.saveCruiseDetailImage(pic.detail, (err, filename) => {
if (err) {
Logger.error('[CruiseSchema.pre(save)] There was an error processing the cruise image. [' + err + ']', { error: err });
}
if (filename) {
pic.detail = filename;
cnt -= 1;
if (cnt === 0) next();
}
});
}
if (typeof pic.thumb === 'object') {
Images.saveCruiseThumbnailImage(pic.thumb, (err, filename) => {
if (err) {
Logger.error('[CruiseSchema.pre(save)] There was an error processing the cruise image. [' + err + ']', { error: err });
}
if (filename) {
pic.thumb = filename;
cnt -= 1;
if (cnt === 0) next();
}
});
}
} else {
next();
}
});
const CruiseModel = Mongoose.model('cruises', CruiseSchema);
module.exports = {
all: (e) => {
const promise = new Promise((resolve, reject) => {
CruiseModel
.find({})
.sort({ order: 1 })
.exec((err, result) => {
if (err) {
reject(err);
}
if (result) {
resolve(result);
}
});
});
promise.then((result) => {
e.emit('all', null, result);
})
.catch((err) => {
e.emit('all', err, null);
});
},
create: (e, cruises) => {
var count = cruises.length;
var errors = [];
var results = [];
const promise = new Promise((resolve, reject) => {
for (let i = 0; i < cruises.length; i++) {
var cruise = cruises[i];
var cruiseInstance = new CruiseModel(cruise);
cruiseInstance.save((err, result) => {
if (err) {
count -= 1;
errors.push({
cruise: cruise,
error: err
});
if (count === 0) {
reject({ results: results, errors: errors });
}
}
if (result) {
count -= 1;
results.push(result);
if (count === 0) {
resolve({ results: results, errors: errors });
}
}
});
}
});
promise.then((result) => {
e.emit('create', null, result);
})
.catch((err) => {
e.emit('create', err, null);
});
},
delete: (e, id) => {
const promise = new Promise((resolve, reject) => {
CruiseModel.remove({ _id: id }, (err, result) => {
if (err) {
reject(err);
}
if (result) {
resolve(result);
}
});
});
promise.then((result) => {
e.emit('delete', null, result);
})
.catch((err) => {
e.emit('delete', err, null);
});
},
find: (e, find) => {
const promise = new Promise((resolve, reject) => {
var query = CruiseModel
.find(find.find)
.skip(find.options.skip)
.limit(find.options.limit)
.sort(find.options.sort)
.select(find.select || '')
.exec((err, results) => {
if (err) {
reject(err);
}
if (results) {
resolve(results);
}
});
});
promise.then((result) => {
e.emit('find', null, result);
})
.catch((err) => {
e.emit('find', err, null);
});
},
get: (e, id) => {
const promise = new Promise((resolve, reject) => {
CruiseModel.findById(id, (err, result) => {
if (err) {
reject(err);
}
if (result) {
resolve(result);
}
});
});
promise.then((result) => {
e.emit('get', null, result);
})
.catch((err) => {
e.emit('get', err, null);
});
},
update: (e, id, cruise) => {
const promise = new Promise((resolve, reject) => {
CruiseModel.findOneAndUpdate(
{ _id: id },
{ $set: cruise },
{ new: true },
(err, result) => {
if (err) {
reject(err);
}
if (result) {
resolve(result);
}
});
});
promise.then((result) => {
e.emit('update', null, result);
})
.catch((err) => {
e.emit('update', err, null);
});
}
};

View File

@@ -26,7 +26,8 @@ const ProfileSchema = new Mongoose.Schema({
"tested": { type: Date },
"tribe": [{ type: String, enum: ['twink','trans','poz','leather','geek','discreet','otter','bear','daddy','jock','clean-cut'] }]
},
"messages" : [ { type: Messages.schema } ]
"messages": [ { type: Messages.schema } ],
"submitted": { type: Boolean, default: false }
});
ProfileSchema.pre('findOneAndUpdate', function (next) {
@@ -162,6 +163,64 @@ module.exports = {
});
},
allSubmitted: (e) => {
const promise = new Promise((resolve, reject) => {
ProfileModel
.find({ submitted: { $eq: true } })
.sort({ order: 1 })
.populate({
path: 'messages',
select: 'text image isUser timestamp',
options: { sort: { timestamp: 1 } }
})
.exec((err, result) => {
if (err) {
reject(err);
}
if (result) {
resolve(result);
}
});
});
promise.then((result) => {
e.emit('all', null, result);
})
.catch((err) => {
e.emit('all', err, null);
});
},
allVerified: (e) => {
const promise = new Promise((resolve, reject) => {
ProfileModel
.find({ submitted: { $in: [ null, false ] } })
.sort({ order: 1 })
.populate({
path: 'messages',
select: 'text image isUser timestamp',
options: { sort: { timestamp: 1 } }
})
.exec((err, result) => {
if (err) {
reject(err);
}
if (result) {
resolve(result);
}
});
});
promise.then((result) => {
e.emit('all', null, result);
})
.catch((err) => {
e.emit('all', err, null);
});
},
allMessages: (e, profileId) => {
const promise = new Promise((resolve, reject) => {
ProfileModel

View File

@@ -1,206 +0,0 @@
const Cruises = require('../models/cruise');
const EventEmitter = require('events');
const Express = require('express');
const ParamStr = '/:limit?/:skip?/:locale?/:distance?';
const Router = Express.Router();
const Token = require('../modules/token');
function processQueryParams (params) {
var query = {};
if (params.locale) {
var geo = {}; // geocode locale
query['location.loc'] = { $near: geo };
}
return query;
}
function update (req, res, next) {
Token.verifyThen(req.get('authorization'), 'update', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var CruiseEvents = new EventEmitter();
var id = req.params.id;
var data = req.body;
if (!id || !data) {
res.status(500).json({ message: 'No cruise id or data specified.', err: err });
return;
}
CruiseEvents.once('update', (err, result) => {
if (err) {
res.status(500).json({message: 'Could not update cruise id: ' + id, err: err});
}
if (result) {
res.status(200).json(result);
}
});
Cruises.update(CruiseEvents, id, data);
}
});
}
Router.route('/find' + ParamStr)
.get((req, res) => {
Token.verifyThen(req.get('authorization'), 'view', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var CruiseEvents = new EventEmitter();
var find = processQueryParams(req.params);
var query = {
find: find,
select: null,
options: {
limit: !isNaN(parseInt(req.params.limit)) ? parseInt(req.params.limit) : 0,
skip: !isNaN(parseInt(req.params.skip)) ? parseInt(req.params.skip) : 0,
sort: { 'order': 1 }
}
};
CruiseEvents.once('find', (err, result) => {
if (err) {
res.status(500).json({ message: 'There was an error getting the getting the cruises [' + err + ']', err: err });
}
if (result) {
res.status(200).json(result);
}
});
Cruises.find(CruiseEvents, query);
}
});
});
Router.route('/list' + ParamStr)
.get((req, res) => {
Token.verifyThen(req.get('authorization'), 'view', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var CruiseEvents = new EventEmitter();
var find = processQueryParams(req.params);
var query = {
find: find,
select: { order: 1, 'details.name': 1, 'details.pic.thumb': 1 },
options: {
limit: (!isNaN(parseInt(req.params.limit)) ? parseInt(req.params.limit) : 0),
skip: (!isNaN(parseInt(req.params.skip)) ? parseInt(req.params.skip) : 0),
sort: { 'order': 1 }
}
};
CruiseEvents.once('find', (err, result) => {
if (err) {
res.status(500).json({ message: 'There was an error getting the cruise list [' + err + ']', err: err });
}
if (result) {
res.status(200).json(result);
}
});
Cruises.find(CruiseEvents, query);
}
});
});
Router.route('/:id?')
.delete( (req, res) => {
Token.verifyThen(req.get('authorization'), 'delete', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var CruiseEvents = new EventEmitter();
var id = req.params.id;
CruiseEvents.once('delete', (err, result) => {
if (err) {
res.status(500).json({message: 'Could not delete cruise id: ' + id, err: err});
}
if (result) {
res.status(204).json({});
}
});
Cruises.delete(CruiseEvents, id);
}
});
})
.get( (req, res) => {
Token.verifyThen(req.get('authorization'), 'view', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var CruiseEvents = new EventEmitter();
var id = req.params.id || null;
var method = id ? 'get' : 'all';
CruiseEvents.once(method, (err, result) => {
if (err) {
res.status(500).json({ message: 'Could not get cruise' + (id ? '' : 's'), err: err });
}
if (result) {
res.status(200).json(result);
}
});
Cruises[method](CruiseEvents, id);
}
});
})
.patch( update )
.post((req, res) => {
Token.verifyThen(req.get('authorization'), 'add', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var CruiseEvents = new EventEmitter();
var cruise = Array.isArray(req.body) ? req.body : [ req.body ];
var multi = cruise.length > 1;
CruiseEvents.once('create', (err, result) => {
if (err) {
res.status(500).json({ message: 'Could not create cruise' + (multi ? 's' : ''), err: err, cruise: cruise });
}
if (result) {
res.status(200).json(result);
}
});
Cruises.create(CruiseEvents, cruise);
}
});
})
.put( update );
module.exports = Router;

View File

@@ -176,6 +176,58 @@ Router.route('/list' + ParamStr)
});
});
Router.route('/submitted')
.get( (req, res) => {
Token.verifyThen(req.get('authorization'), 'view', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var ProfileEvents = new EventEmitter();
ProfileEvents.once(method, (err, result) => {
if (err) {
res.status(500).json({ message: 'Could not get profiles', err: err });
}
if (result) {
res.status(200).json(result);
}
});
Profiles.allSubmitted(ProfileEvents);
}
});
});
Router.route('/verified')
.get( (req, res) => {
Token.verifyThen(req.get('authorization'), 'view', (err, decoded) => {
if (err || (decoded && !decoded.hasPermission)) {
res.status(403).json({ message: 'User not authorized to perform this action.', err: err });
return;
}
if (decoded && decoded.hasPermission) {
var ProfileEvents = new EventEmitter();
ProfileEvents.once(method, (err, result) => {
if (err) {
res.status(500).json({ message: 'Could not get profiles', err: err });
}
if (result) {
res.status(200).json(result);
}
});
Profiles.allVerified(ProfileEvents);
}
});
});
Router.route('/:profileId/messages/images/:which?')
.get((req, res) => {
Token.verifyThen(req.get('authorization'), 'view', (err, decoded) => {