User model

pom.xml

@@ -104,7 +104,17 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.22.0</version> <!-- Use the latest version available -->
+            <scope>test</scope> <!-- Ensure Mockito is only included in test scope -->
+        </dependency>
+
+
+
     </dependencies>
 
 
+
 </project>

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

@@ -26,9 +26,10 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
+                .antMatchers("/", "/home", "/css/**").permitAll()
                 .antMatchers("/posts").hasRole("USER")
                 .antMatchers("/users").permitAll()
-                .and().formLogin();
+                .and().formLogin().defaultSuccessUrl("/posts", true);
     }
 
     @Bean

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

@@ -1,13 +1,16 @@
 package com.makersacademy.acebook.controller;
 
+import com.makersacademy.acebook.model.User;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.view.RedirectView;
 
 @Controller
 public class HomeController {
+
 	@RequestMapping(value = "/")
-	public RedirectView index() {
-		return new RedirectView("/posts");
+	public String index(Model model) {
+		model.addAttribute("user", new User());
+		return "home"; // Ensure this matches the name of your Thymeleaf template
 	}
 }

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

@@ -5,10 +5,14 @@
 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.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.view.RedirectView;
 
-import java.util.List;
+import java.util.Date;
+
 
 @Controller
 public class PostsController {
@@ -26,7 +30,15 @@ public String index(Model model) {
 
     @PostMapping("/posts")
     public RedirectView create(@ModelAttribute Post post) {
+        post.setCreatedAt(new Date());
+
         repository.save(post);
         return new RedirectView("/posts");
     }
+
+    @PostMapping("/posts/{id}/delete")
+    public RedirectView delete(@PathVariable Long id){
+        repository.deleteById(id);
+        return new RedirectView("/posts");
+    }
 }

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

@@ -5,13 +5,16 @@
 import com.makersacademy.acebook.repository.AuthoritiesRepository;
 import com.makersacademy.acebook.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 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.servlet.view.RedirectView;
 
+
 @Controller
 public class UsersController {
 
@@ -20,7 +23,7 @@ public class UsersController {
     @Autowired
     AuthoritiesRepository authoritiesRepository;
 
-    @GetMapping("/users/new")
+    @GetMapping("/register")
     public String signup(Model model) {
         model.addAttribute("user", new User());
         return "users/new";
@@ -33,4 +36,35 @@ public RedirectView signup(@ModelAttribute User user) {
         authoritiesRepository.save(authority);
         return new RedirectView("/login");
     }
+
+    @GetMapping("/profile")
+    public String showProfile(Model model) {
+        User currentUser = getCurrentUser();
+        model.addAttribute("user", currentUser);
+        return "users/profile";
+    }
+
+    @PostMapping("/profile")
+    public RedirectView updateProfile(@ModelAttribute User user) {
+        User currentUser = getCurrentUser();
+        currentUser.setMobileNumber(user.getMobileNumber());
+        currentUser.setEmailAddress(user.getEmailAddress());
+        currentUser.setGender(user.getGender());
+        currentUser.setCountry(user.getCountry());
+        currentUser.setLanguage(user.getLanguage());
+        userRepository.save(currentUser);
+        return new RedirectView("/profile");
+    }
+
+    private User getCurrentUser() {
+        // Assuming you're using Spring Security to manage user authentication
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        String username;
+        if (principal instanceof UserDetails) {
+            username = ((UserDetails) principal).getUsername();
+        } else {
+            username = principal.toString();
+        }
+        return userRepository.findByUsername(username);
+    }
 }

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

@@ -1,29 +1,23 @@
 package com.makersacademy.acebook.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.GenerationType;
-
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+
+import javax.persistence.*;
+import java.util.Date;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Entity
 @Table(name = "POSTS")
 public class Post {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private String content;
-
-    public Post() {}
-
-    public Post(String content) {
-        this.content = content;
-    }
-    public String getContent() { return this.content; }
-    public void setContent(String content) { this.content = content; }
 
+    private String title;
+    private String content;
+    private Date createdAt;
 }

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

@@ -1,16 +1,14 @@
 package com.makersacademy.acebook.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.GenerationType;
-
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import static java.lang.Boolean.TRUE;
+import javax.persistence.*;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Entity
 @Table(name = "USERS")
 public class User {
@@ -19,26 +17,10 @@ public class User {
     private Long id;
     private String username;
     private String password;
-    private boolean enabled;
-
-    public User() {
-        this.enabled = TRUE;
-    }
-
-    public User(String username, String password) {
-        this.username = username;
-        this.password = password;
-        this.enabled = TRUE;
-    }
-
-    public User(String username, String password, boolean enabled) {
-        this.username = username;
-        this.password = password;
-        this.enabled = enabled;
-    }
-
-    public String getUsername() { return this.username; }
-    public String getPassword() { return this.password; }
-    public void setUsername(String username) { this.username = username; }
-    public void setPassword(String password) { this.password = password; }
+    private boolean enabled = true;
+    private String mobileNumber;
+    private String emailAddress;
+    private String gender;
+    private String country;
+    private String language;
 }

src/main/java/com/makersacademy/acebook/repository/UserRepository.java

@@ -5,4 +5,5 @@
 
 public interface UserRepository extends CrudRepository<User, Long> {
 
+    User findByUsername(String username);
 }

src/main/resources/application.properties

@@ -2,4 +2,6 @@ spring.profiles.active=dev
 spring.data.rest.base-path=/api
 spring.datasource.platform=postgres
 spring.jpa.hibernate.ddl-auto=validate
-logging.level.org.springframework.web: DEBUG
+logging.level.org.springframework.web: DEBUG#
+spring.datasource.username=
+spring.datasource.password=

src/main/resources/db/migration/V3__added_title_field_to_posts.sql

@@ -0,0 +1,2 @@
+ALTER TABLE posts
+ADD COLUMN title varchar(100);

src/main/resources/db/migration/V4__added_foreign_key_to_posts_table.sql

@@ -0,0 +1,7 @@
+ALTER TABLE posts
+    ADD COLUMN user_id int,
+    ADD CONSTRAINT fk_user
+        FOREIGN KEY (user_id)
+        REFERENCES users(id)
+        ON DELETE CASCADE
+;

src/main/resources/db/migration/V5__fixed_user_id_type.sql

@@ -0,0 +1,2 @@
+ALTER TABLE posts
+    ALTER COLUMN user_id TYPE bigint;

src/main/resources/db/migration/V6__added_created_At_field_to_posts_table.sql

@@ -0,0 +1,2 @@
+ALTER TABLE posts
+ADD COLUMN created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;

src/main/resources/db/migration/V7__alter_user_table.sql

@@ -0,0 +1,6 @@
+ALTER TABLE USERS
+ADD COLUMN mobile_number VARCHAR(15),
+ADD COLUMN email_address VARCHAR(255),
+ADD COLUMN gender VARCHAR(10),
+ADD COLUMN country VARCHAR(50),
+ADD COLUMN language VARCHAR(50);