Add GraphQL

graphql/resolvers.js

@@ -1697,97 +1697,99 @@ const Query = {
   },
 
   userPosts: async (parent, { userId, page = 1, limit = 20 }, context) => {
-    const skip = (page - 1) * limit;
-    const isOwner = context.user && context.user.userId === userId;
-    
-    let visibilityFilter = {};
-    if (!isOwner) {
-        visibilityFilter = { visibility: { $in: ['public', 'followers'] } };
-    }
-    
-    const [posts, total] = await Promise.all([
-        Post.find({ userId, ...visibilityFilter })
-        .sort({ pinned: -1, createdAt: -1 })
-        .skip(skip)
-        .limit(limit)
-        .populate('userId', 'username profile.nickname profile.avatar')
-        .lean(),
-        Post.countDocuments({ userId, ...visibilityFilter })
-    ]);
-    
-    // ✅ جلب البوستات الأصلية للمشاركات
-    const sharedPostIds = posts
-        .filter(p => p.sharedFrom?.originalPostId)
-        .map(p => p.sharedFrom.originalPostId);
-    
-    let originalPostsMap = new Map();
-    if (sharedPostIds.length > 0) {
-        const originalPosts = await Post.find({
-            _id: { $in: sharedPostIds }
-        })
-        .populate('userId', 'username profile.nickname profile.avatar profile.jobTitle')
-        .lean();
+        const skip = (page - 1) * limit;
+        const isOwner = context.user && context.user.userId === userId;
         
-        originalPosts.forEach(op => {
-            originalPostsMap.set(op._id.toString(), {
-                _id: op._id,
-                content: op.content || '',
-                images: op.images || [],
-                video: op.video || null,
-                userId: op.userId,
-                createdAt: op.createdAt,
-                likesCount: op.likes?.length || 0,
-                commentsCount: op.comments?.length || 0,
-                sharesCount: op.shares?.length || 0
-            });
-        });
-    }
-    
-    // ✅ حساب القيم مع إضافة بيانات البوست الأصلي
-    return {
-        data: posts.map(post => {
-            let sharedFrom = post.sharedFrom || null;
+        let visibilityFilter = {};
+        if (!isOwner) {
+            visibilityFilter = { visibility: { $in: ['public', 'followers'] } };
+        }
+        
+        const [posts, total] = await Promise.all([
+            Post.find({ userId, ...visibilityFilter })
+            .sort({ pinned: -1, createdAt: -1 })
+            .skip(skip)
+            .limit(limit)
+            .populate('userId', 'username profile.nickname profile.avatar')
+            .lean(),
+            Post.countDocuments({ userId, ...visibilityFilter })
+        ]);
+        
+        // ✅ جلب البوستات الأصلية للمشاركات
+        const sharedPostIds = posts
+            .filter(p => p.sharedFrom?.originalPostId)
+            .map(p => p.sharedFrom.originalPostId);
+        
+        let originalPostsMap = new Map();
+        if (sharedPostIds.length > 0) {
+            const originalPosts = await Post.find({
+                _id: { $in: sharedPostIds }
+            })
+            .populate('userId', 'username profile.nickname profile.avatar profile.jobTitle')
+            .lean();
             
-            // ✅ إضافة بيانات البوست الأصلي للمشاركات
-            if (sharedFrom && sharedFrom.originalPostId) {
-                const originalPost = originalPostsMap.get(sharedFrom.originalPostId.toString());
-                if (originalPost) {
-                    sharedFrom = {
-                        ...sharedFrom,
-                        originalAuthorId: originalPost.userId?._id || null,
-                        originalAuthorAvatar: originalPost.userId?.profile?.avatar || null,
-                        originalAuthorJobTitle: originalPost.userId?.profile?.jobTitle || null,
-                        originalContent: originalPost.content || '',
-                        originalImages: originalPost.images || [],
-                        originalVideo: originalPost.video || null,
-                        originalCreatedAt: originalPost.createdAt || null,
-                        originalLikesCount: originalPost.likesCount || 0,
-                        originalCommentsCount: originalPost.commentsCount || 0,
-                        originalSharesCount: originalPost.sharesCount || 0
-                    };
+            originalPosts.forEach(op => {
+                originalPostsMap.set(op._id.toString(), {
+                    _id: op._id,
+                    content: op.content || '',
+                    images: op.images || [],
+                    video: op.video || null,
+                    userId: op.userId,
+                    createdAt: op.createdAt,
+                    likesCount: op.likes?.length || 0,
+                    commentsCount: op.comments?.length || 0,
+                    sharesCount: op.shares?.length || 0
+                });
+            });
+        }
+        
+        return {
+            data: posts.map(post => {
+                // ✅ نبدأ بـ sharedFrom كـ null
+                let sharedFrom = null;
+                
+                // ✅ لو في مشاركة، نبني الكائن كامل
+                if (post.sharedFrom && post.sharedFrom.originalPostId) {
+                    const originalPost = originalPostsMap.get(post.sharedFrom.originalPostId.toString());
+                    if (originalPost) {
+                        sharedFrom = {
+                            originalPostId: post.sharedFrom.originalPostId,
+                            originalAuthorId: originalPost.userId?._id || null,
+                            originalAuthorName: post.sharedFrom.originalAuthorName || 'Unknown',
+                            originalAuthorAvatar: originalPost.userId?.profile?.avatar || null,
+                            originalAuthorJobTitle: originalPost.userId?.profile?.jobTitle || null,
+                            originalContent: originalPost.content || '',
+                            originalImages: originalPost.images || [],  // ✅ دائماً array وليس null
+                            originalVideo: originalPost.video || null,
+                            originalCreatedAt: originalPost.createdAt || null,
+                            originalLikesCount: originalPost.likesCount || 0,
+                            originalCommentsCount: originalPost.commentsCount || 0,
+                            originalSharesCount: originalPost.sharesCount || 0,
+                            sharedAt: post.sharedFrom.sharedAt || null
+                        };
+                    }
                 }
+                
+                return {
+                    ...post,
+                    sharedFrom,  // ✅ null للبوستات العادية، أو كائن كامل للمشاركات
+                    likesCount: post.likes?.length || 0,
+                    commentsCount: post.comments?.length || 0,
+                    sharesCount: post.shares?.length || 0,
+                    savesCount: post.saves?.length || 0,
+                    isLiked: post.likes?.some(l => l.userId?.toString() === context.user?.userId) || false,
+                    isSaved: post.saves?.some(s => s.userId?.toString() === context.user?.userId) || false
+                };
+            }),
+            pagination: {
+                page,
+                limit,
+                total,
+                pages: Math.ceil(total / limit),
+                hasNext: skip + limit < total,
+                hasPrev: page > 1
             }
-            
-            return {
-                ...post,
-                sharedFrom,
-                likesCount: post.likes?.length || 0,
-                commentsCount: post.comments?.length || 0,
-                sharesCount: post.shares?.length || 0,
-                savesCount: post.saves?.length || 0,
-                isLiked: post.likes?.some(l => l.userId?.toString() === context.user?.userId) || false,
-                isSaved: post.saves?.some(s => s.userId?.toString() === context.user?.userId) || false
-            };
-        }),
-        pagination: {
-            page,
-            limit,
-            total,
-            pages: Math.ceil(total / limit),
-            hasNext: skip + limit < total,
-            hasPrev: page > 1
-        }
-    };
+        };
   },
 
   savedPosts: async (parent, { page = 1, limit = 20 }, context) => {

graphql/schema.js

@@ -719,7 +719,7 @@ const typeDefs = gql`
     originalAuthorAvatar: String  
     originalAuthorJobTitle: String
     originalContent: String       
-    originalImages: [PostImage!]! 
+    originalImages: [PostImage!]
     originalVideo: PostVideo      
     originalCreatedAt: Date       
     originalLikesCount: Int