change model loaders to accept the Mongoose connection instead of using global

app/models/announcement.js

@@ -29,4 +29,6 @@ const AnnouncementSchema = new Schema({
   resourceStats: { type: ResourceStats, default: ResourceStatsDefaults, required: true },
 });
 
-module.exports = mongoose.model('Announcement', AnnouncementSchema);
+module.exports = (conn) => {
+  return conn.model('Announcement', AnnouncementSchema);
+};

app/models/attachment.js

@@ -61,4 +61,6 @@ AttachmentSchema.index({
   name: 'attachment_item_idx',
 });
 
-module.exports = mongoose.model('Attachment', AttachmentSchema);
+module.exports = (conn) => {
+  return conn.model('Attachment', AttachmentSchema);
+};

app/models/chat-message.js

@@ -28,4 +28,6 @@ const ChatMessageSchema = new Schema({
   attachments: { type: [Schema.ObjectId], ref: 'Attachment' },
 });
 
-module.exports = mongoose.model('ChatMessage', ChatMessageSchema);
+module.exports = (conn) => {
+  return conn.model('ChatMessage', ChatMessageSchema);
+};

app/models/chat-room-invite.js

@@ -27,4 +27,6 @@ ChatRoomInviteSchema.index({
   name: 'chatroom_invite_unique_idx',
 });
 
-module.exports = mongoose.model('ChatRoomInvite', ChatRoomInviteSchema);
+module.exports = (conn) => {
+  return conn.model('ChatRoomInvite', ChatRoomInviteSchema);
+};

app/models/chat-room.js

@@ -41,4 +41,6 @@ ChatRoomSchema.index({
   name: 'chatroom_public_open_idx',
 });
 
-module.exports = mongoose.model('ChatRoom', ChatRoomSchema);
+module.exports = (conn) => {
+  return conn.model('ChatRoom', ChatRoomSchema);
+};

app/models/comment.js

@@ -72,4 +72,6 @@ CommentSchema.index({
   name: 'comment_replies',
 });
 
-module.exports = mongoose.model('Comment', CommentSchema);
+module.exports = (conn) => {
+  return conn.model('Comment', CommentSchema);
+};

app/models/connect-token.js

@@ -16,4 +16,6 @@ const ConnectTokenSchema = new Schema({
   claimed: { type: Date },
 });
 
-module.exports = mongoose.model('ConnectToken', ConnectTokenSchema);
+module.exports = (conn) => {
+  return conn.model('ConnectToken', ConnectTokenSchema);
+};

app/models/content-report.js

@@ -28,4 +28,6 @@ ContentReportSchema.index({
   name: 'unique_user_content_report',
 });
 
-module.exports = mongoose.model('ContentReport', ContentReportSchema);
+module.exports = (conn) => {
+  return conn.model('ContentReport', ContentReportSchema);
+};

app/models/content-vote.js

@@ -23,4 +23,6 @@ ContentVoteSchema.index({
   name: 'unique_user_content_vote',
 });
 
-module.exports = mongoose.model('ContentVote', ContentVoteSchema);
+module.exports = (conn) => {
+  return conn.model('ContentVote', ContentVoteSchema);
+};

app/models/core-node-connect.js

@@ -30,4 +30,6 @@ const CoreNodeConnectSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('CoreNodeConnect', CoreNodeConnectSchema);
+module.exports = (conn) => {
+  return conn.model('CoreNodeConnect', CoreNodeConnectSchema);
+};

app/models/core-node-request.js

@@ -35,4 +35,6 @@ const CoreNodeRequestSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('CoreNodeRequest', CoreNodeRequestSchema);
+module.exports = (conn) => {
+  return conn.model('CoreNodeRequest', CoreNodeRequestSchema);
+};

app/models/core-node.js

@@ -45,4 +45,6 @@ CoreNodeSchema.index({
   name: 'core_address_idx',
 });
 
-module.exports = mongoose.model('CoreNode', CoreNodeSchema);
+module.exports = (conn) => {
+  return conn.model('CoreNode', CoreNodeSchema);
+};

app/models/core-user.js

@@ -52,4 +52,6 @@ CoreUserSchema.index({
   name: 'core_username_lc_unique',
 });
 
-module.exports = mongoose.model('CoreUser', CoreUserSchema);
+module.exports = (conn) => {
+  return conn.model('CoreUser', CoreUserSchema);
+};

app/models/csrf-token.js

@@ -17,4 +17,6 @@ const CsrfTokenSchema = new Schema({
   ip: { type: String, required: true },
 });
 
-module.exports = mongoose.model('CsrfToken', CsrfTokenSchema);
+module.exports = (conn) => {
+  return conn.model('CsrfToken', CsrfTokenSchema);
+};

app/models/email-blacklist.js

@@ -31,4 +31,6 @@ EmailBlacklistSchema.index({
   },
 });
 
-module.exports = mongoose.model('EmailBlacklist', EmailBlacklistSchema);
+module.exports = (conn) => {
+  return conn.model('EmailBlacklist', EmailBlacklistSchema);
+};

app/models/email-body.js

@@ -12,4 +12,6 @@ const EmailBodySchema = new Schema({
   body: { type: String, required: true },
 });
 
-module.exports = mongoose.model('EmailBody', EmailBodySchema);
+module.exports = (conn) => {
+  return conn.model('EmailBody', EmailBodySchema);
+};

app/models/email-log.js

@@ -16,4 +16,6 @@ const EmailLogSchema = new Schema({
   messageId: { type: String },
 });
 
-module.exports = mongoose.model('EmailLog', EmailLogSchema);
+module.exports = (conn) => {
+  return conn.model('EmailLog', EmailLogSchema);
+};

app/models/email-verify.js

@@ -15,4 +15,6 @@ const EmailVerifySchema = new Schema({
   token: { type: String, required: true },
 });
 
-module.exports = mongoose.model('EmailVerify', EmailVerifySchema);
+module.exports = (conn) => {
+  return conn.model('EmailVerify', EmailVerifySchema);
+};

app/models/email.js

@@ -17,4 +17,6 @@ const EmailSchema = new Schema({
   content: { type: Schema.ObjectId, required: true, index: true, refPath: 'contentType' },
 });
 
-module.exports = mongoose.model('Email', EmailSchema);
+module.exports = (conn) => {
+  return conn.model('Email', EmailSchema);
+};

app/models/emoji-reaction.js

@@ -36,4 +36,6 @@ const EmojiReactionSchema = new Schema({
   timestamp: { type: Number },
 });
 
-module.exports = mongoose.model('EmojiReaction', EmojiReactionSchema);
+module.exports = (conn) => {
+  return conn.model('EmojiReaction', EmojiReactionSchema);
+};

app/models/feed-entry.js

@@ -23,4 +23,6 @@ FeedEntrySchema.index({
   name: 'feed_entry_by_feed_idx',
 });
 
-module.exports = mongoose.model('FeedEntry', FeedEntrySchema);
+module.exports = (conn) => {
+  return conn.model('FeedEntry', FeedEntrySchema);
+};

app/models/feed.js

@@ -18,4 +18,6 @@ const FeedSchema = new Schema({
   published: { type: Date },
 });
 
-module.exports = mongoose.model('Feed', FeedSchema);
+module.exports = (conn) => {
+  return conn.model('Feed', FeedSchema);
+};

app/models/image.js

@@ -32,4 +32,6 @@ const ImageSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('Image', ImageSchema);
+module.exports = (conn) => {
+  return conn.model('Image', ImageSchema);
+};

app/models/kaleidoscope-event.js

@@ -58,4 +58,6 @@ KaleidoscopeEventSchema.index({
   name: 'evtsrc_site_author_index',
 });
 
-module.exports = mongoose.model('KaleidoscopeEvent', KaleidoscopeEventSchema);
+module.exports = (conn) => {
+  return conn.model('KaleidoscopeEvent', KaleidoscopeEventSchema);
+};

app/models/log.js

@@ -29,4 +29,6 @@ const LogSchema = new Schema({
   metadata: { type: Schema.Types.Mixed },
 });
 
-module.exports = mongoose.model('Log', LogSchema);
+module.exports = (conn) => {
+  return conn.model('Log', LogSchema);
+};

app/models/media-router.js

@@ -50,4 +50,6 @@ const MediaRouterSchema = new Schema({
   }
 });
 
-module.exports = mongoose.model('MediaRouter', MediaRouterSchema);
+module.exports = (conn) => {
+  return conn.model('MediaRouter', MediaRouterSchema);
+};

app/models/media-worker.js

@@ -40,4 +40,6 @@ const MediaWorkerSchema = new Schema({
   }
 });
 
-module.exports = mongoose.model('MediaWorker', MediaWorkerSchema);
+module.exports = (conn) => {
+  return conn.model('MediaWorker', MediaWorkerSchema);
+};

app/models/net-host-stats.js

@@ -72,4 +72,6 @@ const NetHostStatsSchema = new Schema({
   network: { type: [NetworkInterfaceStatsSchema], required: true },
 });
 
-module.exports = mongoose.model('NetHostStats', NetHostStatsSchema);
+module.exports = (conn) => {
+  return conn.model('NetHostStats', NetHostStatsSchema);
+};

app/models/net-host.js

@@ -42,4 +42,6 @@ const NetHostSchema = new Schema({
   network: { type: [NetworkInterfaceSchema] },
 });
 
-module.exports = mongoose.model('NetHost', NetHostSchema);
+module.exports = (conn) => {
+  return conn.model('NetHost', NetHostSchema);
+};

app/models/newsletter-recipient.js

@@ -18,4 +18,6 @@ const NewsletterRecipientSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('NewsletterRecipient', NewsletterRecipientSchema);
+module.exports = (conn) => {
+  return conn.model('NewsletterRecipient', NewsletterRecipientSchema);
+};

app/models/newsletter.js

@@ -28,4 +28,6 @@ const NewsletterSchema = new Schema({
   },
 });
 
-module.exports = mongoose.model('Newsletter', NewsletterSchema);
+module.exports = (conn) => {
+  return conn.model('Newsletter', NewsletterSchema);
+};

app/models/oauth2-authorization-code.js

@@ -16,4 +16,6 @@ const OAuth2AuthorizationCodeSchema = new Schema({
   scopes: { type: [String], required: true },
 });  
 
-module.exports = mongoose.model('OAuth2AuthorizationCode', OAuth2AuthorizationCodeSchema);
+module.exports = (conn) => {
+  return conn.model('OAuth2AuthorizationCode', OAuth2AuthorizationCodeSchema);
+};

app/models/oauth2-client.js

@@ -40,4 +40,6 @@ OAuth2ClientSchema.index({
   unique: true,
 });
 
-module.exports = mongoose.model('OAuth2Client', OAuth2ClientSchema);
+module.exports = (conn) => {
+  return conn.model('OAuth2Client', OAuth2ClientSchema);
+};

app/models/oauth2-token.js

@@ -24,4 +24,6 @@ OAuth2TokenSchema.index({
   name: 'oauth2_token_unique',
 });
 
-module.exports = mongoose.model('OAuth2Token', OAuth2TokenSchema);
+module.exports = (conn) => {
+  return conn.model('OAuth2Token', OAuth2TokenSchema);
+};

app/models/otp-account.js

@@ -33,4 +33,6 @@ OtpAccountSchema.index({
   name: 'otp_user_svc_uniq_idx',
 });
 
-module.exports = mongoose.model('OtpAccount', OtpAccountSchema);
+module.exports = (conn) => {
+  return conn.model('OtpAccount', OtpAccountSchema);
+};

app/models/resource-view.js

@@ -29,4 +29,6 @@ ResourceViewSchema.index({
   name: 'res_view_daily_unique',
 });
 
-module.exports = mongoose.model('ResourceView', ResourceViewSchema);
+module.exports = (conn) => {
+  return conn.model('ResourceView', ResourceViewSchema);
+};

app/models/resource-visit.js

@@ -26,4 +26,6 @@ ResourceVisitSchema.index({
   name: 'resource_visits_for_user',
 });
 
-module.exports = mongoose.model('ResourceVisit', ResourceVisitSchema);
+module.exports = (conn) => {
+  return conn.model('ResourceVisit', ResourceVisitSchema);
+};

app/models/sticker.js

@@ -43,4 +43,6 @@ const StickerSchema = new Schema({
   encoded: { type: StickerMediaSchema },
 });
 
-module.exports = mongoose.model('Sticker', StickerSchema);
+module.exports = (conn) => {
+  return conn.model('Sticker', StickerSchema);
+};

app/models/user-block.js

@@ -14,4 +14,6 @@ const UserBlockSchema = new Schema({
   blockedMembers: { type: [DtpUserSchema] },
 });
 
-module.exports = mongoose.model('UserBlock', UserBlockSchema);
+module.exports = (conn) => {
+  return conn.model('UserBlock', UserBlockSchema);
+};

app/models/user-notification.js

@@ -24,4 +24,6 @@ const UserNotificationSchema = new Schema({
   event: { type: Schema.ObjectId, required: true, ref: 'KaleidoscopeEvent' },
 });
 
-module.exports = mongoose.model('UserNotification', UserNotificationSchema);
+module.exports = (conn) => {
+  return conn.model('UserNotification', UserNotificationSchema);
+};

app/models/user-subscription.js

@@ -24,4 +24,6 @@ const UserSubscriptionSchema = new Schema({
   subscriptions: { type: [SubscriptionSchema] },
 });
 
-module.exports = mongoose.model('UserSubscription', UserSubscriptionSchema);
+module.exports = (conn) => {
+  return conn.model('UserSubscription', UserSubscriptionSchema);
+};

app/models/user.js

@@ -43,4 +43,6 @@ const UserSchema = new Schema({
   lastAnnouncement: { type: Date },
 });
 
-module.exports = mongoose.model('User', UserSchema);
+module.exports = (conn) => {
+  return conn.model('User', UserSchema);
+};

lib/site-platform.js

@@ -58,12 +58,12 @@ module.connectDatabase = async (/*dtp*/) => {
   }
 };
 
-
 module.loadModels = async (dtp) => {
   dtp.models = module.models = [ ];
   const modelScripts = glob.sync(path.join(dtp.config.root, 'app', 'models', '*.js'));
   modelScripts.forEach((modelScript) => {
-    const model = require(modelScript);
+    const instance = require(modelScript);
+    const model = instance(module.db);
     if (module.models[model.modelName]) {
       module.log.error('model name collision', { name: model.modelName });
       process.exit(-1);
@@ -206,7 +206,7 @@ module.exports.startPlatform = async (dtp) => {
     await module.connectRedis(dtp);
 
     await module.loadModels(dtp);
-    SiteLog.setModel(mongoose.model('Log'));
+    SiteLog.setModel(module.db.model('Log'));
 
     await module.loadServices(dtp);