Upload pic

pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-	    <version>1.18.24</version>
+	    <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/makersacademy/acebook/SecurityConfiguration.java

@@ -28,11 +28,11 @@ protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/posts").hasRole("USER")
                 .antMatchers("/users").permitAll()
-                .and().formLogin();
+                .and().formLogin().loginPage("/login");
     }
 
     @Bean
     public PasswordEncoder getPasswordEncoder() {
         return NoOpPasswordEncoder.getInstance();
     }
-}
+}

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

@@ -0,0 +1,96 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.Friend;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.FriendRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+@Controller
+public class FriendController {
+
+    @Autowired
+    FriendRepository friendRepository;
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/users/friend")
+    public ModelAndView showFriends(Model model) {
+        ModelAndView modelAndView = new ModelAndView("/users/friend");
+        modelAndView.addObject("friend", new Friend());
+        return modelAndView;
+    }
+
+    @GetMapping("/friends")
+    public ModelAndView showRequests(Principal principal) {
+        ModelAndView modelAndView = new ModelAndView("/users/friends");
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+
+        assert principalUser != null;
+        List<Friend> pendingRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "PENDING");
+        List<Friend> acceptedRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "ACCEPTED");
+
+        ArrayList<User> friendRequests = new ArrayList<>();
+        for (Friend friend : pendingRequests) {
+            Optional<User> optionalUser = userRepository.findById(friend.getRequesterId());
+            User friendRequest = optionalUser.orElse(null);
+            friendRequests.add(friendRequest);
+        }
+
+        ArrayList<User> friends = new ArrayList<>();
+        for (Friend friend : acceptedRequests) {
+            Optional<User> optionalUser = userRepository.findById(friend.getRequesterId());
+            User acceptedRequest = optionalUser.orElse(null);
+            friends.add(acceptedRequest);
+        }
+
+        modelAndView.addObject("friendRequests", friendRequests);
+        modelAndView.addObject("friends", friends);
+        return modelAndView;
+    }
+
+    @PostMapping("/handleFriendRequest")
+    public RedirectView handleFriendRequest(@RequestParam("requester_id") Long requesterId,
+                                            @RequestParam("receiver_id") Long receiverId, Principal principal) {
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Friend friendRequest = new Friend(requesterId, receiverId, "PENDING");
+        friendRepository.save(friendRequest);
+
+        return new RedirectView("/users/" + receiverId);
+    }
+
+    @PostMapping("/handleFriendConfirmation")
+    public String handleConfirmation(@RequestParam("action") String action,
+                                 @RequestParam("requesterId") Long requesterId, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User receiverId = currentUser.orElse(null);
+        assert receiverId != null;
+
+        if ("accept".equals(action)) {
+            friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "ACCEPTED");
+        } else if ("deny".equals(action)) {
+            friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "DENIED");
+        }
+
+        return "redirect:/friends";
+    }
+}

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

@@ -4,10 +4,24 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.view.RedirectView;
 
+import javax.servlet.http.HttpSession;
+
 @Controller
 public class HomeController {
 	@RequestMapping(value = "/")
 	public RedirectView index() {
 		return new RedirectView("/posts");
 	}
+
+	@RequestMapping("/login")
+	public String login() {
+		return "login";
+	}
+	@RequestMapping("/logout")
+	public String logout(HttpSession session) {
+		session.removeAttribute("user_id");
+		return "logout";
+	}
+
 }
+

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

@@ -1,32 +1,104 @@
 package com.makersacademy.acebook.controller;
 
+import com.makersacademy.acebook.model.Comment;
+import com.makersacademy.acebook.model.Friend;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import java.util.List;
+import java.security.Principal;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 public class PostsController {
 
     @Autowired
-    PostRepository repository;
+    PostRepository postRepository;
+    @Autowired
+    UserRepository userRepository;
 
     @GetMapping("/posts")
-    public String index(Model model) {
-        Iterable<Post> posts = repository.findAll();
-        model.addAttribute("posts", posts);
-        model.addAttribute("post", new Post());
+    public String index(Model model, Principal principal) {
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        Iterable<Post> posts = postRepository.findAllByOrderByTimestampDesc();
+        ArrayList<HashMap<Post, User>> postsAndPosters = new ArrayList<>();
+
+        for (Post post : posts) {
+            HashMap<Post, User> entry = new HashMap<>();
+
+            Optional<User> optionalUser = userRepository.findById(post.getUserId());
+            User poster = optionalUser.orElse(null);
+
+            entry.put(post, poster);
+            postsAndPosters.add(entry);
+        }
+
+//        System.out.println(postsAndPosters);
+
+        model.addAttribute("postsAndPosters", postsAndPosters);
+        model.addAttribute("newPost", new Post());
+        model.addAttribute("profilePicture", principalUser.getImageUrl());
+
         return "posts/index";
     }
 
     @PostMapping("/posts")
-    public RedirectView create(@ModelAttribute Post post) {
-        repository.save(post);
+    public RedirectView create(@ModelAttribute Post post, Principal principal) {
+        String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date());
+        post.setTimestamp(Timestamp.valueOf(timeStamp));
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        post.setUserId(principalUser.getId());
+        postRepository.save(post);
         return new RedirectView("/posts");
     }
+
+    @GetMapping("/post/{id}")
+    public String show(@PathVariable Long id, Model model) {
+
+        Optional<Post> post = postRepository.findById(id);
+        Post currentPost = post.orElse(null);
+        model.addAttribute("currentPost", currentPost);
+
+        Comment newComment = new Comment();
+        model.addAttribute("newComment", newComment);
+
+        return "posts/show";
+    }
+
+    @PostMapping("/post/{id}")
+    public ModelAndView createComment(@PathVariable Long id, @ModelAttribute Comment comment, Principal principal) {
+
+//        to make a new comment for a post:
+//        comment content, post_id, user_id
+        comment.setPostId(id);
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        comment.setUserId(principalUser.getId());
+
+
+
+
+
+
+
+
+        ModelAndView modelAndView = new ModelAndView("/post/{id}");
+        modelAndView.addObject("comment", new Comment());
+        return modelAndView;
+
+    }
 }

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

@@ -1,24 +1,37 @@
 package com.makersacademy.acebook.controller;
 
 import com.makersacademy.acebook.model.Authority;
+import com.makersacademy.acebook.model.Friend;
 import com.makersacademy.acebook.model.User;
 import com.makersacademy.acebook.repository.AuthoritiesRepository;
+import com.makersacademy.acebook.repository.FriendRepository;
 import com.makersacademy.acebook.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
 
+import javax.servlet.http.HttpSession;
+import java.security.Principal;
+import java.util.List;
+import java.util.Objects;
+import java.util.ArrayList;
+import java.util.Optional;
+
+import static java.lang.Boolean.valueOf;
+
 @Controller
 public class UsersController {
 
     @Autowired
     UserRepository userRepository;
     @Autowired
     AuthoritiesRepository authoritiesRepository;
+    @Autowired
+    FriendRepository friendRepository;
 
     @GetMapping("/users/new")
     public String signup(Model model) {
@@ -27,10 +40,45 @@ public String signup(Model model) {
     }
 
     @PostMapping("/users")
-    public RedirectView signup(@ModelAttribute User user) {
+    public RedirectView signup(@ModelAttribute User user, @RequestParam("fileData") String fileData) {
+        user.setImageUrl(fileData);
+
         userRepository.save(user);
         Authority authority = new Authority(user.getUsername(), "ROLE_USER");
         authoritiesRepository.save(authority);
         return new RedirectView("/login");
     }
+
+    @GetMapping("/users/{id}")
+    public ModelAndView show(@PathVariable Long id, Principal principal) {
+        Optional<User> pageUser = userRepository.findById(id);
+        User user = pageUser.orElse(null);
+
+        Optional<User> currentUser = userRepository.findByUsername(principal.getName());
+        User principalUser = currentUser.orElse(null);
+        assert principalUser != null;
+
+        ModelAndView modelAndView = new ModelAndView("/users/show");
+        modelAndView.addObject("currentUser", principalUser);
+        modelAndView.addObject("user", user);
+
+        Iterable<Friend> userRequests = friendRepository.findByRequesterIdOrReceiverId(principalUser.getId(), principalUser.getId());
+
+        for (Friend friend : userRequests) {
+            if (Objects.equals(friend.getReceiverId(), id) || Objects.equals(friend.getRequesterId(), id)) {
+                modelAndView.addObject("userRequest", friend);
+                break;
+            } else {
+                modelAndView.addObject("userRequest", null);
+            }
+        }
+
+        if (principal.getName().equals(Objects.requireNonNull(user).getUsername())) {
+            modelAndView.addObject("isCurrentUser", true);
+        } else {
+            modelAndView.addObject("isCurrentUser", false);
+        }
+
+        return modelAndView;
+    }
 }

src/main/java/com/makersacademy/acebook/model/Authority.java

@@ -1,7 +1,6 @@
 package com.makersacademy.acebook.model;
 
 import lombok.Data;
-
 import javax.persistence.*;
 
 @Data