Merge pull request #6 from KushK04/socialfeedv2

Andurdur · web-flow · commit e61b522747e0 · 2025-06-05T18:58:08.000-07:00
Social feed working
diff --git a/KonditionExpo/app/create-post.tsx b/KonditionExpo/app/create-post.tsx
@@ -276,14 +276,14 @@ export default function CreatePostScreen() {
             )}
             <View style={styles.previewStats}>
               <Text style={styles.previewStat}>
-                🏃‍♂️ {formData.workout_type}
+                <Text>🏃‍♂️ {formData.workout_type}</Text>
               </Text>
               <Text style={styles.previewStat}>
-                ⏱️ {formatDuration(formData.duration_minutes)}
+                <Text>⏱️ {formatDuration(formData.duration_minutes)}</Text>
               </Text>
               {formData.calories_burned && (
                 <Text style={styles.previewStat}>
-                  🔥 {formData.calories_burned} cal
+                  <Text>🔥 {formData.calories_burned} cal</Text>
                 </Text>
               )}
             </View>
diff --git a/KonditionExpo/components/feed/PostCard.tsx b/KonditionExpo/components/feed/PostCard.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { View, Text, StyleSheet, TouchableOpacity, Alert } from 'react-native';
+import React, { useState } from 'react';
+import { View, Text, StyleSheet, TouchableOpacity, Alert, ActivityIndicator, Platform } from 'react-native';
 import { WorkoutPostResponse } from '../../services/api';
 import { useFeed } from '../../contexts/FeedContext';
 import { useAuth } from '../../contexts/AuthContext';
@@ -13,9 +13,24 @@ interface PostCardProps {
 export function PostCard({ post, onPress }: PostCardProps) {
   const { deletePost } = useFeed();
   const { user } = useAuth();
+  const [isDeleting, setIsDeleting] = useState(false);
   
   const isOwnPost = user?.id === post.user_id;
   
+  // Enhanced debug logging to help identify the issue
+  console.log('PostCard Debug:', {
+    currentUserId: user?.id,
+    currentUserIdType: typeof user?.id,
+    postUserId: post.user_id,
+    postUserIdType: typeof post.user_id,
+    isOwnPost,
+    userFullName: user?.full_name,
+    postUserName: post.user_full_name,
+    postTitle: post.title,
+    strictEquality: user?.id === post.user_id,
+    looseEquality: user?.id == post.user_id
+  });
+  
   const formatDuration = (minutes: number): string => {
     if (minutes < 60) {
       return `${minutes}m`;
@@ -41,25 +56,84 @@ export function PostCard({ post, onPress }: PostCardProps) {
     return date.toLocaleDateString();
   };
 
-  const handleDelete = () => {
-    Alert.alert(
-      'Delete Post',
-      'Are you sure you want to delete this post?',
-      [
-        { text: 'Cancel', style: 'cancel' },
-        {
-          text: 'Delete',
-          style: 'destructive',
-          onPress: async () => {
-            try {
-              await deletePost(post.id);
-            } catch (error) {
-              Alert.alert('Error', 'Failed to delete post');
-            }
-          },
-        },
-      ]
-    );
+  const handleDelete = async () => {
+    console.log('Delete button pressed for post:', post.id, 'by user:', user?.id);
+    
+    if (isDeleting) {
+      console.log('Delete already in progress, ignoring click');
+      return; // Prevent multiple delete attempts
+    }
+    
+    console.log('Showing delete confirmation dialog');
+    
+    // Use web-compatible confirmation for web platform
+    if (Platform.OS === 'web') {
+      const confirmed = window.confirm('Are you sure you want to delete this post?');
+      if (!confirmed) {
+        console.log('User cancelled delete');
+        return;
+      }
+    } else {
+      // Use Alert.alert for native platforms
+      return new Promise((resolve) => {
+        Alert.alert(
+          'Delete Post',
+          'Are you sure you want to delete this post?',
+          [
+            {
+              text: 'Cancel',
+              style: 'cancel',
+              onPress: () => {
+                console.log('User cancelled delete');
+                resolve(false);
+              }
+            },
+            {
+              text: 'Delete',
+              style: 'destructive',
+              onPress: () => {
+                console.log('User confirmed delete via Alert');
+                resolve(true);
+              },
+            },
+          ]
+        );
+      }).then((confirmed) => {
+        if (!confirmed) return;
+        return performDelete();
+      });
+    }
+    
+    // For web, proceed directly after confirmation
+    console.log('User confirmed delete, starting deletion process...');
+    await performDelete();
+  };
+
+  const performDelete = async () => {
+    try {
+      setIsDeleting(true);
+      console.log('Calling deletePost with ID:', post.id);
+      await deletePost(post.id);
+      console.log('Delete post successful');
+      // Success feedback is handled by optimistic update in FeedContext
+    } catch (error) {
+      console.error('Delete post error:', error);
+      const errorMessage = error instanceof Error ? error.message : 'Failed to delete post';
+      console.log('Showing error alert:', errorMessage);
+      
+      if (Platform.OS === 'web') {
+        window.alert(`Delete Failed: ${errorMessage}`);
+      } else {
+        Alert.alert(
+          'Delete Failed',
+          errorMessage,
+          [{ text: 'OK', style: 'default' }]
+        );
+      }
+    } finally {
+      console.log('Delete process completed, resetting isDeleting state');
+      setIsDeleting(false);
+    }
   };
 
   return (
@@ -87,9 +161,20 @@ export function PostCard({ post, onPress }: PostCardProps) {
             </View>
           </View>
         </View>
+        {/* Only show delete button for user's own posts */}
         {isOwnPost && (
-          <TouchableOpacity onPress={handleDelete} style={styles.deleteButton}>
-            <IconSymbol name="trash" size={16} color="#FF3B30" />
+          <TouchableOpacity
+            onPress={handleDelete}
+            style={[styles.deleteButton, isDeleting && styles.deleteButtonDisabled]}
+            disabled={isDeleting}
+            activeOpacity={0.8}
+            hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+          >
+            {isDeleting ? (
+              <ActivityIndicator size="small" color="#FFFFFF" />
+            ) : (
+              <IconSymbol name="trash" size={18} color="#FFFFFF" />
+            )}
           </TouchableOpacity>
         )}
       </View>
@@ -206,7 +291,25 @@ const styles = StyleSheet.create({
     marginLeft: 4,
   },
   deleteButton: {
-    padding: 4,
+    padding: 10,
+    borderRadius: 8,
+    backgroundColor: '#FF3B30',
+    borderWidth: 2,
+    borderColor: '#FF1F1F',
+    minWidth: 40,
+    minHeight: 40,
+    justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: '#FF3B30',
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.3,
+    shadowRadius: 4,
+    elevation: 4,
+  },
+  deleteButtonDisabled: {
+    opacity: 0.6,
+    backgroundColor: '#FF8A80',
+    borderColor: '#FF8A80',
   },
   content: {
     marginBottom: 12,
diff --git a/KonditionExpo/contexts/FeedContext.tsx b/KonditionExpo/contexts/FeedContext.tsx
@@ -167,25 +167,44 @@ export function FeedProvider({ children }: FeedProviderProps) {
   }, []);
 
   const deletePost = useCallback(async (postId: string) => {
+    // Store the post data for potential restoration
+    let deletedPost: WorkoutPostResponse | null = null;
+    let previousState: FeedState | null = null;
+
     try {
-      setLoading(true);
       setError(null);
 
+      // Store current state and find the post to delete
+      setState(prev => {
+        previousState = { ...prev };
+        deletedPost = prev.personalFeed.find(post => post.id === postId) ||
+                     prev.publicFeed.find(post => post.id === postId) ||
+                     prev.combinedFeed.find(post => post.id === postId) ||
+                     null;
+
+        // Optimistic update: Remove the post immediately from all feeds
+        return {
+          ...prev,
+          personalFeed: prev.personalFeed.filter(post => post.id !== postId),
+          publicFeed: prev.publicFeed.filter(post => post.id !== postId),
+          combinedFeed: prev.combinedFeed.filter(post => post.id !== postId),
+        };
+      });
+
+      // Attempt to delete the post on the server
       await apiService.deleteWorkoutPost(postId);
       
-      // Remove the post from all feeds
-      setState(prev => ({
-        ...prev,
-        personalFeed: prev.personalFeed.filter(post => post.id !== postId),
-        publicFeed: prev.publicFeed.filter(post => post.id !== postId),
-        combinedFeed: prev.combinedFeed.filter(post => post.id !== postId),
-      }));
+      // Success - the optimistic update stands
     } catch (error) {
       console.error('Error deleting post:', error);
+      
+      // Restore the post to its previous position if deletion failed
+      if (previousState && deletedPost) {
+        setState(previousState);
+      }
+      
       setError(error instanceof Error ? error.message : 'Failed to delete post');
       throw error;
-    } finally {
-      setLoading(false);
     }
   }, []);
 
diff --git a/backend/app/crud/__init__.py b/backend/app/crud/__init__.py
@@ -10,13 +10,17 @@
     delete_workout_post,
     follow_user,
     get_feed_posts,
+    get_personal_feed_posts,
+    get_public_feed_posts,
+    get_combined_feed_posts,
     get_follower_count,
     get_followers,
     get_following,
     get_following_count,
     get_user_workout_posts,
     get_workout_post,
     is_following,
+    is_mutual_follow,
     search_users,
     unfollow_user,
     update_workout_post,
@@ -61,6 +65,10 @@
     "get_workout_post",
     "get_user_workout_posts",
     "get_feed_posts",
+    "get_personal_feed_posts",
+    "get_public_feed_posts",
+    "get_combined_feed_posts",
+    "is_mutual_follow",
     "update_workout_post",
     "delete_workout_post",
 ]
diff --git a/backend/app/crud/social.py b/backend/app/crud/social.py
@@ -225,6 +225,11 @@ def get_personal_feed_posts(
     Get workout posts from users that the specified user follows (personal feed).
     Includes privacy filtering: private posts only visible if mutual follow.
     """
+    # Early check: if no WorkoutPost records exist, return empty result immediately
+    total_posts_check = session.exec(select(func.count()).select_from(WorkoutPost)).one()
+    if total_posts_check == 0:
+        return [], 0
+    
     # Get IDs of users that the current user follows
     following_statement = (
         select(UserFollow.followed_id)
@@ -235,16 +240,18 @@ def get_personal_feed_posts(
     # Include the user's own posts in the feed
     following_ids.append(user_id)
     
+    # If no one to follow (including self), return empty
+    if not following_ids:
+        return [], 0
+    
     # Build privacy filter conditions
     privacy_conditions = []
     
     for followed_id in following_ids:
         if followed_id == user_id:
             # User's own posts - always visible
             privacy_conditions.append(
-                and_(
-                    WorkoutPost.user_id == user_id
-                )
+                WorkoutPost.user_id == user_id
             )
         else:
             # Posts from followed users
@@ -297,6 +304,11 @@ def get_public_feed_posts(
     """
     Get all public workout posts from all users (discovery feed).
     """
+    # Early check: if no WorkoutPost records exist, return empty result immediately
+    total_posts_check = session.exec(select(func.count()).select_from(WorkoutPost)).one()
+    if total_posts_check == 0:
+        return [], 0
+    
     # Count all public posts
     count_statement = (
         select(func.count())
