Sashas styling changes

.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/SecurityConfiguration.java

@@ -33,7 +33,10 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
         http
                 .csrf(csrf -> csrf.disable())
                 .authorizeHttpRequests(authorize -> authorize
-                        .requestMatchers("/", "/images/**").permitAll()
+                        .requestMatchers("/",
+                                "/main.css",
+                                "/images/**",
+                                "/favicon.png").permitAll()
                         .anyRequest().authenticated()
                 )
                 .oauth2Login(oauth2 -> oauth2

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("/uploads/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,83 @@
+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.CommentRepository;
+import com.makersacademy.acebook.repository.NotificationRepository;
+import com.makersacademy.acebook.repository.PostRepository;
+import com.makersacademy.acebook.repository.UserRepository;
+import com.makersacademy.acebook.service.CommentService;
+import com.makersacademy.acebook.service.NotificationService;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.view.RedirectView;
+
+import java.util.List;
+import jakarta.transaction.Transactional;
+
+
+@Controller
+@RequestMapping("/posts/comments")
+public class CommentController {
+
+    private final CommentService commentService;
+    private final PostRepository postRepository;
+    private final UserRepository userRepository;
+    private final NotificationService notificationService;
+    private final CommentRepository commentRepository;
+
+    public CommentController(CommentService commentService, PostRepository postRepository, UserRepository userRepository,NotificationRepository notificationRepository, NotificationService notificationService, CommentRepository commentRepository) {
+        this.commentService = commentService;
+        this.postRepository = postRepository;
+        this.userRepository = userRepository;
+        this.notificationService = notificationService;
+        this.commentRepository = commentRepository;
+    }
+
+
+    // Show comments for specific post
+    @GetMapping("/post/{postId}")
+    @ResponseBody
+    public List<Comment> getCommentsByPost(@PathVariable Long postId) {
+        return commentService.getCommentsForPost(postId);
+    }
+
+    // This will POST to add a comment and then redirect back to the post with the updated comment for that post
+    @PostMapping
+    public RedirectView createComment(@ModelAttribute CommentRequest request,
+                                      @AuthenticationPrincipal(expression = "attributes['email']") String email) {
+        Post post = postRepository.findById(request.getPostId())
+                .orElseThrow(() -> new RuntimeException("Post not found"));
+
+        User user = userRepository.findUserByUsername(email)
+                .orElseThrow(() -> new RuntimeException("User not found"));
+
+        Comment comment = new Comment();
+        comment.setPost(post);
+        comment.setUser(user);
+        comment.setContent(request.getContent());
+
+        commentService.addComment(comment);
+        notificationService.newNotification(user.getId(), "comment", comment, null, null);
+        return new RedirectView("/posts/" + post.getId());
+    }
+
+
+    @Transactional
+    @PostMapping("/{commentId}/delete")
+    public RedirectView deleteComment(@PathVariable Long commentId,
+                                      @RequestParam Long postId,
+                                      @AuthenticationPrincipal(expression = "attributes['email']") String email) {
+
+        if (userRepository.findUserByUsername(email).get().getId() == commentRepository.findById(commentId).get().getUser().getId()) {
+            commentService.deleteComment(commentId);
+            return new RedirectView("/posts/" + postId);
+        } else {
+            return new RedirectView("/profile");
+        }
+    }
+}
+

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

@@ -0,0 +1,36 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.service.CommentLikeService;
+import jakarta.transaction.Transactional;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+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.view.RedirectView;
+
+@Controller
+@RequestMapping("/posts/comments")
+public class CommentLikeController {
+    private final CommentLikeService commentLikeService;
+    public CommentLikeController(CommentLikeService commentLikeService) {
+        this.commentLikeService = commentLikeService;
+    }
+
+    @Transactional
+    @PostMapping("/{commentId}/like")
+    public RedirectView likeComment(@PathVariable Long commentId,
+                                    @RequestParam Long postId,
+                                    @AuthenticationPrincipal(expression = "attributes['email']") String email) {
+        commentLikeService.likeComment(commentId, email);
+        return new RedirectView("/posts/" + postId);
+    }
+
+    @Transactional
+    @PostMapping("/{commentId}/unlike")
+    public RedirectView unlikeComment(@PathVariable Long commentId,
+                                    @RequestParam Long postId,
+                                    @AuthenticationPrincipal(expression = "attributes['email']") String email) {
+        commentLikeService.unlikeComment(commentId, email);
+        return new RedirectView("/posts/" + postId);
+    }
+}