Image upload retry

.gitignore

@@ -9,3 +9,5 @@ dependency-reduced-pom.xml
 .factorypath
 .project
 .settings/
+application.yml
+.DS_Store

README.md

@@ -1,5 +1,7 @@
 # Acebook
 
+https://trello.com/b/VidgaAkH/acebook-engineering-project-2
+
 The application uses:
   - `maven` to build the project
   - `thymeleaf` for templating

pom.xml

@@ -64,6 +64,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.32</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -102,6 +103,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.3.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -114,6 +116,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
+                            <version>1.18.32</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

src/main/java/com/makersacademy/acebook/config/WebConfig.java

@@ -0,0 +1,24 @@
+package com.makersacademy.acebook.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+// This class customises how the app serves static resources (e.g. images) from the file system
+// Resource handlers map URL paths to filesystem directories so static files (e.g. images) can be served via HTTP
+// This is required for image storage outside the classpath (src) on uploading
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // Handler for profile images
+        registry.addResourceHandler("/images/user_profile/**")
+                .addResourceLocations("file:uploads/user_profile/");
+
+        // Handler for post images
+        registry.addResourceHandler("/uploads/post_images/**")
+                .addResourceLocations("file:uploads/post_images/");
+    }
+}

src/main/java/com/makersacademy/acebook/controller/CommentController.java

@@ -0,0 +1,49 @@
+//package com.makersacademy.acebook.controller;
+//
+//import com.makersacademy.acebook.dto.CommentRequest;
+//import com.makersacademy.acebook.model.Comment;
+//import com.makersacademy.acebook.model.Post;
+//import com.makersacademy.acebook.model.User;
+//import com.makersacademy.acebook.repository.PostRepository;
+//import com.makersacademy.acebook.repository.UserRepository;
+//import com.makersacademy.acebook.service.CommentService;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+//@RestController
+//@RequestMapping("/post/comments")
+//public class CommentController {
+//
+//    private final CommentService commentService;
+//    private final PostRepository postRepository;
+//    private final UserRepository userRepository;
+//
+//    public CommentController(CommentService commentService, PostRepository postRepository, UserRepository userRepository) {
+//        this.commentService = commentService;
+//        this.postRepository = postRepository;
+//        this.userRepository = userRepository;
+//    }
+//
+//    @GetMapping("/post/{postId}")
+//    public List<Comment> getCommentsByPost(@PathVariable Long postId) {
+//        return commentService.getCommentsForPost(postId);
+//    }
+//
+//    @PostMapping
+//    public Comment createComment(@RequestBody CommentRequest request) {
+//        Post post = postRepository.findById(request.getPostId())
+//                .orElseThrow(() -> new RuntimeException("Post not found"));
+//        User user = userRepository.findById(request.getUserId())
+//                .orElseThrow(() -> new RuntimeException("User not found"));
+//
+//        Long commentId = 0L;
+//        Comment comment = new Comment(commentId);
+//        comment.setPost(post);
+//        comment.setUser(user);
+//        comment.setContent(request.getContent());
+//
+//        return commentService.addComment(comment);
+//    }
+//}
+//

src/main/java/com/makersacademy/acebook/controller/FriendsController.java

@@ -0,0 +1,133 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Friend;
+import com.makersacademy.acebook.model.FriendRequest;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.FriendRepository;
+import com.makersacademy.acebook.repository.FriendRequestRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Controller
+public class FriendsController {
+
+    @Autowired
+    FriendRequestRepository friendRequestRepository;
+    @Autowired
+    FriendRepository friendRepository;
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/friends")
+    public ModelAndView friendList(@AuthenticationPrincipal(expression = "attributes['email']") String email) {
+        ModelAndView modelAndView = new ModelAndView("friends/friends");
+
+        // User!
+        Optional<User> userOptional = userRepository.findUserByUsername(email);
+
+        User currentUser = userOptional.get();
+        Long userId = currentUser.getId();
+
+        // Friends!
+        List<Friend> friendsList = friendRepository.findAllByMainUserId(userId);
+
+        // Objectify!
+        List<User> friendUsers = new ArrayList<>();
+        for (Friend friend : friendsList) {
+            Long friendId = friend.getFriendUserId();
+            Optional<User> friendUser = userRepository.findById(friendId);
+            if (friendUser.isPresent()) {
+                friendUsers.add(friendUser.get());
+            }
+        }
+
+        // Friend Requests!
+        List<FriendRequest> pendingRequests = friendRequestRepository.findAllByReceiverIdAndStatus(userId, "pending");
+
+        // Objectify!
+        List<User> requesterUsers = new ArrayList<>();
+        for (FriendRequest request : pendingRequests) {
+            Long requesterId = request.getRequesterId();
+            Optional<User> requesterUser = userRepository.findById(requesterId);
+            if (requesterUser.isPresent()) {
+                requesterUsers.add(requesterUser.get());
+            }
+        }
+
+        modelAndView.addObject("friendUsers", friendUsers);
+        modelAndView.addObject("requesterUsers", requesterUsers);
+
+        return modelAndView;
+    }
+
+    @PostMapping("/friend_request/{requesterId}")
+    public RedirectView respondToFriendRequest(
+            @PathVariable Long requesterId,
+            @RequestParam String decision,
+            @AuthenticationPrincipal(expression = "attributes['email']") String email) {
+
+        // Get User!
+        Optional<User> userOptional = userRepository.findUserByUsername(email);
+
+        User currentUser = userOptional.get();
+        Long currentUserId = currentUser.getId();
+
+        // Get Friend Request!
+        Optional<FriendRequest> friendRequestOptional = friendRequestRepository
+                .findByRequesterIdAndReceiverIdAndStatus(requesterId, currentUserId, "pending");
+
+
+        FriendRequest friendRequest = friendRequestOptional.get();
+
+        if (decision.equals("accept")) {
+            friendRequest.setStatus("accepted");
+            Instant instant = Instant.now();
+            Timestamp now = Timestamp.from(instant);
+            friendRequest.setRespondedAt(now);
+            friendRequestRepository.save(friendRequest);
+
+
+            Friend friendship1 = new Friend();
+            friendship1.setMainUserId(currentUserId);
+            friendship1.setFriendUserId(requesterId);
+            friendship1.setFriendsSince(now);
+            friendRepository.save(friendship1);
+
+            Friend friendship2 = new Friend();
+            friendship2.setMainUserId(requesterId);
+            friendship2.setFriendUserId(currentUserId);
+            friendship2.setFriendsSince(now);
+            friendRepository.save(friendship2);
+
+        } else if (decision.equals("decline")) {
+            friendRequest.setStatus("rejected");
+//            friendRequest.setRespondedAt();
+            friendRequestRepository.save(friendRequest);
+        }
+
+        return new RedirectView("/friends");
+    }
+
+//    @PostMapping("/friends")
+//    public RedirectView create(@ModelAttribute Friend friend, @AuthenticationPrincipal(expression = "attributes['email']") String email) {
+//        Optional<User> user = userRepository.findUserByUsername(email);
+//        if (user.isPresent()) {
+//            Long id = user.get().getId();
+//        }
+//        return new RedirectView("friends/friends");
+//    }
+    }
+

src/main/java/com/makersacademy/acebook/controller/HomeController.java

@@ -2,12 +2,13 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
 @Controller
 public class HomeController {
 	@RequestMapping(value = "/")
-	public RedirectView index() {
-		return new RedirectView("/posts");
+	public ModelAndView index() {
+		return new ModelAndView("/landing");
 	}
 }

src/main/java/com/makersacademy/acebook/controller/NotificationsController.java

@@ -0,0 +1,65 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Notification;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.NotificationRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.util.*;
+
+@Controller
+public class NotificationsController {
+
+    @Autowired
+    NotificationRepository notificationRepository;
+    @Autowired
+    UserRepository userRepository;
+
+
+    // Get notifications for current user
+    @GetMapping("/notifications")
+    public String index(Model model) {
+        DefaultOidcUser principal = (DefaultOidcUser) SecurityContextHolder
+                .getContext()
+                .getAuthentication()
+                .getPrincipal();
+        String username = (String) principal.getAttributes().get("email");
+        User currentUser = userRepository.findUserByUsername(username).get();
+
+        Collection<Notification> notifications = new ArrayList<>();
+        notifications.addAll(notificationRepository.findByReceivingUserIdOrderByCreatedAtDesc(2L));
+        Map<Long, String> senderNames = new HashMap<>();
+        for (Notification notification : notifications) {
+            Optional<User> sender = userRepository.findById(notification.getSendingUserId());
+            sender.ifPresent(user -> senderNames.put(notification.getId(), user.getFirst_name()));
+        }
+        model.addAttribute("notifications", notifications);
+        model.addAttribute("senderNames", senderNames);
+        return "notifications/index";
+    }
+
+
+    // Mark notification as read, redirect to specific post page
+    @PostMapping("/notifications")
+    public RedirectView markAsRead(@ModelAttribute Notification notification, @RequestParam String id) {
+        Long notificationId = Long.parseLong(id);
+        Optional<Notification> readNotification = notificationRepository.findById(notificationId);
+        if (readNotification.isPresent()) {
+            Notification activeNotification = readNotification.get();
+            activeNotification.setRead(true);
+            notificationRepository.save(activeNotification);
+            String postId = Long.toString(activeNotification.getPostId());
+            return new RedirectView("/posts/" + postId);
+        }
+        else {
+                return new RedirectView("genericErrorPage");
+        }
+    }
+}