Skip to content

Commit 1591335

Browse files
committed
make it so delete user deletes all messages
1 parent 43cc6b0 commit 1591335

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

server/controllers/user.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import UserModel from "../models/User.js";
2-
import bcrypt from 'bcrypt';
2+
import bcrypt from "bcrypt";
33
import {
44
handleServerError,
55
handleSuccess,
66
handleNotFound,
77
handleBadRequest,
88
} from "../utils/handlers.js";
9+
import MessageModel from "../models/Message.js";
910

1011
export const getUserById = async (req, res) => {
1112
try {
@@ -137,20 +138,22 @@ export const deleteUser = async (req, res) => {
137138
try {
138139
const { userId } = req.params;
139140

140-
const result = await UserModel.findByIdAndDelete(userId);
141+
const user = await UserModel.findById(userId);
141142

142-
if (!result) {
143+
if (!user) {
143144
return handleNotFound(res, "User not found");
144145
}
145146

146-
// await user.remove();
147+
await MessageModel.deleteMany({ _id: { $in: user.messages } });
148+
await UserModel.findByIdAndDelete(userId);
147149

148-
handleSuccess(res, { message: "User successfully deleted" });
150+
handleSuccess(res, {
151+
message: "User and their messages successfully deleted",
152+
});
149153
} catch (err) {
150154
handleServerError(res, err);
151155
}
152156
};
153-
154157
export const toggleNotifyFriends = async (req, res) => {
155158
try {
156159
const { userId } = req.params;

0 commit comments

Comments
 (0)