Mark-Lasfar commited on
Commit
cee785c
·
1 Parent(s): 8cf3d33

Add GraphQL

Browse files
Files changed (1) hide show
  1. server.js +16 -34
server.js CHANGED
@@ -18402,15 +18402,12 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18402
  return res.status(400).json({ error: 'userId is required' });
18403
  }
18404
 
18405
- // ✅ تحديد إذا كان الطالب هو المالك أم زائر
18406
- const isOwner = req.user && req.user.userId === userId;
18407
-
18408
  // ============================
18409
  // ✅ 1. جلب المشاهدات من AlsoViewed (جديدة)
18410
  // ============================
18411
  const alsoViewed = await AlsoViewed.find({ targetUserId: userId })
18412
  .sort({ viewedAt: -1 })
18413
- .limit(20); // ✅ زودنا الـ limit عشان نجيب أكثر
18414
 
18415
  // ============================
18416
  // ✅ 2. جلب المشاهدات من ProfileAnalytics (للمشاهدات القديمة)
@@ -18419,7 +18416,10 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18419
  let historicalViews = [];
18420
 
18421
  if (analytics && analytics.profileViews && analytics.profileViews.length > 0) {
 
18422
  const views = analytics.profileViews;
 
 
18423
  const viewerMap = new Map();
18424
 
18425
  views.forEach(view => {
@@ -18432,6 +18432,7 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18432
  count: 1
18433
  });
18434
  } else {
 
18435
  const existing = viewerMap.get(key);
18436
  if (view.viewedAt > existing.viewedAt) {
18437
  existing.viewedAt = view.viewedAt;
@@ -18440,17 +18441,19 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18440
  }
18441
  });
18442
 
 
18443
  historicalViews = Array.from(viewerMap.values())
18444
  .sort((a, b) => new Date(b.viewedAt) - new Date(a.viewedAt))
18445
- .slice(0, 20);
18446
  }
18447
 
18448
  // ============================
18449
- // ✅ 3. دمج المشاهدات
18450
  // ============================
18451
  const allViewers = [];
18452
  const processedIds = new Set();
18453
 
 
18454
  for (const item of alsoViewed) {
18455
  const key = item.viewerId ? item.viewerId.toString() : item.viewerIp;
18456
  if (!processedIds.has(key)) {
@@ -18464,6 +18467,7 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18464
  }
18465
  }
18466
 
 
18467
  for (const item of historicalViews) {
18468
  const key = item.viewerId ? item.viewerId.toString() : item.viewerIp;
18469
  if (!processedIds.has(key)) {
@@ -18498,9 +18502,9 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18498
  }
18499
 
18500
  // ============================
18501
- // ✅ 5. تنسيق النتيجة النهائية (مع التفرقة بين المالك والزائر)
18502
  // ============================
18503
- let formattedViewers = allViewers.map(item => {
18504
  if (item.viewerId && userMap[item.viewerId.toString()]) {
18505
  const user = userMap[item.viewerId.toString()];
18506
  return {
@@ -18515,10 +18519,10 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18515
  source: item.source
18516
  };
18517
  } else {
18518
- // ✅ زائر (غير مسجل)
18519
  return {
18520
  _id: null,
18521
- name: `Guest 🌐`,
18522
  nickname: null,
18523
  username: null,
18524
  avatar: '/assets/img/default-avatar.png',
@@ -18531,37 +18535,15 @@ app.get('/api/analytics/also-viewed', authenticateToken, async (req, res) => {
18531
  }
18532
  });
18533
 
18534
- // ============================
18535
- // ✅ 6. التصفية حسب الصلاحية
18536
- // ============================
18537
- if (!isOwner) {
18538
- // ✅ الزائر: يرى فقط المستخدمين المسجلين (يزيل الزوار)
18539
- formattedViewers = formattedViewers.filter(v => !v.isGuest);
18540
- }
18541
-
18542
- // ============================
18543
- // ✅ 7. خلط ع��وائي (يتغير مع كل ريلود)
18544
- // ============================
18545
- function shuffleArray(array) {
18546
- const shuffled = [...array];
18547
- for (let i = shuffled.length - 1; i > 0; i--) {
18548
- const j = Math.floor(Math.random() * (i + 1));
18549
- [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
18550
- }
18551
- return shuffled;
18552
- }
18553
-
18554
- // ✅ خلط القائمة عشوائياً
18555
- const shuffledViewers = shuffleArray(formattedViewers);
18556
-
18557
  // ✅ خذ أول 5 فقط
18558
- res.json(shuffledViewers.slice(0, 5));
18559
 
18560
  } catch (error) {
18561
  logger.error(`Error fetching also viewed: ${error.message}`);
18562
  res.status(500).json({ error: 'Failed to fetch also viewed data' });
18563
  }
18564
  });
 
18565
  // ============================================
18566
  // GET /api/pages/suggestions - جلب اقتراحات الصفحات
18567
  // ============================================
 
18402
  return res.status(400).json({ error: 'userId is required' });
18403
  }
18404
 
 
 
 
18405
  // ============================
18406
  // ✅ 1. جلب المشاهدات من AlsoViewed (جديدة)
18407
  // ============================
18408
  const alsoViewed = await AlsoViewed.find({ targetUserId: userId })
18409
  .sort({ viewedAt: -1 })
18410
+ .limit(10);
18411
 
18412
  // ============================
18413
  // ✅ 2. جلب المشاهدات من ProfileAnalytics (للمشاهدات القديمة)
 
18416
  let historicalViews = [];
18417
 
18418
  if (analytics && analytics.profileViews && analytics.profileViews.length > 0) {
18419
+ // ✅ استخراج المشاهدات من profileViews
18420
  const views = analytics.profileViews;
18421
+
18422
+ // ✅ تجميع المشاهدات حسب viewerId أو IP
18423
  const viewerMap = new Map();
18424
 
18425
  views.forEach(view => {
 
18432
  count: 1
18433
  });
18434
  } else {
18435
+ // ✅ تحديث آخر وقت مشاهدة
18436
  const existing = viewerMap.get(key);
18437
  if (view.viewedAt > existing.viewedAt) {
18438
  existing.viewedAt = view.viewedAt;
 
18441
  }
18442
  });
18443
 
18444
+ // ✅ تحويل إلى Array وترتيب حسب الأحدث
18445
  historicalViews = Array.from(viewerMap.values())
18446
  .sort((a, b) => new Date(b.viewedAt) - new Date(a.viewedAt))
18447
+ .slice(0, 10); // خذ آخر 10
18448
  }
18449
 
18450
  // ============================
18451
+ // ✅ 3. دمج المشاهدات (AlsoViewed + Historical)
18452
  // ============================
18453
  const allViewers = [];
18454
  const processedIds = new Set();
18455
 
18456
+ // ✅ أضف المشاهدات من AlsoViewed أولاً (الأحدث)
18457
  for (const item of alsoViewed) {
18458
  const key = item.viewerId ? item.viewerId.toString() : item.viewerIp;
18459
  if (!processedIds.has(key)) {
 
18467
  }
18468
  }
18469
 
18470
+ // ✅ أضف المشاهدات التاريخية (اللي مش موجودة في AlsoViewed)
18471
  for (const item of historicalViews) {
18472
  const key = item.viewerId ? item.viewerId.toString() : item.viewerIp;
18473
  if (!processedIds.has(key)) {
 
18502
  }
18503
 
18504
  // ============================
18505
+ // ✅ 5. تنسيق النتيجة النهائية
18506
  // ============================
18507
+ const formattedViewers = allViewers.map(item => {
18508
  if (item.viewerId && userMap[item.viewerId.toString()]) {
18509
  const user = userMap[item.viewerId.toString()];
18510
  return {
 
18519
  source: item.source
18520
  };
18521
  } else {
18522
+ // ✅ زائر
18523
  return {
18524
  _id: null,
18525
+ name: `Guest ${item.viewerIp ? '🌐' : ''}`,
18526
  nickname: null,
18527
  username: null,
18528
  avatar: '/assets/img/default-avatar.png',
 
18535
  }
18536
  });
18537
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
18538
  // ✅ خذ أول 5 فقط
18539
+ res.json(formattedViewers.slice(0, 5));
18540
 
18541
  } catch (error) {
18542
  logger.error(`Error fetching also viewed: ${error.message}`);
18543
  res.status(500).json({ error: 'Failed to fetch also viewed data' });
18544
  }
18545
  });
18546
+
18547
  // ============================================
18548
  // GET /api/pages/suggestions - جلب اقتراحات الصفحات
18549
  // ============================================