Final polish to pages.

.gitignore

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

pom.xml

@@ -29,7 +29,13 @@
     <properties>
         <java.version>21</java.version>
     </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.11.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -42,6 +48,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
@@ -66,6 +76,11 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.11.1</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -95,6 +110,11 @@
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity6</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.11.1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -118,6 +138,15 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.flywaydb</groupId>
+                <artifactId>flyway-maven-plugin</artifactId>
+                <version>11.7.2</version>
+                <configuration>
+                    <url>jdbc:postgresql://localhost:5432/acebook_springboot_development</url>
+                    <cleanDisabled>false</cleanDisabled>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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

@@ -1,28 +1,38 @@
 package com.makersacademy.acebook.config;
 
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.UserRepository;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import static org.springframework.security.config.Customizer.withDefaults;
 
 @Configuration
 @EnableWebSecurity
 public class SecurityConfiguration {
 
+    @Autowired
+    private UserRepository userRepository;
+
     @Value("${okta.oauth2.issuer}")
     private String issuer;
     @Value("${okta.oauth2.client-id}")
@@ -31,7 +41,7 @@ public class SecurityConfiguration {
     @Bean
     public SecurityFilterChain configure(HttpSecurity http) throws Exception {
         http
-                .csrf(csrf -> csrf.disable())
+                .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorize -> authorize
                         .requestMatchers("/", "/images/**").permitAll()
                         .anyRequest().authenticated()
@@ -40,7 +50,15 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
                         .successHandler(new AuthenticationSuccessHandler() {
                             @Override
                             public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
-                                response.sendRedirect("/users/after-login");
+                                DefaultOidcUser principal = (DefaultOidcUser) authentication.getPrincipal();
+                                String username = (String) principal.getAttributes().get("email");
+                                Optional<User> user = userRepository.findUserByUsername(username);
+                                if (user.isEmpty()) {
+                                    response.sendRedirect("/users/after-login"); // Redirect if user is missing
+                                } else {
+                                    response.sendRedirect("/users/after-login");
+                                    //^^ if user is not in OUR database, they get redirected
+                                }
                             }
                         })
                 )
@@ -60,4 +78,4 @@ private LogoutHandler logoutHandler() {
             }
         };
     }
-}
+}

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

@@ -0,0 +1,146 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.FriendRequest;
+import com.makersacademy.acebook.model.Friendship;
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.FriendRequestRepository;
+import com.makersacademy.acebook.repository.FriendshipRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+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.mvc.support.RedirectAttributes;
+import org.thymeleaf.util.ArrayUtils;
+
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.Optional;
+
+@Controller
+public class FriendsController {
+    @Autowired
+    FriendshipRepository friendshipRepository;
+    @Autowired
+    FriendRequestRepository friendRequestRepository;
+    @Autowired
+    UserRepository userRepository;
+
+    @ModelAttribute("user")
+    public Optional<User> getUser(Authentication authentication) {
+        DefaultOidcUser principal = (DefaultOidcUser) authentication.getPrincipal();
+        String username = (String) principal.getAttributes().get("email");
+        return userRepository.findUserByUsername(username);
+    }
+
+    @GetMapping("/friends")
+    public String friends(Model model, Authentication authentication){
+        DefaultOidcUser principal = (DefaultOidcUser) authentication.getPrincipal();
+        String username = (String) principal.getAttributes().get("email");
+        Optional<User> user = userRepository.findUserByUsername(username);
+        if (user.isEmpty()) {
+            return "redirect:/users/newUser"; // Redirect if not registered
+        }
+        Long userIdLong = user.get().getId(); // getting id from database - checking that id is connected
+        int userId = Math.toIntExact(userIdLong);
+        ArrayList<Friendship> friendsListArray =  friendshipRepository.findFriendshipByUserId(userId);
+
+//        String friendsListEmails = "";
+        ArrayList<User> friendsUserListArray = new ArrayList<User>();
+
+
+//        int arrayPos = 0;
+        for (Friendship friendship :friendsListArray){
+            Optional<User> friendOptional = userRepository.findById((long) friendship.getFriendId());
+            User friend = friendOptional.get();
+            friendsUserListArray.add(friend);
+        }
+        model.addAttribute("friends",friendsUserListArray);
+        model.addAttribute("user",user.get());
+        return "friends";
+    }
+
+    @PostMapping("/friends/unfriend")
+    public String unfriend(@RequestParam("unfriendId") Long unfriendId,@RequestParam("userId") Long userId) {
+        int unfriendInt = unfriendId.intValue();
+        int userInt = userId.intValue();
+        ArrayList<Friendship> friendshipList = friendshipRepository.findFriendshipByUserIdAndFriendId(unfriendInt,userInt);
+        ArrayList<Friendship> friendshipFrom = friendshipRepository.findFriendshipByUserIdAndFriendId(userInt,unfriendInt);
+        friendshipList.addAll(friendshipFrom);
+
+
+        for (Friendship friendship : friendshipList){
+            friendshipRepository.delete(friendship);
+        }
+        return "redirect:/friends";
+    }
+
+    @PostMapping("/friends/search")
+    public String searchFriends(@RequestParam(value = "searchQuery", defaultValue = "") String searchQuery, Model model, Authentication authentication) {
+        // Get the logged-in user's details
+        DefaultOidcUser principal = (DefaultOidcUser) authentication.getPrincipal();
+        String username = (String) principal.getAttributes().get("email");
+        Optional<User> user = userRepository.findUserByUsername(username);
+
+        if (user.isEmpty()) {
+            return "redirect:/users/newUser"; // Redirect if not registered
+        }
+
+
+        // Search for users matching the query
+        String queryLow = searchQuery.toLowerCase();
+        ArrayList<User> approxOutput = userRepository.approximateUserSearch(queryLow);
+        ArrayList<User> exactOutput = userRepository.exactUserSearch(queryLow);
+        for (User userSearched : approxOutput)
+        {
+            if(!exactOutput.contains(userSearched)){
+                exactOutput.add(userSearched);
+            }
+        }
+        ArrayList<Friendship> friendshipsArray = friendshipRepository.findFriendshipByUserId(user.get().getId().intValue());
+        ArrayList<Long> friendIds = new ArrayList<>();
+        for(Friendship friendship : friendshipsArray){
+            friendIds.add(friendship.getFriendId());
+        }
+        exactOutput.removeIf(searchedUser -> friendIds.contains(searchedUser.getId()));
+        exactOutput.removeIf(searchedUser -> Objects.equals(searchedUser.getId(), user.get().getId()));
+
+//      Identifying which friends within the search have already been friended
+        ArrayList<FriendRequest> existingRequests = friendRequestRepository.findFriendRequestByfromUserIdAndStatus(user.get().getId(),"PENDING");
+        ArrayList<User> alreadyFriended = new ArrayList<>(exactOutput);
+
+
+        ArrayList<Long> existingRequestIds = new ArrayList<>();
+        for(FriendRequest friendRequest : existingRequests){
+            existingRequestIds.add(friendRequest.getToUserId());
+        }
+
+        alreadyFriended.removeIf(userFriend -> !existingRequestIds.contains(userFriend.getId()));
+        System.out.println(alreadyFriended);
+
+        // Add search results to the model
+        model.addAttribute("friends", exactOutput); // Replace friends list with search results
+        model.addAttribute("user", user.get());
+        model.addAttribute("searchQuery", searchQuery); // Keep track of the search term
+        model.addAttribute("alreadyFriendRequested",alreadyFriended); // The list of people who have already been sent a friend request
+
+        return "friends"; // Return the same friends page with search results
+    }
+
+    @PostMapping("/friends/addfriend")
+    public String addFriend(@RequestParam("newFriendId") Long recipientId){
+        return "redirect:/manageFriends?recipientId="+recipientId;
+    }
+
+    @PostMapping("/friends/deletefriendrequest")
+    public String deleteFriendRequest(@RequestParam("friendRequestFriendId") Long friendId,@RequestParam("userId") Long userId){
+        ArrayList<FriendRequest> requestsToDelete = friendRequestRepository.findFriendRequestByFromUserIdAndToUserIdAndStatus(userId,friendId,"PENDING");
+        for(FriendRequest request:requestsToDelete){
+            friendRequestRepository.deleteById(request.getId());
+        }
+        return "redirect:/friends";
+    }
+
+}

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

@@ -1,13 +1,38 @@
 package com.makersacademy.acebook.controller;
 
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.security.core.Authentication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.view.RedirectView;
 
+import java.util.Optional;
+
 @Controller
 public class HomeController {
-	@RequestMapping(value = "/")
-	public RedirectView index() {
-		return new RedirectView("/posts");
+
+	@Autowired
+	UserRepository userRepository;
+
+	@ModelAttribute("user")
+	Optional<User> findUser(Authentication authentication) {
+		DefaultOidcUser principal = (DefaultOidcUser) authentication.getPrincipal();
+		String username = (String) principal.getAttributes().get("email");
+		return userRepository.findUserByUsername(username);
+	}
+
+	// Routes ------
+
+	@GetMapping(value = "/")
+	public String index(@ModelAttribute("user") Optional<User> user) {
+        return user.
+//				map(_user -> "redirect:/posts" + _user.getUsername())
+				map(_user -> "redirect:/posts")
+				.orElse("redirect:/users/newUser");
 	}
 }