fix

Signed-off-by: Kenneth Obsequio <k80308392@gmail.com>

controllers/client/profile.controller.js

@@ -19,9 +19,9 @@ const mdl_UserSessions = require('../../models/users/user_sessions.mdl');
 const mdl_Achievements = require('../../models/users/achievements.mdl');
 const trustedDevice    = require('../../services/trustedDevice.service');
 const logActivity      = require('../../utils/logActivity.util');
-const R                = require('../../utils/response.util');
-const { uploadFile, deleteFile } = require('../../services/s3.service');
-const { resolveUserAvatar } = require('../../utils/resolveAvatar.util');
+const R                                       = require('../../utils/response.util');
+const { replaceUserAvatar, removeUserAvatar } = require('../../services/avatar.service');
+const { resolveUserAvatar }                   = require('../../utils/resolveAvatar.util');
 
 // ─── GET own profile ───────────────────────────────────────────────────────────
 
@@ -114,28 +114,9 @@ exports.uploadAvatar = async (req, res) => {
 
     const user = await mdl_Users.findByPk(req.user.user_id);
 
-    // Remove old avatar from S3 before replacing
-    const oldKey = user.personal_info?.avatar?.uuid;
-    if (oldKey) await deleteFile(oldKey).catch(() => {});
-
-    const { url, uuid } = await uploadFile({
-      buffer:       req.file.buffer,
-      originalname: req.file.originalname,
-      mimetype:     req.file.mimetype,
-      ownerType:    'avatar',
-    });
-
-    const merged = {
-      ...(user.personal_info || {}),
-      avatar: {
-        url,
-        uuid,
-        name:      req.file.originalname,
-        mime_type: req.file.mimetype,
-        size:      req.file.size,
-      },
-    };
+    const avatarMeta = await replaceUserAvatar(user, req.file);
 
+    const merged = { ...(user.personal_info || {}), avatar: avatarMeta };
     await user.update({ personal_info: merged });
 
     const updated = await mdl_Users.findByPk(req.user.user_id, {
@@ -143,6 +124,7 @@ exports.uploadAvatar = async (req, res) => {
     });
     return R.success(res, 'Avatar updated.', await resolveUserAvatar(updated));
   } catch (err) {
+    if (err.status === 400) return R.error(res, err.message, 400);
     console.error('[CLIENT] uploadAvatar error:', err);
     return R.error(res, 'Avatar upload failed.', 500);
   }
@@ -153,16 +135,15 @@ exports.uploadAvatar = async (req, res) => {
 exports.deleteAvatar = async (req, res) => {
   try {
     const user = await mdl_Users.findByPk(req.user.user_id);
-    const key  = user.personal_info?.avatar?.uuid;
-    if (!key) return R.error(res, 'No avatar to remove.', 404);
 
-    await deleteFile(key).catch(() => {});
+    await removeUserAvatar(user);
 
     const merged = { ...(user.personal_info || {}), avatar: null };
     await user.update({ personal_info: merged });
 
     return R.success(res, 'Avatar removed.');
   } catch (err) {
+    if (err.status === 404) return R.error(res, err.message, 404);
     console.error('[CLIENT] deleteAvatar error:', err);
     return R.error(res, 'Could not remove avatar.', 500);
   }