assets and tier plans revamp

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

controllers/admin/user_activity.controller.js

@@ -13,6 +13,7 @@ const { Op }           = require('sequelize');
 const mdl_UserActivity = require('../../models/users/user_activity.mdl');
 const mdl_Users        = require('../../models/users/users.mdl');
 const R                = require('../../utils/response.util');
+const { resolveAvatarUrl } = require('../../utils/resolveAvatar.util');
 
 const USER_ATTRS = [
   'user_id', 'email', 'acc_type',
@@ -66,7 +67,7 @@ exports.getActivity = async (req, res) => {
       offset,
     });
 
-    const data = rows.map(formatRow);
+    const data = await Promise.all(rows.map(formatRow));
 
     return R.success(res, 'Activity feed retrieved.', {
       total:      count,
@@ -117,15 +118,16 @@ exports.getUserActivity = async (req, res) => {
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
-function formatRow(row) {
+async function formatRow(row) {
   const r    = row.toJSON();
   const info = r.user?.personal_info;
+  const avatar = await resolveAvatarUrl(info?.avatar);
   return {
     activity_id: r.activity_id,
     user_id:     r.user_id,
     email:       r.user?.email          ?? null,
     full_name:   info?.name?.full_name  ?? null,
-    avatar_url:  info?.avatar?.url      ?? null,
+    avatar_url:  avatar?.url            ?? null,
     acc_type:    r.user?.acc_type       ?? null,
     action:      r.action,
     entity_type: r.entity_type,