clean up models, fix pre remove user method

Author: rwieruch

src/models/message.js

@@ -1,27 +1,18 @@
 import mongoose from 'mongoose';
 
-const Message = mongoose.model(
- 'Message',
- new mongoose.Schema(
- {
- text: {
- type: String,
- required: true,
- },
- userId: {
- type: mongoose.Schema.Types.ObjectId,
- ref: 'User',
- },
- messages: [
- {
- type: mongoose.Schema.Types.ObjectId,
- ref: 'Message',
- },
- ],
+const messageSchema = new mongoose.Schema(
+ {
+ text: {
+ type: String,
+ required: true,
  },
- {
- timestamps: true,
- },
- ),
+ userId: { type: mongoose.Schema.Types.ObjectId, ref: 'User' },
+ },
+ {
+ timestamps: true,
+ },
 );
+
+const Message = mongoose.model('Message', messageSchema);
+
 export default Message;

src/models/user.js

@@ -3,7 +3,7 @@ import mongoose from 'mongoose';
 import bcrypt from 'bcrypt';
 import isEmail from 'validator/lib/isEmail';
 
-const UserSchema = new mongoose.Schema({
+const userSchema = new mongoose.Schema({
  username: {
  type: String,
  unique: true,
@@ -24,12 +24,9 @@ const UserSchema = new mongoose.Schema({
  role: {
  type: String,
  },
- messages: [
- { type: mongoose.Schema.Types.ObjectId, ref: 'Message' },
- ],
 });
 
-UserSchema.statics.findByLogin = async function(login) {
+userSchema.statics.findByLogin = async function(login) {
  let user = await this.findOne({
  username: login,
  });
@@ -41,17 +38,23 @@ UserSchema.statics.findByLogin = async function(login) {
  return user;
 };
 
-UserSchema.pre('save', async function() {
+userSchema.pre('remove', function(next) {
+ this.model('Message').deleteMany({ userId: this._id }, next);
+});
+
+userSchema.pre('save', async function() {
  this.password = await this.generatePasswordHash();
 });
 
-UserSchema.methods.generatePasswordHash = async function() {
+userSchema.methods.generatePasswordHash = async function() {
  const saltRounds = 10;
  return await bcrypt.hash(this.password, saltRounds);
 };
 
-UserSchema.methods.validatePassword = async function(password) {
+userSchema.methods.validatePassword = async function(password) {
  return await bcrypt.compare(password, this.password);
 };
 
-export default mongoose.model('User', UserSchema);
+const User = mongoose.model('User', userSchema);
+
+export default User;