Revert "update to newest mongoose"

This reverts commit 7b05891ba0e87e4cf00fd6b1ea87d7406dc70989.
This commit is contained in:
Shane Kilkelly
2017-05-10 15:31:17 +01:00
parent 08567ff220
commit 01ee104f77
15 changed files with 95 additions and 77 deletions
@@ -2,7 +2,7 @@ logger = require('logger-sharelatex')
async = require("async")
metrics = require('metrics-sharelatex')
Settings = require('settings-sharelatex')
ObjectId = require('../../infrastructure/Mongoose').Types.ObjectId
ObjectId = require('mongoose').Types.ObjectId
Project = require('../../models/Project').Project
Folder = require('../../models/Folder').Folder
ProjectEntityHandler = require('./ProjectEntityHandler')
@@ -534,7 +534,7 @@ module.exports = ProjectEntityHandler =
fileSystem: "#{path.fileSystem}/#{element.name}"
mongo: path.mongo
id = element._id+''
element._id = require('../../infrastructure/Mongoose').Types.ObjectId(id)
element._id = require('mongoose').Types.ObjectId(id)
conditions = _id:project._id
mongopath = "#{path.mongo}.#{type}"
update = "$push":{}
@@ -1,6 +1,6 @@
Subscription = require('../../models/Subscription').Subscription
logger = require("logger-sharelatex")
ObjectId = require('../../infrastructure/Mongoose').Types.ObjectId
ObjectId = require('mongoose').Types.ObjectId
module.exports =
@@ -6,7 +6,7 @@ UserFeaturesUpdater = require("./UserFeaturesUpdater")
PlansLocator = require("./PlansLocator")
Settings = require("settings-sharelatex")
logger = require("logger-sharelatex")
ObjectId = require('../../infrastructure/Mongoose').Types.ObjectId
ObjectId = require('mongoose').Types.ObjectId
ReferalAllocator = require("../Referal/ReferalAllocator")
oneMonthInSeconds = 60 * 60 * 24 * 30
@@ -2,8 +2,6 @@ mongoose = require('mongoose')
Settings = require 'settings-sharelatex'
logger = require('logger-sharelatex')
mongoose.Promise = global.Promise
mongoose.connect(Settings.mongo.url, server: poolSize: 10)
mongoose.connection.on 'connected', () ->
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose'
mongoose = require 'mongoose'
Settings = require 'settings-sharelatex'
Schema = mongoose.Schema
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose'
mongoose = require 'mongoose'
Settings = require 'settings-sharelatex'
Schema = mongoose.Schema
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require('../infrastructure/Mongoose')
mongoose = require('mongoose')
Settings = require 'settings-sharelatex'
DocSchema = require('./Doc').DocSchema
FileSchema = require('./File').FileSchema
@@ -1,4 +1,4 @@
mongoose = require('../infrastructure/Mongoose')
mongoose = require('mongoose')
Settings = require 'settings-sharelatex'
_ = require('underscore')
FolderSchema = require('./Folder.js').FolderSchema
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose'
mongoose = require 'mongoose'
Settings = require 'settings-sharelatex'
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose'
mongoose = require 'mongoose'
Settings = require 'settings-sharelatex'
Schema = mongoose.Schema
@@ -31,4 +31,4 @@ Subscription = conn.model('Subscription', SubscriptionSchema)
mongoose.model 'Subscription', SubscriptionSchema
exports.Subscription = Subscription
exports.SubscriptionSchema = SubscriptionSchema
exports.SubscriptionSchema = SubscriptionSchema
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose'
mongoose = require 'mongoose'
Settings = require 'settings-sharelatex'
Schema = mongoose.Schema
+1 -1
View File
@@ -1,7 +1,7 @@
Project = require('./Project').Project
Settings = require 'settings-sharelatex'
_ = require('underscore')
mongoose = require('../infrastructure/Mongoose')
mongoose = require('mongoose')
uuid = require('uuid')
Schema = mongoose.Schema
ObjectId = Schema.ObjectId