Skip to content

Commit 617a630

Browse files
committed
fix: fix file upload prefix bug
1 parent 97983aa commit 617a630

File tree

8 files changed

+28
-14
lines changed

8 files changed

+28
-14
lines changed

middlewares/file-upload/uploadImage.middleware.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ const getImageExtension = require('../../utils/getImageExtension');
66
// Configuring and validating the upload
77
const storage = multer.diskStorage({
88
destination: (req, file, callbackFunction) => {
9-
const { isUserImg } = req.body;
10-
11-
if (file?.fieldname === 'profileImage') {
12-
callbackFunction(null, 'public/uploads/users');
13-
} else {
14-
callbackFunction(null, 'public/uploads');
15-
}
9+
callbackFunction(null, 'public/uploads');
1610
},
1711

1812
// By default, multer removes file extensions so let's add them back
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
const multer = require('multer');
2+
3+
const getImageExtension = require('../../utils/getImageExtension');
4+
5+
// Set Storage Engine
6+
// Configuring and validating the upload
7+
const storage = multer.diskStorage({
8+
destination: (req, file, callbackFunction) => {
9+
callbackFunction(null, 'public/uploads/users');
10+
},
11+
12+
// By default, multer removes file extensions so let's add them back
13+
filename: (req, file, callbackFunction) => {
14+
callbackFunction(null, `${file.fieldname}-${Date.now()}${getImageExtension(file.mimetype)}`);
15+
}
16+
});
17+
18+
// Initialize upload variable
19+
exports.uploadImage = multer({
20+
storage: storage,
21+
limits: {
22+
fileSize: 1024 * 1024 * 10 // accept files up 10 mgb
23+
}
24+
});
26.1 KB
Loading
5.05 KB
Loading
5.05 KB
Loading
256 KB
Loading

services/admin.service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ exports.updateUser = async (req, res, next) => {
202202
user.nationality = nationality || user.nationality;
203203
user.address = address || user.address;
204204
user.favoriteAnimal = favoriteAnimal || user.favoriteAnimal;
205-
user.profileImage = req.file.filename ? `/static/uploads/users/${req.file.filename}` : user.profileImage;
205+
user.profileImage = req.file.filename ? `/static/uploads/${req.file.filename}` : user.profileImage;
206206

207207
const updatedUser = await user.save();
208208

services/auth.service.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const { WEBSITE_URL, API_VERSION, CLIENT_URL } = require('../configs/environment
1616
*/
1717

1818
exports.signup = async (req, res, next) => {
19-
console.log("error")
2019
const {
2120
firstName,
2221
lastName,
@@ -49,8 +48,6 @@ exports.signup = async (req, res, next) => {
4948
return responseObject;
5049
}
5150

52-
53-
// req.file.filename ? `/static/uploads/users/${req.file.filename}` : user.profileImage;
5451
const newUser = new User({
5552
_id: new mongoose.Types.ObjectId(),
5653
firstName,
@@ -63,10 +60,9 @@ exports.signup = async (req, res, next) => {
6360
cart,
6461
role,
6562
acceptTerms,
66-
profileImage: `/static/uploads/users/${req.file.filename}`
63+
profileImage: `/static/uploads/${req.file.filename}`
6764
});
6865

69-
console.log(' newUser', newUser);
7066
try {
7167
const user = await newUser.save();
7268
let token = await new Token({ userId: user._id });
@@ -539,7 +535,7 @@ exports.updateUser = async (req, res, next) => {
539535
user.nationality = nationality || user.nationality;
540536
user.address = address || user.address;
541537
user.favoriteAnimal = favoriteAnimal || user.favoriteAnimal;
542-
user.profileImage = req.file.filename ? `/static/uploads/users/${req.file.filename}` : user.profileImage;
538+
user.profileImage = req.file.filename ? `/static/uploads/${req.file.filename}` : user.profileImage;
543539

544540
const updatedUser = await user.save();
545541

0 commit comments

Comments
 (0)