Mark-Lasfar commited on
Commit ·
b58a845
1
Parent(s): 67eff21
Add GraphQL
Browse files
server.js
CHANGED
|
@@ -18412,7 +18412,7 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18412 |
.limit(20);
|
| 18413 |
|
| 18414 |
// ============================
|
| 18415 |
-
// ✅ 2. جلب المشاهدات من ProfileAnalytics (للمشاهدات القديمة)
|
| 18416 |
// ============================
|
| 18417 |
const analytics = await ProfileAnalytics.findOne({ userId });
|
| 18418 |
let historicalViews = [];
|
|
@@ -18422,13 +18422,28 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18422 |
const viewerMap = new Map();
|
| 18423 |
|
| 18424 |
views.forEach(view => {
|
| 18425 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18426 |
if (!viewerMap.has(key)) {
|
| 18427 |
viewerMap.set(key, {
|
| 18428 |
viewerId: view.viewerId || null,
|
| 18429 |
viewerIp: view.viewerIp || null,
|
| 18430 |
viewedAt: view.viewedAt,
|
| 18431 |
-
count: 1
|
|
|
|
| 18432 |
});
|
| 18433 |
} else {
|
| 18434 |
const existing = viewerMap.get(key);
|
|
@@ -18445,13 +18460,22 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18445 |
}
|
| 18446 |
|
| 18447 |
// ============================
|
| 18448 |
-
// ✅ 3. دمج المشاهدات
|
| 18449 |
// ============================
|
| 18450 |
const allViewers = [];
|
| 18451 |
const processedIds = new Set();
|
| 18452 |
|
|
|
|
| 18453 |
for (const item of alsoViewed) {
|
| 18454 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18455 |
if (!processedIds.has(key)) {
|
| 18456 |
processedIds.add(key);
|
| 18457 |
allViewers.push({
|
|
@@ -18463,15 +18487,25 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18463 |
}
|
| 18464 |
}
|
| 18465 |
|
|
|
|
| 18466 |
for (const item of historicalViews) {
|
| 18467 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18468 |
if (!processedIds.has(key)) {
|
| 18469 |
processedIds.add(key);
|
| 18470 |
allViewers.push({
|
| 18471 |
viewerId: item.viewerId || null,
|
| 18472 |
viewerIp: item.viewerIp || null,
|
| 18473 |
viewedAt: item.viewedAt,
|
| 18474 |
-
source: 'historical'
|
|
|
|
| 18475 |
});
|
| 18476 |
}
|
| 18477 |
}
|
|
@@ -18480,7 +18514,7 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18480 |
allViewers.sort((a, b) => new Date(b.viewedAt) - new Date(a.viewedAt));
|
| 18481 |
|
| 18482 |
// ============================
|
| 18483 |
-
// ✅ 4. جلب بيانات المستخدمين
|
| 18484 |
// ============================
|
| 18485 |
const userIds = allViewers
|
| 18486 |
.filter(v => v.viewerId)
|
|
@@ -18500,6 +18534,7 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18500 |
// ✅ 5. تنسيق النتيجة النهائية
|
| 18501 |
// ============================
|
| 18502 |
let formattedViewers = allViewers.map(item => {
|
|
|
|
| 18503 |
if (item.viewerId && userMap[item.viewerId.toString()]) {
|
| 18504 |
const user = userMap[item.viewerId.toString()];
|
| 18505 |
return {
|
|
@@ -18513,25 +18548,35 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18513 |
isGuest: false,
|
| 18514 |
source: item.source
|
| 18515 |
};
|
| 18516 |
-
}
|
| 18517 |
-
|
| 18518 |
-
|
| 18519 |
-
|
| 18520 |
-
|
| 18521 |
-
|
| 18522 |
-
|
| 18523 |
-
|
| 18524 |
-
|
| 18525 |
-
|
| 18526 |
-
isGuest: true,
|
| 18527 |
-
viewerIp: item.viewerIp || 'Unknown',
|
| 18528 |
-
source: item.source
|
| 18529 |
-
};
|
| 18530 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18531 |
});
|
| 18532 |
|
| 18533 |
// ============================
|
| 18534 |
-
// ✅ 6. التصفية حسب الصلاحية
|
| 18535 |
// ============================
|
| 18536 |
if (!isOwner) {
|
| 18537 |
// ✅ الزائر: يرى فقط المستخدمين المسجلين (يزيل الزوار)
|
|
@@ -18560,7 +18605,7 @@ app.get('/api/analytics/also-viewed', async (req, res) => {
|
|
| 18560 |
const shuffledViewers = shuffleArray(formattedViewers);
|
| 18561 |
|
| 18562 |
// ============================
|
| 18563 |
-
// ✅ 9. إرجاع النتيجة
|
| 18564 |
// ============================
|
| 18565 |
res.json({
|
| 18566 |
data: shuffledViewers.slice(0, 5),
|
|
|
|
| 18412 |
.limit(20);
|
| 18413 |
|
| 18414 |
// ============================
|
| 18415 |
+
// ✅ 2. جلب المشاهدات من ProfileAnalytics (للمشاهدات القديمة والجديدة)
|
| 18416 |
// ============================
|
| 18417 |
const analytics = await ProfileAnalytics.findOne({ userId });
|
| 18418 |
let historicalViews = [];
|
|
|
|
| 18422 |
const viewerMap = new Map();
|
| 18423 |
|
| 18424 |
views.forEach(view => {
|
| 18425 |
+
// ✅ دعم المشاهدات القديمة (بدون viewerIp) والجديدة (مع viewerIp)
|
| 18426 |
+
let key = null;
|
| 18427 |
+
|
| 18428 |
+
if (view.viewerId) {
|
| 18429 |
+
// ✅ مستخدم مسجل
|
| 18430 |
+
key = view.viewerId.toString();
|
| 18431 |
+
} else if (view.viewerIp) {
|
| 18432 |
+
// ✅ زائر مع IP
|
| 18433 |
+
key = view.viewerIp;
|
| 18434 |
+
} else {
|
| 18435 |
+
// ✅ مشاهدات قديمة جداً (بدون viewerId ولا viewerIp)
|
| 18436 |
+
// نستخدم معرف فريد مؤقت
|
| 18437 |
+
key = `legacy_${view._id || Math.random().toString(36).substring(7)}`;
|
| 18438 |
+
}
|
| 18439 |
+
|
| 18440 |
if (!viewerMap.has(key)) {
|
| 18441 |
viewerMap.set(key, {
|
| 18442 |
viewerId: view.viewerId || null,
|
| 18443 |
viewerIp: view.viewerIp || null,
|
| 18444 |
viewedAt: view.viewedAt,
|
| 18445 |
+
count: 1,
|
| 18446 |
+
isLegacy: !view.viewerId && !view.viewerIp
|
| 18447 |
});
|
| 18448 |
} else {
|
| 18449 |
const existing = viewerMap.get(key);
|
|
|
|
| 18460 |
}
|
| 18461 |
|
| 18462 |
// ============================
|
| 18463 |
+
// ✅ 3. دمج المشاهدات (AlsoViewed + Historical)
|
| 18464 |
// ============================
|
| 18465 |
const allViewers = [];
|
| 18466 |
const processedIds = new Set();
|
| 18467 |
|
| 18468 |
+
// ✅ أضف المشاهدات من AlsoViewed أولاً (الأحدث)
|
| 18469 |
for (const item of alsoViewed) {
|
| 18470 |
+
let key = null;
|
| 18471 |
+
if (item.viewerId) {
|
| 18472 |
+
key = item.viewerId.toString();
|
| 18473 |
+
} else if (item.viewerIp) {
|
| 18474 |
+
key = item.viewerIp;
|
| 18475 |
+
} else {
|
| 18476 |
+
key = `also_${item._id}`;
|
| 18477 |
+
}
|
| 18478 |
+
|
| 18479 |
if (!processedIds.has(key)) {
|
| 18480 |
processedIds.add(key);
|
| 18481 |
allViewers.push({
|
|
|
|
| 18487 |
}
|
| 18488 |
}
|
| 18489 |
|
| 18490 |
+
// ✅ أضف المشاهدات التاريخية (اللي مش موجودة في AlsoViewed)
|
| 18491 |
for (const item of historicalViews) {
|
| 18492 |
+
let key = null;
|
| 18493 |
+
if (item.viewerId) {
|
| 18494 |
+
key = item.viewerId.toString();
|
| 18495 |
+
} else if (item.viewerIp) {
|
| 18496 |
+
key = item.viewerIp;
|
| 18497 |
+
} else {
|
| 18498 |
+
key = `legacy_${Math.random().toString(36).substring(7)}`;
|
| 18499 |
+
}
|
| 18500 |
+
|
| 18501 |
if (!processedIds.has(key)) {
|
| 18502 |
processedIds.add(key);
|
| 18503 |
allViewers.push({
|
| 18504 |
viewerId: item.viewerId || null,
|
| 18505 |
viewerIp: item.viewerIp || null,
|
| 18506 |
viewedAt: item.viewedAt,
|
| 18507 |
+
source: 'historical',
|
| 18508 |
+
isLegacy: item.isLegacy || false
|
| 18509 |
});
|
| 18510 |
}
|
| 18511 |
}
|
|
|
|
| 18514 |
allViewers.sort((a, b) => new Date(b.viewedAt) - new Date(a.viewedAt));
|
| 18515 |
|
| 18516 |
// ============================
|
| 18517 |
+
// ✅ 4. جلب بيانات المستخدمين المسجلين
|
| 18518 |
// ============================
|
| 18519 |
const userIds = allViewers
|
| 18520 |
.filter(v => v.viewerId)
|
|
|
|
| 18534 |
// ✅ 5. تنسيق النتيجة النهائية
|
| 18535 |
// ============================
|
| 18536 |
let formattedViewers = allViewers.map(item => {
|
| 18537 |
+
// ✅ مستخدم مسجل
|
| 18538 |
if (item.viewerId && userMap[item.viewerId.toString()]) {
|
| 18539 |
const user = userMap[item.viewerId.toString()];
|
| 18540 |
return {
|
|
|
|
| 18548 |
isGuest: false,
|
| 18549 |
source: item.source
|
| 18550 |
};
|
| 18551 |
+
}
|
| 18552 |
+
|
| 18553 |
+
// ✅ زائر (غير مسجل) - يدعم المشاهدات القديمة والجديدة
|
| 18554 |
+
let displayName = 'Guest 🌐';
|
| 18555 |
+
let viewerIp = item.viewerIp || 'Unknown';
|
| 18556 |
+
|
| 18557 |
+
// ✅ إذا كانت مشاهدة قديمة جداً (بدون IP)
|
| 18558 |
+
if (item.isLegacy || (!item.viewerId && !item.viewerIp)) {
|
| 18559 |
+
displayName = 'Guest (Legacy)';
|
| 18560 |
+
viewerIp = 'Legacy View';
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18561 |
}
|
| 18562 |
+
|
| 18563 |
+
return {
|
| 18564 |
+
_id: null,
|
| 18565 |
+
name: displayName,
|
| 18566 |
+
nickname: null,
|
| 18567 |
+
username: null,
|
| 18568 |
+
avatar: '/assets/img/default-avatar.png',
|
| 18569 |
+
title: 'Guest Visitor',
|
| 18570 |
+
viewedAt: item.viewedAt,
|
| 18571 |
+
isGuest: true,
|
| 18572 |
+
viewerIp: viewerIp,
|
| 18573 |
+
source: item.source,
|
| 18574 |
+
isLegacy: item.isLegacy || false
|
| 18575 |
+
};
|
| 18576 |
});
|
| 18577 |
|
| 18578 |
// ============================
|
| 18579 |
+
// ✅ 6. التصفية حسب الصلاحية (المالك vs الزائر)
|
| 18580 |
// ============================
|
| 18581 |
if (!isOwner) {
|
| 18582 |
// ✅ الزائر: يرى فقط المستخدمين المسجلين (يزيل الزوار)
|
|
|
|
| 18605 |
const shuffledViewers = shuffleArray(formattedViewers);
|
| 18606 |
|
| 18607 |
// ============================
|
| 18608 |
+
// ✅ 9. إرجاع النتيجة النهائية
|
| 18609 |
// ============================
|
| 18610 |
res.json({
|
| 18611 |
data: shuffledViewers.slice(0, 5),
|