From 830a95be7a4b418c852081b23d64465f7d997441 Mon Sep 17 00:00:00 2001 From: xengeo Date: Tue, 14 Nov 2023 11:52:18 +0000 Subject: [PATCH 01/60] Initial commit - add test data --- pom.xml | 2 +- .../V3__update_existing_create_new_tables.sql | 38 +++++++++++++++++++ .../db/migration/V4__insert_test_data.sql | 7 ++++ .../db/migration/V5__insert_into_posts.sql | 2 + .../db/migration/V6__insert_into_comments.sql | 2 + .../db/migration/V7__insert_into_likes.sql | 2 + .../db/migration/V8__insert_into_friends.sql | 2 + .../db/migration/V9__add_new_user.sql | 2 + 8 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/db/migration/V3__update_existing_create_new_tables.sql create mode 100644 src/main/resources/db/migration/V4__insert_test_data.sql create mode 100644 src/main/resources/db/migration/V5__insert_into_posts.sql create mode 100644 src/main/resources/db/migration/V6__insert_into_comments.sql create mode 100644 src/main/resources/db/migration/V7__insert_into_likes.sql create mode 100644 src/main/resources/db/migration/V8__insert_into_friends.sql create mode 100644 src/main/resources/db/migration/V9__add_new_user.sql diff --git a/pom.xml b/pom.xml index dc2e28b62..261744b50 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 provided diff --git a/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql b/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql new file mode 100644 index 000000000..6032cbbfc --- /dev/null +++ b/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql @@ -0,0 +1,38 @@ +ALTER TABLE posts +ADD COLUMN timestamp timestamp, +ADD COLUMN user_id integer, +ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(id); + + +ALTER TABLE users +ADD image_url varchar(500); + + +CREATE TABLE likes ( + id bigserial PRIMARY KEY, + like_status boolean DEFAULT false, + user_id integer, + post_id integer, + FOREIGN KEY (user_id) REFERENCES users(id), + FOREIGN KEY (post_id) REFERENCES posts(id), + UNIQUE (user_id, post_id) +); + + +CREATE TABLE comments ( + id bigserial PRIMARY KEY, + comment varchar(281) NOT NULL, + post_id integer, + user_id integer, + FOREIGN KEY (post_id) REFERENCES posts(id), + FOREIGN KEY (user_id) REFERENCES users(id) +); + +CREATE TABLE friends ( + id bigserial PRIMARY KEY, + requester_id integer, + receiver_id integer, + FOREIGN KEY (requester_id) REFERENCES users(id), + FOREIGN KEY (receiver_id) REFERENCES users(id), + status varchar(50) check (status in ('ACCEPTED', 'PENDING', 'DENIED')) +); \ No newline at end of file diff --git a/src/main/resources/db/migration/V4__insert_test_data.sql b/src/main/resources/db/migration/V4__insert_test_data.sql new file mode 100644 index 000000000..26c1fd78d --- /dev/null +++ b/src/main/resources/db/migration/V4__insert_test_data.sql @@ -0,0 +1,7 @@ +insert into users (username, password, enabled, image_url) +values ('zak', '12345', TRUE, '/users/images/image.png'), + ('david', '123456', TRUE, '/users/images/another_image.png'); + + + + diff --git a/src/main/resources/db/migration/V5__insert_into_posts.sql b/src/main/resources/db/migration/V5__insert_into_posts.sql new file mode 100644 index 000000000..5df524f2a --- /dev/null +++ b/src/main/resources/db/migration/V5__insert_into_posts.sql @@ -0,0 +1,2 @@ +insert into posts (content, timestamp, user_id) +values ('first post', '2023-11-14 11:13:24', 2); \ No newline at end of file diff --git a/src/main/resources/db/migration/V6__insert_into_comments.sql b/src/main/resources/db/migration/V6__insert_into_comments.sql new file mode 100644 index 000000000..2ef617deb --- /dev/null +++ b/src/main/resources/db/migration/V6__insert_into_comments.sql @@ -0,0 +1,2 @@ +insert into comments (comment, post_id, user_id) +values ('great post', 1, 3); \ No newline at end of file diff --git a/src/main/resources/db/migration/V7__insert_into_likes.sql b/src/main/resources/db/migration/V7__insert_into_likes.sql new file mode 100644 index 000000000..ff91314cd --- /dev/null +++ b/src/main/resources/db/migration/V7__insert_into_likes.sql @@ -0,0 +1,2 @@ +insert into likes (like_status, user_id, post_id) +values (true, 2, 1), (true, 3, 1); \ No newline at end of file diff --git a/src/main/resources/db/migration/V8__insert_into_friends.sql b/src/main/resources/db/migration/V8__insert_into_friends.sql new file mode 100644 index 000000000..27f5ea1f2 --- /dev/null +++ b/src/main/resources/db/migration/V8__insert_into_friends.sql @@ -0,0 +1,2 @@ +insert into friends (requester_id, receiver_id, status) +values (2, 3, 'PENDING'); \ No newline at end of file diff --git a/src/main/resources/db/migration/V9__add_new_user.sql b/src/main/resources/db/migration/V9__add_new_user.sql new file mode 100644 index 000000000..1b26a72e1 --- /dev/null +++ b/src/main/resources/db/migration/V9__add_new_user.sql @@ -0,0 +1,2 @@ +insert into users (username, password, enabled, image_url) +values ('som', '123457', TRUE, '/users/images/image_three.png'); From 07f7ab4ccae5fbf33cdee2df0b988248368022ad Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Tue, 14 Nov 2023 11:59:22 +0000 Subject: [PATCH 02/60] Update lombok version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc2e28b62..261744b50 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.30 provided From 94c3e5fbbba858647305d732594fb8561cf60578 Mon Sep 17 00:00:00 2001 From: somunachima Date: Tue, 14 Nov 2023 15:44:52 +0000 Subject: [PATCH 03/60] add route for users show page and html file for users show --- .../acebook/controller/UsersController.java | 15 +++++++++++++++ src/main/resources/templates/users/show.html | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/main/resources/templates/users/show.html diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index 3c46bf0a1..f25d283e8 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -9,9 +9,13 @@ 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.view.RedirectView; +import java.util.Optional; + @Controller public class UsersController { @@ -33,4 +37,15 @@ public RedirectView signup(@ModelAttribute User user) { authoritiesRepository.save(authority); return new RedirectView("/login"); } + + @GetMapping("/users/{id}") + public ModelAndView show(@PathVariable Long id) { + Optional optionalUser = userRepository.findById(id); + User user = optionalUser.orElse(null); + ModelAndView modelAndView = new ModelAndView("/users/show"); + modelAndView.addObject("user", user); + System.out.println("This is an OBJECT!!!!!!"); + System.out.println(user); + return modelAndView; + } } diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html new file mode 100644 index 000000000..cc807a4ce --- /dev/null +++ b/src/main/resources/templates/users/show.html @@ -0,0 +1,11 @@ + + + + + Your Profile + + +

Welcome to your profile!

+

+ + \ No newline at end of file From 81cbd3c922230aad8dd2504554fc18e551d953f7 Mon Sep 17 00:00:00 2001 From: somunachima Date: Tue, 14 Nov 2023 16:15:45 +0000 Subject: [PATCH 04/60] write tests for users controller --- .../controller/UsersControllerTest.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java diff --git a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java new file mode 100644 index 000000000..a5efcf018 --- /dev/null +++ b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java @@ -0,0 +1,53 @@ +package com.makersacademy.aceboook.controller; + +import com.github.javafaker.Faker; +import com.makersacademy.acebook.Application; +import jdk.internal.org.xml.sax.Locator; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +public class UsersControllerTest { + + WebDriver driver; + WebDriver page; + Faker faker; + + @Before + public void setup() { + System.setProperty("webdriver.chrome.driver", "/usr/local/bin/chromedriver"); + driver = new ChromeDriver(); + faker = new Faker(); + } + + @After + public void tearDown() { + driver.close(); + } + +// @Test +// public void usersCanReadUsername() { +// driver.get("localhost:8080/users/3"); +// String username = driver.getTitle(); +// Assert.assertEquals("tom", username); +// } + +// @Test +// public void successfulSignUpRedirectsToSignIn() { +// driver.get("http://localhost:8080/users/new"); +// driver.findElement(By.id("username")).sendKeys(faker.name().firstName()); +// driver.findElement(By.id("password")).sendKeys("password"); +// driver.findElement(By.id("submit")).click(); +// String title = driver.getTitle(); +// Assert.assertEquals("Please sign in", title); +// } +} From b4418a9654ef5d0ceeca66ee5a4d28beef58df37 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Tue, 14 Nov 2023 17:02:12 +0000 Subject: [PATCH 05/60] Update post model fields and add sign up button --- .../acebook/SecurityConfiguration.java | 2 +- .../acebook/controller/HomeController.java | 6 +++ .../makersacademy/acebook/model/Comment.java | 4 ++ .../com/makersacademy/acebook/model/Post.java | 18 ++++++++- .../V10__update_userid_to_bigint.sql | 3 ++ .../V3__update_existing_create_new_tables.sql | 38 +++++++++++++++++++ .../db/migration/V4__insert_test_data.sql | 7 ++++ .../db/migration/V5__insert_into_posts.sql | 2 + .../db/migration/V6__insert_into_comments.sql | 2 + .../db/migration/V7__insert_into_likes.sql | 2 + .../db/migration/V8__insert_into_friends.sql | 2 + .../db/migration/V9__add_new_user.sql | 2 + src/main/resources/templates/login.html | 32 ++++++++++++++++ .../makersacademy/acebook/model/PostTest.java | 11 +++++- 14 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/makersacademy/acebook/model/Comment.java create mode 100644 src/main/resources/db/migration/V10__update_userid_to_bigint.sql create mode 100644 src/main/resources/db/migration/V3__update_existing_create_new_tables.sql create mode 100644 src/main/resources/db/migration/V4__insert_test_data.sql create mode 100644 src/main/resources/db/migration/V5__insert_into_posts.sql create mode 100644 src/main/resources/db/migration/V6__insert_into_comments.sql create mode 100644 src/main/resources/db/migration/V7__insert_into_likes.sql create mode 100644 src/main/resources/db/migration/V8__insert_into_friends.sql create mode 100644 src/main/resources/db/migration/V9__add_new_user.sql create mode 100644 src/main/resources/templates/login.html diff --git a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java index a6829646e..b8fbb1563 100644 --- a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java +++ b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java @@ -28,7 +28,7 @@ protected void configure(HttpSecurity http) throws Exception { http.authorizeRequests() .antMatchers("/posts").hasRole("USER") .antMatchers("/users").permitAll() - .and().formLogin(); + .and().formLogin().loginPage("/login"); } @Bean diff --git a/src/main/java/com/makersacademy/acebook/controller/HomeController.java b/src/main/java/com/makersacademy/acebook/controller/HomeController.java index 2036ec7e0..4c04bbf80 100644 --- a/src/main/java/com/makersacademy/acebook/controller/HomeController.java +++ b/src/main/java/com/makersacademy/acebook/controller/HomeController.java @@ -10,4 +10,10 @@ public class HomeController { public RedirectView index() { return new RedirectView("/posts"); } + + @RequestMapping("/login") + public String login() { + return "login"; + } } + diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java new file mode 100644 index 000000000..a9d2e5921 --- /dev/null +++ b/src/main/java/com/makersacademy/acebook/model/Comment.java @@ -0,0 +1,4 @@ +package com.makersacademy.acebook.model; + +public class Comment { +} diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index 0098de1b3..bbee89e7b 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -8,6 +8,8 @@ import lombok.Data; +import java.sql.Timestamp; + @Data @Entity @Table(name = "POSTS") @@ -18,12 +20,24 @@ public class Post { private Long id; private String content; + private Timestamp timestamp; + + private Long userId; + public Post() {} - public Post(String content) { + public Post(String content, Timestamp timestamp, Long userId) { this.content = content; + this.timestamp = timestamp; + this.userId = userId; } - public String getContent() { return this.content; } + public String getContent() {return this.content;} public void setContent(String content) { this.content = content; } + public Timestamp getTimestamp() {return this.timestamp;} + public void setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; } + + public Long getUserId() {return this.userId;} + public void setUserId(Long userId) { this.userId = userId; } + } diff --git a/src/main/resources/db/migration/V10__update_userid_to_bigint.sql b/src/main/resources/db/migration/V10__update_userid_to_bigint.sql new file mode 100644 index 000000000..83c91ad42 --- /dev/null +++ b/src/main/resources/db/migration/V10__update_userid_to_bigint.sql @@ -0,0 +1,3 @@ +ALTER TABLE posts +ALTER COLUMN user_id +TYPE bigint; diff --git a/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql b/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql new file mode 100644 index 000000000..6032cbbfc --- /dev/null +++ b/src/main/resources/db/migration/V3__update_existing_create_new_tables.sql @@ -0,0 +1,38 @@ +ALTER TABLE posts +ADD COLUMN timestamp timestamp, +ADD COLUMN user_id integer, +ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES users(id); + + +ALTER TABLE users +ADD image_url varchar(500); + + +CREATE TABLE likes ( + id bigserial PRIMARY KEY, + like_status boolean DEFAULT false, + user_id integer, + post_id integer, + FOREIGN KEY (user_id) REFERENCES users(id), + FOREIGN KEY (post_id) REFERENCES posts(id), + UNIQUE (user_id, post_id) +); + + +CREATE TABLE comments ( + id bigserial PRIMARY KEY, + comment varchar(281) NOT NULL, + post_id integer, + user_id integer, + FOREIGN KEY (post_id) REFERENCES posts(id), + FOREIGN KEY (user_id) REFERENCES users(id) +); + +CREATE TABLE friends ( + id bigserial PRIMARY KEY, + requester_id integer, + receiver_id integer, + FOREIGN KEY (requester_id) REFERENCES users(id), + FOREIGN KEY (receiver_id) REFERENCES users(id), + status varchar(50) check (status in ('ACCEPTED', 'PENDING', 'DENIED')) +); \ No newline at end of file diff --git a/src/main/resources/db/migration/V4__insert_test_data.sql b/src/main/resources/db/migration/V4__insert_test_data.sql new file mode 100644 index 000000000..26c1fd78d --- /dev/null +++ b/src/main/resources/db/migration/V4__insert_test_data.sql @@ -0,0 +1,7 @@ +insert into users (username, password, enabled, image_url) +values ('zak', '12345', TRUE, '/users/images/image.png'), + ('david', '123456', TRUE, '/users/images/another_image.png'); + + + + diff --git a/src/main/resources/db/migration/V5__insert_into_posts.sql b/src/main/resources/db/migration/V5__insert_into_posts.sql new file mode 100644 index 000000000..5df524f2a --- /dev/null +++ b/src/main/resources/db/migration/V5__insert_into_posts.sql @@ -0,0 +1,2 @@ +insert into posts (content, timestamp, user_id) +values ('first post', '2023-11-14 11:13:24', 2); \ No newline at end of file diff --git a/src/main/resources/db/migration/V6__insert_into_comments.sql b/src/main/resources/db/migration/V6__insert_into_comments.sql new file mode 100644 index 000000000..2ef617deb --- /dev/null +++ b/src/main/resources/db/migration/V6__insert_into_comments.sql @@ -0,0 +1,2 @@ +insert into comments (comment, post_id, user_id) +values ('great post', 1, 3); \ No newline at end of file diff --git a/src/main/resources/db/migration/V7__insert_into_likes.sql b/src/main/resources/db/migration/V7__insert_into_likes.sql new file mode 100644 index 000000000..ff91314cd --- /dev/null +++ b/src/main/resources/db/migration/V7__insert_into_likes.sql @@ -0,0 +1,2 @@ +insert into likes (like_status, user_id, post_id) +values (true, 2, 1), (true, 3, 1); \ No newline at end of file diff --git a/src/main/resources/db/migration/V8__insert_into_friends.sql b/src/main/resources/db/migration/V8__insert_into_friends.sql new file mode 100644 index 000000000..27f5ea1f2 --- /dev/null +++ b/src/main/resources/db/migration/V8__insert_into_friends.sql @@ -0,0 +1,2 @@ +insert into friends (requester_id, receiver_id, status) +values (2, 3, 'PENDING'); \ No newline at end of file diff --git a/src/main/resources/db/migration/V9__add_new_user.sql b/src/main/resources/db/migration/V9__add_new_user.sql new file mode 100644 index 000000000..1b26a72e1 --- /dev/null +++ b/src/main/resources/db/migration/V9__add_new_user.sql @@ -0,0 +1,2 @@ +insert into users (username, password, enabled, image_url) +values ('som', '123457', TRUE, '/users/images/image_three.png'); diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html new file mode 100644 index 000000000..4d1d4e92d --- /dev/null +++ b/src/main/resources/templates/login.html @@ -0,0 +1,32 @@ + + + Messages : Create + + +
+
+
+ Please Login +
+ Invalid username and password. +
+
+ You have been logged out. +
+ + + + +
+ +
+
+
+
+
+ +
+
+
+ + \ No newline at end of file diff --git a/src/test/java/com/makersacademy/acebook/model/PostTest.java b/src/test/java/com/makersacademy/acebook/model/PostTest.java index 732aafc6e..6bacdb339 100644 --- a/src/test/java/com/makersacademy/acebook/model/PostTest.java +++ b/src/test/java/com/makersacademy/acebook/model/PostTest.java @@ -5,13 +5,22 @@ import org.junit.Test; +import java.sql.Timestamp; + public class PostTest { - private Post post = new Post("hello"); + Timestamp timestamp = Timestamp.valueOf("2007-09-23 10:10:10.0");; + + private Post post = new Post("hello", timestamp, 1L); @Test public void postHasContent() { assertThat(post.getContent(), containsString("hello")); } +// @Test +// public void postHasContent() { +// assertThat(post.getContent(), containsString("hello")); +// } +// } From 51dd9c648e3bed2600c9e906ccebc29238789560 Mon Sep 17 00:00:00 2001 From: xengeo Date: Wed, 15 Nov 2023 10:21:26 +0000 Subject: [PATCH 06/60] update column types to bigint and complete comment model implementation --- .../makersacademy/acebook/model/Comment.java | 48 +++++++++++++++++++ ...11__update_userid_and_postid_to_bigint.sql | 4 ++ 2 files changed, 52 insertions(+) create mode 100644 src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java index a9d2e5921..a61f7bd26 100644 --- a/src/main/java/com/makersacademy/acebook/model/Comment.java +++ b/src/main/java/com/makersacademy/acebook/model/Comment.java @@ -1,4 +1,52 @@ package com.makersacademy.acebook.model; + +import lombok.Data; + +import javax.persistence.*; + +@Data +@Entity +@Table(name = "COMMENTS") public class Comment { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String comment; + private Long postId; + private Long userId; + + public Comment() {}; + + public Comment(String comment, Long postId, Long userId) { + this.comment = comment; + this.postId = postId; + this.userId = userId; + } + + public String getComment() { + return this.comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public Long getPostId() { + return this.postId; + } + + public void setPostId(Long postId) { + this.postId = postId; + } + + public Long getUserId() { + return this.userId; + } + + public void setUserId(Long UserId) { + this.userId = UserId; + } } diff --git a/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql b/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql new file mode 100644 index 000000000..36f980687 --- /dev/null +++ b/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql @@ -0,0 +1,4 @@ +ALTER TABLE posts +ALTER COLUMN user_id TYPE bigint +ALTER COLUMN post_id TYPE bigint; + From 6f562d997846720713aee17d74803e6a809fdd39 Mon Sep 17 00:00:00 2001 From: xengeo Date: Wed, 15 Nov 2023 10:32:13 +0000 Subject: [PATCH 07/60] update V11 migration file for column type change --- .../migration/V11__update_userid_and_postid_to_bigint.sql | 8 ++++++-- .../aceboook/controller/UsersControllerTest.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql b/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql index 36f980687..ccf94621b 100644 --- a/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql +++ b/src/main/resources/db/migration/V11__update_userid_and_postid_to_bigint.sql @@ -1,4 +1,8 @@ -ALTER TABLE posts -ALTER COLUMN user_id TYPE bigint +ALTER TABLE comments ALTER COLUMN post_id TYPE bigint; +ALTER TABLE comments +ALTER COLUMN user_id TYPE bigint; + + + diff --git a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java index a5efcf018..f7c44f4c9 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java @@ -2,7 +2,7 @@ import com.github.javafaker.Faker; import com.makersacademy.acebook.Application; -import jdk.internal.org.xml.sax.Locator; +//import jdk.internal.org.xml.sax.Locator; import org.junit.After; import org.junit.Assert; import org.junit.Before; From 533486ae7ed7fd10b11f0a0ad6ae3a88747faeca Mon Sep 17 00:00:00 2001 From: David Sholoye Date: Thu, 16 Nov 2023 12:05:32 +0000 Subject: [PATCH 08/60] Add header and links to profile, friends and timeline. And signout --- .../acebook/controller/UsersController.java | 1 + src/main/resources/templates/posts/index.html | 19 +++++++++ src/main/resources/templates/users/show.html | 39 +++++++++++++++---- .../controller/UsersControllerTest.java | 16 ++++---- 4 files changed, 61 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index f25d283e8..c0d259fa2 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -48,4 +48,5 @@ public ModelAndView show(@PathVariable Long id) { System.out.println(user); return modelAndView; } + } diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 4eb260155..c9baba052 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -8,6 +8,25 @@ +
+ + Profile Image + +
+ Friends + Timeline + + +
+ Sign Out +
+ +
+
+

Posts

diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index cc807a4ce..185148260 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -1,11 +1,36 @@ - - - - Your Profile + + + + + -

Welcome to your profile!

-

+ +
+
+ + Profile Image + +
+
+ Friends + Timeline + + +
+ Sign Out +
+ +
+
+ +

+ - \ No newline at end of file + + diff --git a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java index a5efcf018..0f8b6cd87 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java @@ -2,7 +2,6 @@ import com.github.javafaker.Faker; import com.makersacademy.acebook.Application; -import jdk.internal.org.xml.sax.Locator; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -10,6 +9,7 @@ import org.junit.runner.RunWith; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -34,12 +34,14 @@ public void tearDown() { driver.close(); } -// @Test -// public void usersCanReadUsername() { -// driver.get("localhost:8080/users/3"); -// String username = driver.getTitle(); -// Assert.assertEquals("tom", username); -// } + @Test + public void usersCanReadUsername() { + driver.get("localhost:8080/users/3"); + WebElement pElement = driver.findElement(By.tagName("p")); + String pText = pElement.getText(); + Assert.assertEquals("zak ", pText); + + } // @Test // public void successfulSignUpRedirectsToSignIn() { From 95c4d7de68638fb2f8144402cea3a753805e9b48 Mon Sep 17 00:00:00 2001 From: xengeo Date: Thu, 16 Nov 2023 15:26:35 +0000 Subject: [PATCH 09/60] tested sign up features, checked for empty credentials --- .../acebook/controller/UsersController.java | 22 +++++++++- src/main/resources/templates/login.html | 4 +- src/main/resources/templates/users/new.html | 5 ++- src/test/java/SignUpTest.java | 40 ++++++++++++++++++- .../makersacademy/acebook/model/PostTest.java | 10 ++--- 5 files changed, 70 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index f25d283e8..588f2f4fe 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -12,10 +12,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.view.RedirectView; +import java.util.ArrayList; import java.util.Optional; +import static java.lang.Boolean.valueOf; + @Controller public class UsersController { @@ -31,7 +35,23 @@ public String signup(Model model) { } @PostMapping("/users") - public RedirectView signup(@ModelAttribute User user) { + public RedirectView signup(@ModelAttribute User user, RedirectAttributes attributes) { + + String usernameErrorMsg = "Please enter a username"; + String passwordErrorMsg = "Please enter a password"; + + if (user.getUsername().trim().isEmpty() && user.getPassword().trim().isEmpty()){ + attributes.addAttribute("usernameError", usernameErrorMsg); + attributes.addAttribute("passwordError", passwordErrorMsg); + return new RedirectView("/users/new"); + } else if (user.getPassword().trim().isEmpty()) { + attributes.addAttribute("passwordError", passwordErrorMsg); + return new RedirectView("/users/new"); + } else if (user.getUsername().trim().isEmpty()) { + attributes.addAttribute("usernameError", usernameErrorMsg); + return new RedirectView("/users/new"); + } + userRepository.save(user); Authority authority = new Authority(user.getUsername(), "ROLE_USER"); authoritiesRepository.save(authority); diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 4d1d4e92d..34cf6f3e0 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,6 +1,6 @@ - Messages : Create + Please log in
@@ -24,7 +24,7 @@
- +
diff --git a/src/main/resources/templates/users/new.html b/src/main/resources/templates/users/new.html index 2d763f396..e8e8b8d2d 100644 --- a/src/main/resources/templates/users/new.html +++ b/src/main/resources/templates/users/new.html @@ -1,12 +1,13 @@ - - + Signup
+

+

Username:

Password:

diff --git a/src/test/java/SignUpTest.java b/src/test/java/SignUpTest.java index b0e16955b..fec9926fa 100644 --- a/src/test/java/SignUpTest.java +++ b/src/test/java/SignUpTest.java @@ -7,7 +7,10 @@ import org.junit.runner.RunWith; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -38,6 +41,41 @@ public void successfulSignUpRedirectsToSignIn() { driver.findElement(By.id("password")).sendKeys("password"); driver.findElement(By.id("submit")).click(); String title = driver.getTitle(); - Assert.assertEquals("Please sign in", title); + Assert.assertEquals("Please log in", title); + } + + + @Test + public void signUpButtonLinksToSignUpPage() { + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("sign-up-btn")).click(); + String title = driver.getTitle(); + Assert.assertEquals("Signup", title); + } + + @Test + public void testBlankUsernameReturnsError() { + driver.get("http://localhost:8080/users/new"); + driver.findElement(By.id("username")).sendKeys(" "); + driver.findElement(By.id("password")).sendKeys("password"); + driver.findElement(By.id("submit")).click(); + // Explicitly wait for the error message to be visible + WebDriverWait wait = new WebDriverWait(driver, 10); + WebElement usernameError = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("usernameError"))); + String errorString = usernameError.getText(); + Assert.assertEquals("Please enter a username", errorString); + } + + @Test + public void testBlankPasswordReturnsError() { + driver.get("http://localhost:8080/users/new"); + driver.findElement(By.id("username")).sendKeys("username_1"); + driver.findElement(By.id("password")).sendKeys(" "); + driver.findElement(By.id("submit")).click(); + // Explicitly wait for the error message to be visible + WebDriverWait wait = new WebDriverWait(driver, 10); + WebElement passwordError = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("passwordError"))); + String errorString = passwordError.getText(); + Assert.assertEquals("Please enter a password", errorString); } } diff --git a/src/test/java/com/makersacademy/acebook/model/PostTest.java b/src/test/java/com/makersacademy/acebook/model/PostTest.java index 6bacdb339..be918f1d3 100644 --- a/src/test/java/com/makersacademy/acebook/model/PostTest.java +++ b/src/test/java/com/makersacademy/acebook/model/PostTest.java @@ -18,9 +18,9 @@ public void postHasContent() { assertThat(post.getContent(), containsString("hello")); } -// @Test -// public void postHasContent() { -// assertThat(post.getContent(), containsString("hello")); -// } -// + @Test + public void postHasU() { + assertThat(post.getContent(), containsString("hello")); + } + } From a1227eafc1712aeae33f637ace731442533b218d Mon Sep 17 00:00:00 2001 From: David Sholoye Date: Thu, 16 Nov 2023 16:16:14 +0000 Subject: [PATCH 10/60] Friend request system with errors --- .../acebook/controller/FriendController.java | 25 +++++++++++++ .../acebook/controller/PostsController.java | 10 ++++-- .../acebook/controller/UsersController.java | 2 -- .../makersacademy/acebook/model/Friend.java | 36 +++++++++++++++++++ .../acebook/repository/FriendRepository.java | 7 ++++ src/main/resources/templates/posts/index.html | 6 ++-- src/main/resources/templates/users/show.html | 12 +++++-- 7 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/makersacademy/acebook/controller/FriendController.java create mode 100644 src/main/java/com/makersacademy/acebook/model/Friend.java create mode 100644 src/main/java/com/makersacademy/acebook/repository/FriendRepository.java diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java new file mode 100644 index 000000000..816238975 --- /dev/null +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -0,0 +1,25 @@ +package com.makersacademy.acebook.controller; + +import com.makersacademy.acebook.model.Friend; +import com.makersacademy.acebook.repository.FriendRepository; +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; + +@Controller +public class FriendController { + + @Autowired + FriendRepository friendRepository; + + @PostMapping("/handleFriendRequest/{receiver_id}") + public RedirectView create(@ModelAttribute Friend friend, Long receiver_id) { + friendRepository.save(friend); + RedirectView redirectView = new RedirectView("users/show"); + redirectView.addStaticAttribute("receiver_id", receiver_id); + return redirectView; + } +} diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 57a7e5f4d..91aa5f26c 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -1,24 +1,28 @@ package com.makersacademy.acebook.controller; import com.makersacademy.acebook.model.Post; +import com.makersacademy.acebook.model.User; import com.makersacademy.acebook.repository.PostRepository; 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.util.Optional; @Controller public class PostsController { @Autowired - PostRepository repository; + PostRepository postRepository; + @GetMapping("/posts") public String index(Model model) { - Iterable posts = repository.findAll(); + Iterable posts = postRepository.findAll(); model.addAttribute("posts", posts); model.addAttribute("post", new Post()); return "posts/index"; @@ -26,7 +30,7 @@ public String index(Model model) { @PostMapping("/posts") public RedirectView create(@ModelAttribute Post post) { - repository.save(post); + postRepository.save(post); return new RedirectView("/posts"); } } diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index c0d259fa2..393b03b04 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -44,8 +44,6 @@ public ModelAndView show(@PathVariable Long id) { User user = optionalUser.orElse(null); ModelAndView modelAndView = new ModelAndView("/users/show"); modelAndView.addObject("user", user); - System.out.println("This is an OBJECT!!!!!!"); - System.out.println(user); return modelAndView; } diff --git a/src/main/java/com/makersacademy/acebook/model/Friend.java b/src/main/java/com/makersacademy/acebook/model/Friend.java new file mode 100644 index 000000000..b956c69b7 --- /dev/null +++ b/src/main/java/com/makersacademy/acebook/model/Friend.java @@ -0,0 +1,36 @@ +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.Getter; +import lombok.Setter; + +@Data +@Entity +@Table(name = "FRIENDS") +public class Friend { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @Getter + private Long requester_id; + @Getter + private Long receiver_id; + + public Friend() {} + + public Friend(Long requester_id, Long receiver_id) { + this.requester_id = requester_id; + this.receiver_id = receiver_id; + } + + public void setRequesterId(Long requester_id) { this.requester_id = requester_id; } + public void setReceiver_id(Long receiver_id) { this.receiver_id = receiver_id; } + +} diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java new file mode 100644 index 000000000..f9cd5efd7 --- /dev/null +++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java @@ -0,0 +1,7 @@ +package com.makersacademy.acebook.repository; + +import com.makersacademy.acebook.model.Friend; +import org.springframework.data.repository.CrudRepository; + +public interface FriendRepository extends CrudRepository { +} diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index c9baba052..1ade2e661 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -9,9 +9,11 @@
- - Profile Image + + Profile Image +

test this

+

Friends Timeline diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 185148260..6f2316f0c 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -1,6 +1,6 @@ + xmlns:sec="https://www.thymeleaf.org/thymeleaf-extras-springsecurity5" > @@ -11,13 +11,19 @@
Friends Timeline + +

Requester id:

+

Receiver id:

+

+ +
Sign Out @@ -29,7 +35,7 @@
-

+

From 41ffd2600875d3234685fc34d0c495ba4db66f71 Mon Sep 17 00:00:00 2001 From: xengeo Date: Thu, 16 Nov 2023 16:55:12 +0000 Subject: [PATCH 11/60] posts appear by newest first --- .../acebook/controller/PostsController.java | 6 +- .../acebook/repository/PostRepository.java | 4 +- .../V12__update_posts_with_timestaps.sql | 44 ++++++++++++++ src/main/resources/templates/login.html | 2 +- src/main/resources/templates/posts/index.html | 2 +- .../controller/PostControllerTest.java | 58 +++++++++++++++++++ 6 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/db/migration/V12__update_posts_with_timestaps.sql create mode 100644 src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 57a7e5f4d..b99afe23a 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.view.RedirectView; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; import java.util.List; @Controller @@ -18,7 +20,7 @@ public class PostsController { @GetMapping("/posts") public String index(Model model) { - Iterable posts = repository.findAll(); + Iterable posts = repository.findAllByOrderByTimestampDesc(); model.addAttribute("posts", posts); model.addAttribute("post", new Post()); return "posts/index"; @@ -26,6 +28,8 @@ public String index(Model model) { @PostMapping("/posts") public RedirectView create(@ModelAttribute Post post) { + String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date()); + post.setTimestamp(Timestamp.valueOf(timeStamp)); repository.save(post); return new RedirectView("/posts"); } diff --git a/src/main/java/com/makersacademy/acebook/repository/PostRepository.java b/src/main/java/com/makersacademy/acebook/repository/PostRepository.java index d435e0ce1..de89f3772 100644 --- a/src/main/java/com/makersacademy/acebook/repository/PostRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/PostRepository.java @@ -4,6 +4,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.CrudRepository; -public interface PostRepository extends CrudRepository { +import java.util.List; +public interface PostRepository extends CrudRepository { + public List findAllByOrderByTimestampDesc(); } diff --git a/src/main/resources/db/migration/V12__update_posts_with_timestaps.sql b/src/main/resources/db/migration/V12__update_posts_with_timestaps.sql new file mode 100644 index 000000000..e62a5e59c --- /dev/null +++ b/src/main/resources/db/migration/V12__update_posts_with_timestaps.sql @@ -0,0 +1,44 @@ +update + posts +set + timestamp = '2023-11-14 11:13:24', + user_id = 3 +where + content = 'Second post'; + + +update + posts +set + timestamp = '2023-11-15 11:13:24', + user_id = 10 +where + content = 'fourth post'; + + +update + posts +set + timestamp = '2023-11-16 11:13:24', + user_id = 11 +where + content = 'third post'; + + +update + posts +set + timestamp = '2023-11-10 11:13:24', + user_id = 12 +where + content = 'sixth post'; + + +update + posts +set + timestamp = '2023-11-09 11:13:24', + user_id = 14 +where + content = 'fifth post'; + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 34cf6f3e0..4a0cde1e5 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -18,7 +18,7 @@
- +
diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 4eb260155..c4cc4867d 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -16,7 +16,7 @@

Posts

Content:

-

+

    diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java new file mode 100644 index 000000000..73de99f89 --- /dev/null +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -0,0 +1,58 @@ +package com.makersacademy.aceboook.controller; + +import com.github.javafaker.Faker; +import com.makersacademy.acebook.Application; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.chrome.ChromeDriver; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.List; + + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +public class PostControllerTest { + + + WebDriver driver; + Faker faker; + + @Before + public void setup() { + System.setProperty("webdriver.chrome.driver", "/usr/local/bin/chromedriver"); + driver = new ChromeDriver(); + faker = new Faker(); + } + + @After + public void tearDown() { + driver.close(); + } + + @Test + public void testNewPostIsAtTheTopOfList() { + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("username")).sendKeys("user_1"); + driver.findElement(By.id("password")).sendKeys("12345"); + driver.findElement(By.id("submit")).click(); + driver.findElement(By.id("content")).sendKeys("New Post"); + driver.findElement(By.id("submit")).click(); + + WebElement ul = driver.findElement(By.tagName("ul")); + List postList = ul.findElements(By.tagName("li")); + + String newPost = postList.get(0).getText(); + + Assert.assertEquals("New Post", newPost); + + + } +} From 1cbb2be190307046a0257090d9ca4df03240bef1 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Fri, 17 Nov 2023 10:54:51 +0000 Subject: [PATCH 12/60] add friend controller and friend model --- .../acebook/controller/FriendController.java | 17 +++++++++----- .../acebook/controller/UsersController.java | 22 +++++++++++++++---- .../acebook/model/Authority.java | 1 - .../makersacademy/acebook/model/Friend.java | 2 +- .../com/makersacademy/acebook/model/Post.java | 4 +++- .../com/makersacademy/acebook/model/User.java | 5 +++-- .../acebook/repository/UserRepository.java | 5 ++++- .../db/migration/V12__alter_friends_table.sql | 5 +++++ src/main/resources/templates/posts/index.html | 2 -- .../resources/templates/users/friend.html | 14 ++++++++++++ src/main/resources/templates/users/show.html | 13 +++++------ 11 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/db/migration/V12__alter_friends_table.sql create mode 100644 src/main/resources/templates/users/friend.html diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index 816238975..096b6b976 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -15,11 +15,16 @@ public class FriendController { @Autowired FriendRepository friendRepository; - @PostMapping("/handleFriendRequest/{receiver_id}") - public RedirectView create(@ModelAttribute Friend friend, Long receiver_id) { - friendRepository.save(friend); - RedirectView redirectView = new RedirectView("users/show"); - redirectView.addStaticAttribute("receiver_id", receiver_id); - return redirectView; + @PatchMapping("/users/friend") + public String showForm(Model model) { + model.addAttribute("friend", new Friend()); + return "form"; + } + + @PostMapping("/handleFriendRequest") + public String create(@ModelAttribute Friend friend) { + System.out.println(friend.getRequester_id()); + System.out.println(friend.getReceiver_id()); + return "success"; } } diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index 393b03b04..dfa9e2e83 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -14,6 +14,9 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.view.RedirectView; +import javax.servlet.http.HttpSession; +import java.security.Principal; +import java.util.Objects; import java.util.Optional; @Controller @@ -39,12 +42,23 @@ public RedirectView signup(@ModelAttribute User user) { } @GetMapping("/users/{id}") - public ModelAndView show(@PathVariable Long id) { - Optional optionalUser = userRepository.findById(id); - User user = optionalUser.orElse(null); + public ModelAndView show(@PathVariable Long id, Principal principal) { + Optional pageUser = userRepository.findById(id); + User user = pageUser.orElse(null); + + Optional currentUser = userRepository.findByUsername(principal.getName()); + User principalUser = currentUser.orElse(null); + ModelAndView modelAndView = new ModelAndView("/users/show"); + modelAndView.addObject("currentUser", principalUser); modelAndView.addObject("user", user); + + if (principal.getName().equals(Objects.requireNonNull(user).getUsername())) { + modelAndView.addObject("isCurrentUser", true); + } else { + modelAndView.addObject("isCurrentUser", false); + } + return modelAndView; } - } diff --git a/src/main/java/com/makersacademy/acebook/model/Authority.java b/src/main/java/com/makersacademy/acebook/model/Authority.java index 775b3bde2..2fb5d820e 100644 --- a/src/main/java/com/makersacademy/acebook/model/Authority.java +++ b/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 diff --git a/src/main/java/com/makersacademy/acebook/model/Friend.java b/src/main/java/com/makersacademy/acebook/model/Friend.java index b956c69b7..e594ad6e0 100644 --- a/src/main/java/com/makersacademy/acebook/model/Friend.java +++ b/src/main/java/com/makersacademy/acebook/model/Friend.java @@ -31,6 +31,6 @@ public Friend(Long requester_id, Long receiver_id) { } public void setRequesterId(Long requester_id) { this.requester_id = requester_id; } - public void setReceiver_id(Long receiver_id) { this.receiver_id = receiver_id; } + public void setReceiverId(Long receiver_id) { this.receiver_id = receiver_id; } } diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index 0098de1b3..2b57dec98 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -7,6 +7,7 @@ import javax.persistence.GenerationType; import lombok.Data; +import lombok.Getter; @Data @Entity @@ -16,6 +17,7 @@ public class Post { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Getter private String content; public Post() {} @@ -23,7 +25,7 @@ public Post() {} public Post(String content) { this.content = content; } - public String getContent() { return this.content; } + public void setContent(String content) { this.content = content; } } diff --git a/src/main/java/com/makersacademy/acebook/model/User.java b/src/main/java/com/makersacademy/acebook/model/User.java index df2a0edf1..31603ec13 100644 --- a/src/main/java/com/makersacademy/acebook/model/User.java +++ b/src/main/java/com/makersacademy/acebook/model/User.java @@ -7,6 +7,7 @@ import javax.persistence.GenerationType; import lombok.Data; +import lombok.Getter; import static java.lang.Boolean.TRUE; @@ -17,7 +18,9 @@ public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Getter private String username; + @Getter private String password; private boolean enabled; @@ -37,8 +40,6 @@ public User(String username, String password, boolean enabled) { 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; } } diff --git a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java index 2cccc950f..cb0cf49f9 100644 --- a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java @@ -3,6 +3,9 @@ import com.makersacademy.acebook.model.User; import org.springframework.data.repository.CrudRepository; -public interface UserRepository extends CrudRepository { +import java.util.List; +import java.util.Optional; +public interface UserRepository extends CrudRepository { + Optional findByUsername(String username); } diff --git a/src/main/resources/db/migration/V12__alter_friends_table.sql b/src/main/resources/db/migration/V12__alter_friends_table.sql new file mode 100644 index 000000000..96dc38e74 --- /dev/null +++ b/src/main/resources/db/migration/V12__alter_friends_table.sql @@ -0,0 +1,5 @@ +ALTER TABLE FRIENDS +ALTER COLUMN requester_id TYPE BIGINT; + +ALTER TABLE FRIENDS +ALTER COLUMN receiver_id TYPE BIGINT; \ No newline at end of file diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 1ade2e661..ca9199377 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -12,8 +12,6 @@ Profile Image -

    test this

    -

    Friends Timeline diff --git a/src/main/resources/templates/users/friend.html b/src/main/resources/templates/users/friend.html new file mode 100644 index 000000000..ad37fe8d9 --- /dev/null +++ b/src/main/resources/templates/users/friend.html @@ -0,0 +1,14 @@ + + + + + Title + + +
    +

    Requester id:

    +

    Receiver id:

    +

    +
    + + \ No newline at end of file diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 6f2316f0c..4b2b4f0f9 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -18,11 +18,11 @@ Friends Timeline -
    -

    Requester id:

    -

    Receiver id:

    -

    -
    +
    + +
    +

    +

    @@ -38,5 +38,4 @@

    - - + \ No newline at end of file From d40fdb222a134305284d76c4f796ab2242b212af Mon Sep 17 00:00:00 2001 From: somunachima Date: Fri, 17 Nov 2023 11:59:50 +0000 Subject: [PATCH 13/60] Add routes to friend controller and update model to be able to make a friend request from current user --- .../acebook/controller/FriendController.java | 18 ++++++++++-------- .../makersacademy/acebook/model/Friend.java | 6 +++++- .../acebook/repository/FriendRepository.java | 1 + src/main/resources/templates/users/show.html | 4 +++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index 096b6b976..a3d8e6526 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -1,6 +1,7 @@ package com.makersacademy.acebook.controller; import com.makersacademy.acebook.model.Friend; +import com.makersacademy.acebook.model.User; import com.makersacademy.acebook.repository.FriendRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,16 +16,17 @@ public class FriendController { @Autowired FriendRepository friendRepository; - @PatchMapping("/users/friend") - public String showForm(Model model) { - model.addAttribute("friend", new Friend()); - return "form"; + @GetMapping("/users/friend") + public ModelAndView showFriends(Model model) { + ModelAndView modelAndView = new ModelAndView("/users/friend"); + modelAndView.addObject("friend", new Friend()); + return modelAndView; } @PostMapping("/handleFriendRequest") - public String create(@ModelAttribute Friend friend) { - System.out.println(friend.getRequester_id()); - System.out.println(friend.getReceiver_id()); - return "success"; + public RedirectView create(@ModelAttribute Friend friend) { + Friend newFriend = new Friend(friend.getRequester_id(), friend.getReceiver_id(), "PENDING"); + friendRepository.save(newFriend); + return new RedirectView("/users/friend"); } } diff --git a/src/main/java/com/makersacademy/acebook/model/Friend.java b/src/main/java/com/makersacademy/acebook/model/Friend.java index e594ad6e0..f50d44461 100644 --- a/src/main/java/com/makersacademy/acebook/model/Friend.java +++ b/src/main/java/com/makersacademy/acebook/model/Friend.java @@ -22,15 +22,19 @@ public class Friend { private Long requester_id; @Getter private Long receiver_id; + @Getter + private String status; public Friend() {} - public Friend(Long requester_id, Long receiver_id) { + public Friend(Long requester_id, Long receiver_id, String status) { this.requester_id = requester_id; this.receiver_id = receiver_id; + this.status = status; } public void setRequesterId(Long requester_id) { this.requester_id = requester_id; } public void setReceiverId(Long receiver_id) { this.receiver_id = receiver_id; } + public void setStatus(String status) { this.status = status; } } diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java index f9cd5efd7..c66a7f719 100644 --- a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java @@ -4,4 +4,5 @@ import org.springframework.data.repository.CrudRepository; public interface FriendRepository extends CrudRepository { + } diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 4b2b4f0f9..8e11b96c4 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -19,7 +19,9 @@ Timeline
    - +
    + +

    From 7eec94bd8aece692309b877e99039bef3396c208 Mon Sep 17 00:00:00 2001 From: xengeo Date: Fri, 17 Nov 2023 14:14:25 +0000 Subject: [PATCH 14/60] Rename V12__alter_friends_table.sql to V13__alter_friends_table.sql update migration file version number due to clash --- ...12__alter_friends_table.sql => V13__alter_friends_table.sql} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/db/migration/{V12__alter_friends_table.sql => V13__alter_friends_table.sql} (67%) diff --git a/src/main/resources/db/migration/V12__alter_friends_table.sql b/src/main/resources/db/migration/V13__alter_friends_table.sql similarity index 67% rename from src/main/resources/db/migration/V12__alter_friends_table.sql rename to src/main/resources/db/migration/V13__alter_friends_table.sql index 96dc38e74..b5e6e91b5 100644 --- a/src/main/resources/db/migration/V12__alter_friends_table.sql +++ b/src/main/resources/db/migration/V13__alter_friends_table.sql @@ -2,4 +2,4 @@ ALTER TABLE FRIENDS ALTER COLUMN requester_id TYPE BIGINT; ALTER TABLE FRIENDS -ALTER COLUMN receiver_id TYPE BIGINT; \ No newline at end of file +ALTER COLUMN receiver_id TYPE BIGINT; From 920d81a2ca04d141cfff90b1a8b6d9996d8f45b3 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Fri, 17 Nov 2023 15:05:34 +0000 Subject: [PATCH 15/60] rename v12 and v13 to v12 and v14 --- ...{V13__alter_friends_table.sql => V12__alter_friends_table.sql} | 0 ...ts_with_timestaps.sql => V14__update_posts_with_timestaps.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/db/migration/{V13__alter_friends_table.sql => V12__alter_friends_table.sql} (100%) rename src/main/resources/db/migration/{V12__update_posts_with_timestaps.sql => V14__update_posts_with_timestaps.sql} (100%) diff --git a/src/main/resources/db/migration/V13__alter_friends_table.sql b/src/main/resources/db/migration/V12__alter_friends_table.sql similarity index 100% rename from src/main/resources/db/migration/V13__alter_friends_table.sql rename to src/main/resources/db/migration/V12__alter_friends_table.sql diff --git a/src/main/resources/db/migration/V12__update_posts_with_timestaps.sql b/src/main/resources/db/migration/V14__update_posts_with_timestaps.sql similarity index 100% rename from src/main/resources/db/migration/V12__update_posts_with_timestaps.sql rename to src/main/resources/db/migration/V14__update_posts_with_timestaps.sql From ef6da3ed493fb9e156e01ba1c9d6905987308781 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Fri, 17 Nov 2023 15:34:25 +0000 Subject: [PATCH 16/60] Delete flyway versions --- src/main/resources/db/migration/V6__insert_into_comments.sql | 2 -- src/main/resources/db/migration/V7__insert_into_likes.sql | 2 -- src/main/resources/db/migration/V8__insert_into_friends.sql | 2 -- 3 files changed, 6 deletions(-) delete mode 100644 src/main/resources/db/migration/V6__insert_into_comments.sql delete mode 100644 src/main/resources/db/migration/V7__insert_into_likes.sql delete mode 100644 src/main/resources/db/migration/V8__insert_into_friends.sql diff --git a/src/main/resources/db/migration/V6__insert_into_comments.sql b/src/main/resources/db/migration/V6__insert_into_comments.sql deleted file mode 100644 index 2ef617deb..000000000 --- a/src/main/resources/db/migration/V6__insert_into_comments.sql +++ /dev/null @@ -1,2 +0,0 @@ -insert into comments (comment, post_id, user_id) -values ('great post', 1, 3); \ No newline at end of file diff --git a/src/main/resources/db/migration/V7__insert_into_likes.sql b/src/main/resources/db/migration/V7__insert_into_likes.sql deleted file mode 100644 index ff91314cd..000000000 --- a/src/main/resources/db/migration/V7__insert_into_likes.sql +++ /dev/null @@ -1,2 +0,0 @@ -insert into likes (like_status, user_id, post_id) -values (true, 2, 1), (true, 3, 1); \ No newline at end of file diff --git a/src/main/resources/db/migration/V8__insert_into_friends.sql b/src/main/resources/db/migration/V8__insert_into_friends.sql deleted file mode 100644 index 27f5ea1f2..000000000 --- a/src/main/resources/db/migration/V8__insert_into_friends.sql +++ /dev/null @@ -1,2 +0,0 @@ -insert into friends (requester_id, receiver_id, status) -values (2, 3, 'PENDING'); \ No newline at end of file From b6359dc92f25487dd86a9b6741427e5667981386 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Fri, 17 Nov 2023 15:10:25 +0000 Subject: [PATCH 17/60] Add user_id to new post --- .../acebook/controller/PostsController.java | 17 ++++++++++- .../com/makersacademy/acebook/model/User.java | 6 ++++ .../acebook/repository/UserRepository.java | 3 ++ .../migration/V15__add_user_1_for_testing.sql | 3 ++ src/main/resources/templates/posts/index.html | 2 +- .../controller/PostControllerTest.java | 28 +++++++++++++++++-- 6 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/db/migration/V15__add_user_1_for_testing.sql diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 7defd1b22..f32911311 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -3,6 +3,7 @@ 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; @@ -10,6 +11,7 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.view.RedirectView; +import java.security.Principal; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.List; @@ -19,8 +21,14 @@ public class PostsController { @Autowired +<<<<<<< HEAD PostRepository postRepository; +======= + PostRepository repository; + @Autowired + UserRepository userRepository; +>>>>>>> 8179f0c (Add user_id to new post) @GetMapping("/posts") public String index(Model model) { @@ -31,10 +39,17 @@ public String index(Model model) { } @PostMapping("/posts") - public RedirectView create(@ModelAttribute Post 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)); +<<<<<<< HEAD postRepository.save(post); +======= + Optional currentUser = userRepository.findByUsername(principal.getName()); + User principalUser = currentUser.orElse(null); + post.setUserId(principalUser.getId()); + repository.save(post); +>>>>>>> 8179f0c (Add user_id to new post) return new RedirectView("/posts"); } } diff --git a/src/main/java/com/makersacademy/acebook/model/User.java b/src/main/java/com/makersacademy/acebook/model/User.java index 31603ec13..a61c78708 100644 --- a/src/main/java/com/makersacademy/acebook/model/User.java +++ b/src/main/java/com/makersacademy/acebook/model/User.java @@ -40,6 +40,12 @@ public User(String username, String password, boolean enabled) { this.enabled = enabled; } +<<<<<<< HEAD +======= + public String getUsername() { return this.username; } + public String getPassword() { return this.password; } + public Long getId() { return this.id; } +>>>>>>> 8179f0c (Add user_id to new post) public void setUsername(String username) { this.username = username; } public void setPassword(String password) { this.password = password; } } diff --git a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java index cb0cf49f9..c91d4f0a4 100644 --- a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java @@ -3,7 +3,10 @@ import com.makersacademy.acebook.model.User; import org.springframework.data.repository.CrudRepository; +<<<<<<< HEAD import java.util.List; +======= +>>>>>>> 8179f0c (Add user_id to new post) import java.util.Optional; public interface UserRepository extends CrudRepository { diff --git a/src/main/resources/db/migration/V15__add_user_1_for_testing.sql b/src/main/resources/db/migration/V15__add_user_1_for_testing.sql new file mode 100644 index 000000000..d4a312101 --- /dev/null +++ b/src/main/resources/db/migration/V15__add_user_1_for_testing.sql @@ -0,0 +1,3 @@ +INSERT INTO users +(username, password, enabled, image_url) +VALUES ('test_user', 'password22', true, null); \ No newline at end of file diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 8d3983d31..21ccf5adc 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -34,7 +34,7 @@

    Posts

    -

    Content:

    +

    Content:

    diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index 73de99f89..482e3bc25 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -2,6 +2,8 @@ import com.github.javafaker.Faker; import com.makersacademy.acebook.Application; +import com.makersacademy.acebook.model.Post; +import com.makersacademy.acebook.repository.PostRepository; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -11,6 +13,9 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -22,6 +27,9 @@ public class PostControllerTest { + @Autowired + PostRepository postRepository; + WebDriver driver; Faker faker; @@ -40,8 +48,8 @@ public void tearDown() { @Test public void testNewPostIsAtTheTopOfList() { driver.get("http://localhost:8080/login"); - driver.findElement(By.id("username")).sendKeys("user_1"); - driver.findElement(By.id("password")).sendKeys("12345"); + driver.findElement(By.id("username")).sendKeys("testing"); + driver.findElement(By.id("password")).sendKeys("password3"); driver.findElement(By.id("submit")).click(); driver.findElement(By.id("content")).sendKeys("New Post"); driver.findElement(By.id("submit")).click(); @@ -53,6 +61,20 @@ public void testNewPostIsAtTheTopOfList() { Assert.assertEquals("New Post", newPost); - + @Test + public void testNewPostHasUserIdAssigned() { + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("username")).sendKeys("testing"); + driver.findElement(By.id("password")).sendKeys("password3"); + driver.findElement(By.id("submit")).click(); + WebDriverWait wait = new WebDriverWait(driver, 10); + wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("content"))); + driver.findElement(By.id("content")).sendKeys("New Post"); + driver.findElement(By.id("submit")).click(); + List posts = postRepository.findAllByOrderByTimestampDesc(); + Post latestPost = posts.get(0); + Long userId = latestPost.getUserId(); + Long expected = 12L; + Assert.assertEquals(expected, userId); } } From 5c2da4220016c12c6e398d5047a15945ca6bbc15 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Fri, 17 Nov 2023 15:54:15 +0000 Subject: [PATCH 18/60] Resolved conflicts --- src/main/java/com/makersacademy/acebook/model/User.java | 4 +--- .../com/makersacademy/acebook/repository/UserRepository.java | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/model/User.java b/src/main/java/com/makersacademy/acebook/model/User.java index a61c78708..fa33f9c75 100644 --- a/src/main/java/com/makersacademy/acebook/model/User.java +++ b/src/main/java/com/makersacademy/acebook/model/User.java @@ -40,12 +40,10 @@ public User(String username, String password, boolean enabled) { this.enabled = enabled; } -<<<<<<< HEAD -======= public String getUsername() { return this.username; } public String getPassword() { return this.password; } public Long getId() { return this.id; } ->>>>>>> 8179f0c (Add user_id to new post) + public void setUsername(String username) { this.username = username; } public void setPassword(String password) { this.password = password; } } diff --git a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java index c91d4f0a4..5f1f0eaa2 100644 --- a/src/main/java/com/makersacademy/acebook/repository/UserRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/UserRepository.java @@ -3,10 +3,6 @@ import com.makersacademy.acebook.model.User; import org.springframework.data.repository.CrudRepository; -<<<<<<< HEAD -import java.util.List; -======= ->>>>>>> 8179f0c (Add user_id to new post) import java.util.Optional; public interface UserRepository extends CrudRepository { From 1d57d3696689ca2829e22b62e052228dfecbf95f Mon Sep 17 00:00:00 2001 From: Zakarie Date: Fri, 17 Nov 2023 16:23:48 +0000 Subject: [PATCH 19/60] fixed the logout issue by changing the anchor tag to form --- .../java/com/makersacademy/acebook/SecurityConfiguration.java | 2 +- src/main/resources/templates/posts/index.html | 4 +++- src/main/resources/templates/users/show.html | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java index b8fbb1563..c3df96c5a 100644 --- a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java +++ b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java @@ -35,4 +35,4 @@ protected void configure(HttpSecurity http) throws Exception { public PasswordEncoder getPasswordEncoder() { return NoOpPasswordEncoder.getInstance(); } -} +} \ No newline at end of file diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 8d3983d31..124ccc084 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -18,7 +18,9 @@
    - Sign Out +
    + +
    Log In diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 8e11b96c4..6fd52cfb6 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -28,7 +28,9 @@
    - Sign Out +
    + +
    Log In From f3d66d2eda2cc4d4f8f86527f68e8d3148a6e810 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Fri, 17 Nov 2023 16:28:13 +0000 Subject: [PATCH 20/60] Resolved conflicts --- .../acebook/controller/PostsController.java | 11 +---------- .../aceboook/controller/PostControllerTest.java | 7 ++++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index f32911311..9a5582000 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -21,14 +21,9 @@ public class PostsController { @Autowired -<<<<<<< HEAD PostRepository postRepository; - -======= - PostRepository repository; @Autowired UserRepository userRepository; ->>>>>>> 8179f0c (Add user_id to new post) @GetMapping("/posts") public String index(Model model) { @@ -42,14 +37,10 @@ public String index(Model model) { 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)); -<<<<<<< HEAD - postRepository.save(post); -======= Optional currentUser = userRepository.findByUsername(principal.getName()); User principalUser = currentUser.orElse(null); post.setUserId(principalUser.getId()); - repository.save(post); ->>>>>>> 8179f0c (Add user_id to new post) + postRepository.save(post); return new RedirectView("/posts"); } } diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index 482e3bc25..8626b70d6 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -60,12 +60,13 @@ public void testNewPostIsAtTheTopOfList() { String newPost = postList.get(0).getText(); Assert.assertEquals("New Post", newPost); + } @Test public void testNewPostHasUserIdAssigned() { driver.get("http://localhost:8080/login"); - driver.findElement(By.id("username")).sendKeys("testing"); - driver.findElement(By.id("password")).sendKeys("password3"); + driver.findElement(By.id("username")).sendKeys("test_user"); + driver.findElement(By.id("password")).sendKeys("password22"); driver.findElement(By.id("submit")).click(); WebDriverWait wait = new WebDriverWait(driver, 10); wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("content"))); @@ -74,7 +75,7 @@ public void testNewPostHasUserIdAssigned() { List posts = postRepository.findAllByOrderByTimestampDesc(); Post latestPost = posts.get(0); Long userId = latestPost.getUserId(); - Long expected = 12L; + Long expected = 4L; Assert.assertEquals(expected, userId); } } From c9ca0bfb60ed95c1e9440bede9a5521721d41893 Mon Sep 17 00:00:00 2001 From: xengeo Date: Fri, 17 Nov 2023 17:34:10 +0000 Subject: [PATCH 21/60] add migration file test users into authorities table --- .../V16__insert_test_users_into_authorities_table.sql | 6 ++++++ .../migration/V17__add_test_user_to_authorities_table.sql | 4 ++++ .../aceboook/controller/PostControllerTest.java | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql create mode 100644 src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql diff --git a/src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql b/src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql new file mode 100644 index 000000000..a2e5d1477 --- /dev/null +++ b/src/main/resources/db/migration/V16__insert_test_users_into_authorities_table.sql @@ -0,0 +1,6 @@ +insert into + authorities (username, authority) +values + ('zak', 'ROLE_USER'), + ('david', 'ROLE_USER'), + ('som', 'ROLE_USER'); \ No newline at end of file diff --git a/src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql b/src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql new file mode 100644 index 000000000..f82b1ff3f --- /dev/null +++ b/src/main/resources/db/migration/V17__add_test_user_to_authorities_table.sql @@ -0,0 +1,4 @@ +insert into + authorities (username, authority) +values + ('test_user', 'ROLE_USER'); \ No newline at end of file diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index 8626b70d6..cf7df24c9 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -48,8 +48,8 @@ public void tearDown() { @Test public void testNewPostIsAtTheTopOfList() { driver.get("http://localhost:8080/login"); - driver.findElement(By.id("username")).sendKeys("testing"); - driver.findElement(By.id("password")).sendKeys("password3"); + driver.findElement(By.id("username")).sendKeys("test_user"); + driver.findElement(By.id("password")).sendKeys("password22"); driver.findElement(By.id("submit")).click(); driver.findElement(By.id("content")).sendKeys("New Post"); driver.findElement(By.id("submit")).click(); From d29d881d985b1283711d5ade188cd1e6423dbe35 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Mon, 20 Nov 2023 12:04:22 +0000 Subject: [PATCH 22/60] display names of request users with buttons --- .../acebook/controller/FriendController.java | 39 +++++++++++++++++++ .../acebook/repository/FriendRepository.java | 5 ++- .../resources/templates/users/friends.html | 23 +++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/templates/users/friends.html diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index a3d8e6526..3031d46cd 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -3,6 +3,7 @@ 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.stereotype.Controller; import org.springframework.ui.Model; @@ -10,11 +11,19 @@ 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) { @@ -23,6 +32,36 @@ public ModelAndView showFriends(Model model) { return modelAndView; } + @GetMapping("/friends") + public ModelAndView showRequests(Principal principal) { + ModelAndView modelAndView = new ModelAndView("/users/friends"); + + Optional currentUser = userRepository.findByUsername(principal.getName()); + User principalUser = currentUser.orElse(null); + + assert principalUser != null; + List requests = friendRepository.findByStatus("PENDING"); + ArrayList userRequests = new ArrayList<>(); + + for (Friend friend : requests) { + if (Objects.equals(friend.getReceiver_id(), principalUser.getId())) { + userRequests.add(friend); + } + } + + ArrayList friendRequests = new ArrayList<>(); + + for (Friend friend : userRequests) { + Optional optionalUser = userRepository.findById(friend.getRequester_id()); + User friendRequest = optionalUser.orElse(null); + friendRequests.add(friendRequest); + } + + modelAndView.addObject("friendRequests", friendRequests); + System.out.println(friendRequests); + return modelAndView; + } + @PostMapping("/handleFriendRequest") public RedirectView create(@ModelAttribute Friend friend) { Friend newFriend = new Friend(friend.getRequester_id(), friend.getReceiver_id(), "PENDING"); diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java index c66a7f719..8549b0e9d 100644 --- a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java @@ -3,6 +3,9 @@ import com.makersacademy.acebook.model.Friend; import org.springframework.data.repository.CrudRepository; -public interface FriendRepository extends CrudRepository { +import java.util.List; +import java.util.Optional; +public interface FriendRepository extends CrudRepository { + List findByStatus(String status); } diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html new file mode 100644 index 000000000..cfedaa686 --- /dev/null +++ b/src/main/resources/templates/users/friends.html @@ -0,0 +1,23 @@ + + + + + Title + + + +
      +
    • + + +
    + +
    +
      +
    • friend one
      • +
    • friend two
      • +
    • friend three
      • +
    + + + \ No newline at end of file From b47fdb613bdabe6bcd92db9c2c16569f036edd74 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Mon, 20 Nov 2023 14:20:25 +0000 Subject: [PATCH 23/60] Add comment and like buttons --- .../acebook/controller/PostsController.java | 9 ++++++++ src/main/resources/templates/posts/index.html | 9 +++++--- src/main/resources/templates/posts/show.html | 23 +++++++++++++++++++ .../controller/PostControllerTest.java | 21 +++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/templates/posts/show.html diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 9a5582000..bfcba6783 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -43,4 +43,13 @@ public RedirectView create(@ModelAttribute Post post, Principal principal) { postRepository.save(post); return new RedirectView("/posts"); } + + @GetMapping("/posts/{id}") + public String show(Long id, Model model) { + Optional post = postRepository.findById(id); + Post currentPost = post.orElse(null); + System.out.println(currentPost); + model.addAttribute("post", currentPost); + return "posts/show"; + } } diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index d6abf5a67..e48d39a06 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -1,7 +1,7 @@ - - + Acebook @@ -41,7 +41,10 @@

    Posts

      -
    • +
      +
    • +

      +
    diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html new file mode 100644 index 000000000..90503b40e --- /dev/null +++ b/src/main/resources/templates/posts/show.html @@ -0,0 +1,23 @@ + + + + + + + Acebook + + +

    + + + + +
      +
    • Comment 1
      • +
    • Comment 2
      • +
    • Comment 3
      • +
    + + \ No newline at end of file diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index cf7df24c9..a41d748b2 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -78,4 +78,25 @@ public void testNewPostHasUserIdAssigned() { Long expected = 4L; Assert.assertEquals(expected, userId); } + + @Test + public void testCommentButtonNavigatesToPostPageFromPosts() { + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("username")).sendKeys("test_user"); + driver.findElement(By.id("password")).sendKeys("password22"); + driver.findElement(By.id("submit")).click(); + driver.findElement(By.id("comment")).click(); + WebElement pElement = driver.findElement(By.tagName("p")); + String pText = pElement.getText(); + Assert.assertEquals("Post content", pText); + + } +// @Test +// public void testPostPageShowsPostAndListOfComments() { +// driver.get("http://localhost:8080/login"); +// driver.findElement(By.id("username")).sendKeys("test_user"); +// driver.findElement(By.id("password")).sendKeys("password22"); +// driver.findElement(By.id("submit")).click(); +// +// } } From c74c088223b9d277b1dbc438f6d94596f1c0752c Mon Sep 17 00:00:00 2001 From: Zakarie Date: Mon, 20 Nov 2023 14:39:05 +0000 Subject: [PATCH 24/60] backend accept or deny working --- .../acebook/controller/FriendController.java | 26 ++++++++++++++++--- .../acebook/repository/FriendRepository.java | 9 +++++++ .../resources/templates/users/friends.html | 12 ++++++--- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index 3031d46cd..245108c84 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -40,17 +40,24 @@ public ModelAndView showRequests(Principal principal) { User principalUser = currentUser.orElse(null); assert principalUser != null; - List requests = friendRepository.findByStatus("PENDING"); - ArrayList userRequests = new ArrayList<>(); + List pendingRequests = friendRepository.findByStatus("PENDING"); + List acceptedRequests = friendRepository.findByStatus("ACCEPTED"); - for (Friend friend : requests) { + ArrayList userRequests = new ArrayList<>(); + for (Friend friend : pendingRequests) { if (Objects.equals(friend.getReceiver_id(), principalUser.getId())) { userRequests.add(friend); } } ArrayList friendRequests = new ArrayList<>(); + for (Friend friend : userRequests) { + Optional optionalUser = userRepository.findById(friend.getRequester_id()); + User friendRequest = optionalUser.orElse(null); + friendRequests.add(friendRequest); + } + ArrayList friends = new ArrayList<>(); for (Friend friend : userRequests) { Optional optionalUser = userRepository.findById(friend.getRequester_id()); User friendRequest = optionalUser.orElse(null); @@ -58,7 +65,6 @@ public ModelAndView showRequests(Principal principal) { } modelAndView.addObject("friendRequests", friendRequests); - System.out.println(friendRequests); return modelAndView; } @@ -68,4 +74,16 @@ public RedirectView create(@ModelAttribute Friend friend) { friendRepository.save(newFriend); return new RedirectView("/users/friend"); } + + @PostMapping("/handleFriendConfirmation") + public String handleConfirmation(@RequestParam("action") String action, + @RequestParam("userId") Long userId) { + if ("accept".equals(action)) { + friendRepository.updateStatusById(userId, "ACCEPTED"); + } else if ("deny".equals(action)) { + friendRepository.updateStatusById(userId, "DENIED"); + } + + return "redirect:/friends"; + } } diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java index 8549b0e9d..bf5b3d92a 100644 --- a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java @@ -1,11 +1,20 @@ package com.makersacademy.acebook.repository; import com.makersacademy.acebook.model.Friend; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; +import javax.transaction.Transactional; import java.util.List; import java.util.Optional; public interface FriendRepository extends CrudRepository { List findByStatus(String status); + + @Transactional + @Modifying + @Query("UPDATE Friend f SET f.status = :newValue WHERE f.requester_id = :requester_id") + void updateStatusById(@Param("requester_id") Long id, @Param("newValue") String newValue); } diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index cfedaa686..39142ce4e 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -7,9 +7,15 @@
      -
    • - - +
    • + + +
      + + + +
      +
    From 91813462c4ddeea753d5d724a8b95e4d5ac95ac9 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Mon, 20 Nov 2023 14:47:21 +0000 Subject: [PATCH 25/60] accept and deny fully functional --- .../makersacademy/acebook/controller/FriendController.java | 7 ++++--- src/main/resources/templates/users/friends.html | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index 245108c84..1dd13f698 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -58,13 +58,14 @@ public ModelAndView showRequests(Principal principal) { } ArrayList friends = new ArrayList<>(); - for (Friend friend : userRequests) { + for (Friend friend : acceptedRequests) { Optional optionalUser = userRepository.findById(friend.getRequester_id()); - User friendRequest = optionalUser.orElse(null); - friendRequests.add(friendRequest); + User acceptedRequest = optionalUser.orElse(null); + friends.add(acceptedRequest); } modelAndView.addObject("friendRequests", friendRequests); + modelAndView.addObject("friends", friends); return modelAndView; } diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index 39142ce4e..be9f03140 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -20,9 +20,7 @@
      -
    • friend one
      • -
    • friend two
      • -
    • friend three
      • +
    From f6d82f7e9bb75c80e86a39dd3eb1e1a865254d6f Mon Sep 17 00:00:00 2001 From: Zakarie Date: Mon, 20 Nov 2023 16:49:38 +0000 Subject: [PATCH 26/60] make button text conditional --- .../acebook/controller/FriendController.java | 23 +++++++++++++------ .../acebook/controller/UsersController.java | 19 +++++++++++++++ .../makersacademy/acebook/model/Friend.java | 12 +++++----- .../acebook/repository/FriendRepository.java | 6 +++-- .../resources/templates/users/friend.html | 14 ----------- src/main/resources/templates/users/show.html | 21 +++++++++++++++-- 6 files changed, 64 insertions(+), 31 deletions(-) delete mode 100644 src/main/resources/templates/users/friend.html diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index 1dd13f698..f2594e9e6 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -5,6 +5,8 @@ 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.*; @@ -45,21 +47,21 @@ public ModelAndView showRequests(Principal principal) { ArrayList userRequests = new ArrayList<>(); for (Friend friend : pendingRequests) { - if (Objects.equals(friend.getReceiver_id(), principalUser.getId())) { + if (Objects.equals(friend.getReceiverId(), principalUser.getId())) { userRequests.add(friend); } } ArrayList friendRequests = new ArrayList<>(); for (Friend friend : userRequests) { - Optional optionalUser = userRepository.findById(friend.getRequester_id()); + Optional optionalUser = userRepository.findById(friend.getReceiverId()); User friendRequest = optionalUser.orElse(null); friendRequests.add(friendRequest); } ArrayList friends = new ArrayList<>(); for (Friend friend : acceptedRequests) { - Optional optionalUser = userRepository.findById(friend.getRequester_id()); + Optional optionalUser = userRepository.findById(friend.getRequesterId()); User acceptedRequest = optionalUser.orElse(null); friends.add(acceptedRequest); } @@ -70,10 +72,17 @@ public ModelAndView showRequests(Principal principal) { } @PostMapping("/handleFriendRequest") - public RedirectView create(@ModelAttribute Friend friend) { - Friend newFriend = new Friend(friend.getRequester_id(), friend.getReceiver_id(), "PENDING"); - friendRepository.save(newFriend); - return new RedirectView("/users/friend"); + public RedirectView handleFriendRequest(@RequestParam("requester_id") Long requesterId, + @RequestParam("receiver_id") Long receiverId, Principal principal) { + + Optional 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") diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index a71892752..082226f52 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -1,8 +1,10 @@ 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; @@ -17,6 +19,7 @@ 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; @@ -30,6 +33,8 @@ public class UsersController { UserRepository userRepository; @Autowired AuthoritiesRepository authoritiesRepository; + @Autowired + FriendRepository friendRepository; @GetMapping("/users/new") public String signup(Model model) { @@ -73,6 +78,20 @@ public ModelAndView show(@PathVariable Long id, Principal principal) { modelAndView.addObject("currentUser", principalUser); modelAndView.addObject("user", user); + assert principalUser != null; + Iterable userRequests = friendRepository.findAllByRequesterId(principalUser.getId()); + + for (Friend friend : userRequests) { + if (Objects.equals(friend.getReceiverId(), id)) { + modelAndView.addObject("userRequest", friend); + } else { + modelAndView.addObject("userRequest", null); + } + + System.out.println(id); + System.out.println(friend.getReceiverId()); + } + if (principal.getName().equals(Objects.requireNonNull(user).getUsername())) { modelAndView.addObject("isCurrentUser", true); } else { diff --git a/src/main/java/com/makersacademy/acebook/model/Friend.java b/src/main/java/com/makersacademy/acebook/model/Friend.java index f50d44461..a78bb3c5e 100644 --- a/src/main/java/com/makersacademy/acebook/model/Friend.java +++ b/src/main/java/com/makersacademy/acebook/model/Friend.java @@ -19,22 +19,22 @@ public class Friend { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @Getter - private Long requester_id; + private Long requesterId; @Getter - private Long receiver_id; + private Long receiverId; @Getter private String status; public Friend() {} public Friend(Long requester_id, Long receiver_id, String status) { - this.requester_id = requester_id; - this.receiver_id = receiver_id; + this.requesterId = requester_id; + this.receiverId = receiver_id; this.status = status; } - public void setRequesterId(Long requester_id) { this.requester_id = requester_id; } - public void setReceiverId(Long receiver_id) { this.receiver_id = receiver_id; } + public void setRequesterId(Long requester_id) { this.requesterId = requester_id; } + public void setReceiverId(Long receiver_id) { this.receiverId = receiver_id; } public void setStatus(String status) { this.status = status; } } diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java index bf5b3d92a..f2b4b6994 100644 --- a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java @@ -15,6 +15,8 @@ public interface FriendRepository extends CrudRepository { @Transactional @Modifying - @Query("UPDATE Friend f SET f.status = :newValue WHERE f.requester_id = :requester_id") - void updateStatusById(@Param("requester_id") Long id, @Param("newValue") String newValue); + @Query("UPDATE Friend f SET f.status = :newValue WHERE f.requesterId = :requesterId") + void updateStatusById(@Param("requesterId") Long id, @Param("newValue") String newValue); + + Iterable findAllByRequesterId(Long requesterId); } diff --git a/src/main/resources/templates/users/friend.html b/src/main/resources/templates/users/friend.html deleted file mode 100644 index ad37fe8d9..000000000 --- a/src/main/resources/templates/users/friend.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Title - - -
    -

    Requester id:

    -

    Receiver id:

    -

    -
    - - \ No newline at end of file diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 6fd52cfb6..a5bea439d 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -5,6 +5,12 @@ + + @@ -19,10 +25,21 @@ Timeline
    -
    - + + + + +
    + +
    + +
    + +
    +
    +

    From 091d4e4e4a9deed3ddb92ea3b82342dbbcf9f9ec Mon Sep 17 00:00:00 2001 From: xengeo Date: Mon, 20 Nov 2023 16:56:41 +0000 Subject: [PATCH 27/60] Comment button links to individual post page, and start to implement comment form to add comment --- .../acebook/controller/PostsController.java | 40 ++++++++++++++++--- .../makersacademy/acebook/model/Comment.java | 5 +++ .../com/makersacademy/acebook/model/Post.java | 13 +++--- src/main/resources/templates/posts/index.html | 9 +++-- src/main/resources/templates/posts/show.html | 10 ++--- .../controller/PostControllerTest.java | 25 +++++++++++- 6 files changed, 82 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index bfcba6783..8df95b25d 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -1,5 +1,7 @@ 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; @@ -29,7 +31,7 @@ public class PostsController { public String index(Model model) { Iterable posts = postRepository.findAllByOrderByTimestampDesc(); model.addAttribute("posts", posts); - model.addAttribute("post", new Post()); + model.addAttribute("newPost", new Post()); return "posts/index"; } @@ -44,12 +46,40 @@ public RedirectView create(@ModelAttribute Post post, Principal principal) { return new RedirectView("/posts"); } - @GetMapping("/posts/{id}") - public String show(Long id, Model model) { + @GetMapping("/post/{id}") + public String show(@PathVariable Long id, Model model) { + Optional post = postRepository.findById(id); Post currentPost = post.orElse(null); - System.out.println(currentPost); - model.addAttribute("post", currentPost); + 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 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; + + } } diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java index a61f7bd26..393fae403 100644 --- a/src/main/java/com/makersacademy/acebook/model/Comment.java +++ b/src/main/java/com/makersacademy/acebook/model/Comment.java @@ -5,6 +5,7 @@ import javax.persistence.*; + @Data @Entity @Table(name = "COMMENTS") @@ -18,6 +19,10 @@ public class Comment { private Long postId; private Long userId; +// @ManyToOne(cascade = CascadeType.ALL) +// @JoinColumn(name = "id") +// private Post post; + public Comment() {}; public Comment(String comment, Long postId, Long userId) { diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index 5c1b5d731..f87c6f592 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -1,15 +1,12 @@ 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 javax.persistence.*; import lombok.Data; import lombok.Getter; import java.sql.Timestamp; +import java.util.List; @Data @Entity @@ -19,6 +16,7 @@ public class Post { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Getter private String content; @@ -28,6 +26,10 @@ public class Post { @Getter private Long userId; +// @Getter +// @OneToMany(fetch = FetchType.LAZY, mappedBy = "postId", cascade = CascadeType.ALL) +// private List commentList; + public Post() {} public Post(String content, Timestamp timestamp, Long userId) { @@ -41,4 +43,5 @@ public Post(String content, Timestamp timestamp, Long userId) { public void setUserId(Long userId) { this.userId = userId; } + } diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index e48d39a06..1db761740 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -35,14 +35,15 @@

    Posts

    Signed in as
    -
    +

    Content:

    -
      -
      -
    • +
        + +
      • +

      diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html index 90503b40e..098f851cc 100644 --- a/src/main/resources/templates/posts/show.html +++ b/src/main/resources/templates/posts/show.html @@ -9,11 +9,11 @@ Acebook -

      - - - - +

      +
      +

      Comment:

      +

      +
      • Comment 1
      • Comment 2
        • diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index a41d748b2..f71461271 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -85,12 +85,35 @@ public void testCommentButtonNavigatesToPostPageFromPosts() { driver.findElement(By.id("username")).sendKeys("test_user"); driver.findElement(By.id("password")).sendKeys("password22"); driver.findElement(By.id("submit")).click(); + driver.findElement(By.id("content")).sendKeys("Testing Comment Button"); + driver.findElement(By.id("submit")).click(); driver.findElement(By.id("comment")).click(); WebElement pElement = driver.findElement(By.tagName("p")); String pText = pElement.getText(); - Assert.assertEquals("Post content", pText); + Assert.assertEquals("Testing Comment Button", pText); } + + @Test + public void testAddCommentReflectedInCommentsList() { + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("username")).sendKeys("test_user"); + driver.findElement(By.id("password")).sendKeys("password22"); + driver.findElement(By.id("submit")).click(); + driver.findElement(By.id("comment")).click(); + driver.findElement(By.id("addComment")).sendKeys("Here is my new comment!"); + driver.findElement(By.id("submitComment")).click(); + + WebElement commentsUL = driver.findElement(By.tagName("ul")); + List commentsLI = commentsUL.findElements(By.tagName("li")); + String comment = commentsLI.get(0).getText(); + + Assert.assertEquals("Here is my new comment!", comment); + + } + + + // @Test // public void testPostPageShowsPostAndListOfComments() { // driver.get("http://localhost:8080/login"); From 52c6c9d0fc527c27c099d8d5295dcdac12119c82 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Mon, 20 Nov 2023 22:28:25 +0000 Subject: [PATCH 28/60] fix accept request and double confirmation issues --- .../acebook/controller/FriendController.java | 25 ++++++++----------- .../acebook/controller/UsersController.java | 10 +++----- .../acebook/repository/FriendRepository.java | 12 ++++++--- .../resources/templates/users/friends.html | 2 +- src/main/resources/templates/users/show.html | 6 ++--- 5 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/FriendController.java b/src/main/java/com/makersacademy/acebook/controller/FriendController.java index f2594e9e6..90608b45a 100644 --- a/src/main/java/com/makersacademy/acebook/controller/FriendController.java +++ b/src/main/java/com/makersacademy/acebook/controller/FriendController.java @@ -42,19 +42,12 @@ public ModelAndView showRequests(Principal principal) { User principalUser = currentUser.orElse(null); assert principalUser != null; - List pendingRequests = friendRepository.findByStatus("PENDING"); - List acceptedRequests = friendRepository.findByStatus("ACCEPTED"); - - ArrayList userRequests = new ArrayList<>(); - for (Friend friend : pendingRequests) { - if (Objects.equals(friend.getReceiverId(), principalUser.getId())) { - userRequests.add(friend); - } - } + List pendingRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "PENDING"); + List acceptedRequests = friendRepository.findByStatusAndReceiverId(principalUser.getId(), "ACCEPTED"); ArrayList friendRequests = new ArrayList<>(); - for (Friend friend : userRequests) { - Optional optionalUser = userRepository.findById(friend.getReceiverId()); + for (Friend friend : pendingRequests) { + Optional optionalUser = userRepository.findById(friend.getRequesterId()); User friendRequest = optionalUser.orElse(null); friendRequests.add(friendRequest); } @@ -87,11 +80,15 @@ public RedirectView handleFriendRequest(@RequestParam("requester_id") Long reque @PostMapping("/handleFriendConfirmation") public String handleConfirmation(@RequestParam("action") String action, - @RequestParam("userId") Long userId) { + @RequestParam("requesterId") Long requesterId, Principal principal) { + Optional currentUser = userRepository.findByUsername(principal.getName()); + User receiverId = currentUser.orElse(null); + assert receiverId != null; + if ("accept".equals(action)) { - friendRepository.updateStatusById(userId, "ACCEPTED"); + friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "ACCEPTED"); } else if ("deny".equals(action)) { - friendRepository.updateStatusById(userId, "DENIED"); + friendRepository.updateStatusByRequesterIdAndReceiverId(requesterId, receiverId.getId(), "DENIED"); } return "redirect:/friends"; diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index 082226f52..5fe77fb68 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -73,23 +73,21 @@ public ModelAndView show(@PathVariable Long id, Principal principal) { Optional 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); - assert principalUser != null; - Iterable userRequests = friendRepository.findAllByRequesterId(principalUser.getId()); + Iterable userRequests = friendRepository.findByRequesterIdOrReceiverId(principalUser.getId(), principalUser.getId()); for (Friend friend : userRequests) { - if (Objects.equals(friend.getReceiverId(), id)) { + if (Objects.equals(friend.getReceiverId(), id) || Objects.equals(friend.getRequesterId(), id)) { modelAndView.addObject("userRequest", friend); + break; } else { modelAndView.addObject("userRequest", null); } - - System.out.println(id); - System.out.println(friend.getReceiverId()); } if (principal.getName().equals(Objects.requireNonNull(user).getUsername())) { diff --git a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java index f2b4b6994..7e646658d 100644 --- a/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/FriendRepository.java @@ -11,12 +11,16 @@ import java.util.Optional; public interface FriendRepository extends CrudRepository { - List findByStatus(String status); + @Query("SELECT f FROM Friend f WHERE f.receiverId = :receiverId AND f.status = :status") + List findByStatusAndReceiverId(@Param("receiverId") Long receiverId, @Param("status") String status); + + @Query("SELECT f FROM Friend f WHERE f.requesterId = :requesterId OR f.receiverId = :receiverId") + List findByRequesterIdOrReceiverId(@Param("requesterId") Long requesterId, @Param("receiverId") Long receiverId); @Transactional @Modifying - @Query("UPDATE Friend f SET f.status = :newValue WHERE f.requesterId = :requesterId") - void updateStatusById(@Param("requesterId") Long id, @Param("newValue") String newValue); + @Query("UPDATE Friend f SET f.status = :status WHERE f.requesterId = :requesterId AND f.receiverId = :receiverId") + void updateStatusByRequesterIdAndReceiverId(@Param("requesterId") Long requesterId, + @Param("receiverId") Long receiverId, @Param("status") String status); - Iterable findAllByRequesterId(Long requesterId); } diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index be9f03140..3ee7bc879 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -11,7 +11,7 @@
        - +
        diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index a5bea439d..cfc13dcb3 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -29,11 +29,11 @@ -
        - +
        +

        -
        +
        From 2381874deb764d7eaf37e37900de06fe1bf4d579 Mon Sep 17 00:00:00 2001 From: somunachima Date: Tue, 21 Nov 2023 11:03:18 +0000 Subject: [PATCH 29/60] Add field to upload picture --- .../acebook/controller/HomeController.java | 8 ++++++++ .../com/makersacademy/acebook/model/User.java | 15 +++++++++------ ....sql => V13__update_posts_with_timestamps.sql} | 10 +++++----- src/main/resources/templates/users/new.html | 1 + 4 files changed, 23 insertions(+), 11 deletions(-) rename src/main/resources/db/migration/{V14__update_posts_with_timestaps.sql => V13__update_posts_with_timestamps.sql} (72%) diff --git a/src/main/java/com/makersacademy/acebook/controller/HomeController.java b/src/main/java/com/makersacademy/acebook/controller/HomeController.java index 4c04bbf80..40b353725 100644 --- a/src/main/java/com/makersacademy/acebook/controller/HomeController.java +++ b/src/main/java/com/makersacademy/acebook/controller/HomeController.java @@ -4,6 +4,8 @@ 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 = "/") @@ -15,5 +17,11 @@ public RedirectView index() { public String login() { return "login"; } + @RequestMapping("/logout") + public String logout(HttpSession session) { + session.removeAttribute("user_id"); + return "logout"; + } + } diff --git a/src/main/java/com/makersacademy/acebook/model/User.java b/src/main/java/com/makersacademy/acebook/model/User.java index fa33f9c75..343aaa4f5 100644 --- a/src/main/java/com/makersacademy/acebook/model/User.java +++ b/src/main/java/com/makersacademy/acebook/model/User.java @@ -15,6 +15,7 @@ @Entity @Table(name = "USERS") public class User { + @Getter @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -23,27 +24,29 @@ public class User { @Getter private String password; private boolean enabled; + @Getter String imageUrl; + public User() { this.enabled = TRUE; } - public User(String username, String password) { + public User(String username, String password, String imageUrl) { this.username = username; this.password = password; + this.imageUrl = imageUrl; this.enabled = TRUE; } - public User(String username, String password, boolean enabled) { + public User(String username, String password, String imageUrl, boolean enabled) { this.username = username; this.password = password; + this.imageUrl = imageUrl; this.enabled = enabled; } - public String getUsername() { return this.username; } - public String getPassword() { return this.password; } - public Long getId() { return this.id; } - public void setUsername(String username) { this.username = username; } public void setPassword(String password) { this.password = password; } + public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } + } diff --git a/src/main/resources/db/migration/V14__update_posts_with_timestaps.sql b/src/main/resources/db/migration/V13__update_posts_with_timestamps.sql similarity index 72% rename from src/main/resources/db/migration/V14__update_posts_with_timestaps.sql rename to src/main/resources/db/migration/V13__update_posts_with_timestamps.sql index e62a5e59c..93ea0610b 100644 --- a/src/main/resources/db/migration/V14__update_posts_with_timestaps.sql +++ b/src/main/resources/db/migration/V13__update_posts_with_timestamps.sql @@ -4,7 +4,7 @@ set timestamp = '2023-11-14 11:13:24', user_id = 3 where - content = 'Second post'; + content = 'Second post'; update @@ -13,7 +13,7 @@ set timestamp = '2023-11-15 11:13:24', user_id = 10 where - content = 'fourth post'; + content = 'fourth post'; update @@ -22,7 +22,7 @@ set timestamp = '2023-11-16 11:13:24', user_id = 11 where - content = 'third post'; + content = 'third post'; update @@ -31,7 +31,7 @@ set timestamp = '2023-11-10 11:13:24', user_id = 12 where - content = 'sixth post'; + content = 'sixth post'; update @@ -40,5 +40,5 @@ set timestamp = '2023-11-09 11:13:24', user_id = 14 where - content = 'fifth post'; + content = 'fifth post'; diff --git a/src/main/resources/templates/users/new.html b/src/main/resources/templates/users/new.html index e8e8b8d2d..77bb3da98 100644 --- a/src/main/resources/templates/users/new.html +++ b/src/main/resources/templates/users/new.html @@ -10,6 +10,7 @@

        Username:

        Password:

        +

        Profile Picture:

        From ae32ea4df08e11d995ba7ed75ac0ac0b0abfa6da Mon Sep 17 00:00:00 2001 From: xengeo Date: Tue, 21 Nov 2023 11:36:43 +0000 Subject: [PATCH 30/60] trying to save a comment --- .../acebook/controller/PostsController.java | 26 ++++++++++++------- .../makersacademy/acebook/model/Comment.java | 2 +- .../com/makersacademy/acebook/model/Post.java | 2 +- .../acebook/repository/CommentRepository.java | 7 +++++ 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/makersacademy/acebook/repository/CommentRepository.java diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 8df95b25d..229304b00 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -4,6 +4,7 @@ import com.makersacademy.acebook.model.Friend; import com.makersacademy.acebook.model.Post; import com.makersacademy.acebook.model.User; +import com.makersacademy.acebook.repository.CommentRepository; import com.makersacademy.acebook.repository.PostRepository; import com.makersacademy.acebook.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +28,9 @@ public class PostsController { @Autowired UserRepository userRepository; + @Autowired + CommentRepository commentRepository; + @GetMapping("/posts") public String index(Model model) { Iterable posts = postRepository.findAllByOrderByTimestampDesc(); @@ -60,26 +64,30 @@ public String show(@PathVariable Long id, Model model) { } @PostMapping("/post/{id}") - public ModelAndView createComment(@PathVariable Long id, @ModelAttribute Comment comment, Principal principal) { + public RedirectView createComment(@PathVariable Long id, @ModelAttribute Comment comment, Principal principal) { + + // to make a new comment for a post: // comment content, post_id, user_id + +// actual comment property should be set on the Comment object via the form +// Long.parseLong(id); +// Long.valueOf(String id).longValue(); +// set post_id: comment.setPostId(id); +// set user_id: Optional currentUser = userRepository.findByUsername(principal.getName()); User principalUser = currentUser.orElse(null); comment.setUserId(principalUser.getId()); +// get visibility: + System.out.println(comment); + commentRepository.save(comment); - - - - - - ModelAndView modelAndView = new ModelAndView("/post/{id}"); - modelAndView.addObject("comment", new Comment()); - return modelAndView; + return new RedirectView("/posts"); } } diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java index 393fae403..95505f8d8 100644 --- a/src/main/java/com/makersacademy/acebook/model/Comment.java +++ b/src/main/java/com/makersacademy/acebook/model/Comment.java @@ -20,7 +20,7 @@ public class Comment { private Long userId; // @ManyToOne(cascade = CascadeType.ALL) -// @JoinColumn(name = "id") +// @JoinColumn(name = "post_id") // private Post post; public Comment() {}; diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index f87c6f592..2aaeedd6f 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -27,7 +27,7 @@ public class Post { private Long userId; // @Getter -// @OneToMany(fetch = FetchType.LAZY, mappedBy = "postId", cascade = CascadeType.ALL) +// @OneToMany(fetch = FetchType.LAZY, mappedBy = "post", cascade = CascadeType.ALL) // private List commentList; public Post() {} diff --git a/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java b/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java new file mode 100644 index 000000000..25107d246 --- /dev/null +++ b/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java @@ -0,0 +1,7 @@ +package com.makersacademy.acebook.repository; + +import com.makersacademy.acebook.model.Comment; +import org.springframework.data.repository.CrudRepository; + +public interface CommentRepository extends CrudRepository { +} From 356fff6feff0af789642069b6b163d9874068aeb Mon Sep 17 00:00:00 2001 From: Zakarie Date: Tue, 21 Nov 2023 16:28:44 +0000 Subject: [PATCH 31/60] image upload in signup works --- .../acebook/controller/PostsController.java | 27 ++++++++++++++++--- .../acebook/controller/UsersController.java | 23 +++------------- .../com/makersacademy/acebook/model/Post.java | 9 ++++++- .../com/makersacademy/acebook/model/User.java | 1 - .../V18__update_imageUrl_column_to_text.sql | 2 ++ src/main/resources/templates/posts/index.html | 23 +++++++++++----- src/main/resources/templates/users/new.html | 25 +++++++++++++---- 7 files changed, 72 insertions(+), 38 deletions(-) create mode 100644 src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 8df95b25d..797965a2e 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -16,8 +16,7 @@ import java.security.Principal; import java.sql.Timestamp; import java.text.SimpleDateFormat; -import java.util.List; -import java.util.Optional; +import java.util.*; @Controller public class PostsController { @@ -28,10 +27,30 @@ public class PostsController { UserRepository userRepository; @GetMapping("/posts") - public String index(Model model) { + public String index(Model model, Principal principal) { + Optional currentUser = userRepository.findByUsername(principal.getName()); + User principalUser = currentUser.orElse(null); + assert principalUser != null; + Iterable posts = postRepository.findAllByOrderByTimestampDesc(); - model.addAttribute("posts", posts); + ArrayList> postsAndPosters = new ArrayList<>(); + + for (Post post : posts) { + HashMap hashMap = new HashMap<>(); + + Optional user = userRepository.findById(post.getUserId()); + User poster = user.orElse(null); + + hashMap.put(post, poster); + postsAndPosters.add(hashMap); + } + + System.out.println(postsAndPosters); + + model.addAttribute("postsAndPosters", postsAndPosters); model.addAttribute("newPost", new Post()); + model.addAttribute("profilePicture", principalUser.getImageUrl()); + return "posts/index"; } diff --git a/src/main/java/com/makersacademy/acebook/controller/UsersController.java b/src/main/java/com/makersacademy/acebook/controller/UsersController.java index 5fe77fb68..053708ec1 100644 --- a/src/main/java/com/makersacademy/acebook/controller/UsersController.java +++ b/src/main/java/com/makersacademy/acebook/controller/UsersController.java @@ -9,10 +9,7 @@ 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.PathVariable; -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; @@ -43,22 +40,8 @@ public String signup(Model model) { } @PostMapping("/users") - public RedirectView signup(@ModelAttribute User user, RedirectAttributes attributes) { - - String usernameErrorMsg = "Please enter a username"; - String passwordErrorMsg = "Please enter a password"; - - if (user.getUsername().trim().isEmpty() && user.getPassword().trim().isEmpty()){ - attributes.addAttribute("usernameError", usernameErrorMsg); - attributes.addAttribute("passwordError", passwordErrorMsg); - return new RedirectView("/users/new"); - } else if (user.getPassword().trim().isEmpty()) { - attributes.addAttribute("passwordError", passwordErrorMsg); - return new RedirectView("/users/new"); - } else if (user.getUsername().trim().isEmpty()) { - attributes.addAttribute("usernameError", usernameErrorMsg); - return new RedirectView("/users/new"); - } + public RedirectView signup(@ModelAttribute User user, @RequestParam("fileData") String fileData) { + user.setImageUrl(fileData); userRepository.save(user); Authority authority = new Authority(user.getUsername(), "ROLE_USER"); diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index f87c6f592..1222978f6 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -6,7 +6,6 @@ import lombok.Getter; import java.sql.Timestamp; -import java.util.List; @Data @Entity @@ -43,5 +42,13 @@ public Post(String content, Timestamp timestamp, Long userId) { public void setUserId(Long userId) { this.userId = userId; } + @Override + public String toString() { + return "MyClass{" + + "value=" + content + + "timestamp" + timestamp + + "userId" + userId + + '}'; + } } diff --git a/src/main/java/com/makersacademy/acebook/model/User.java b/src/main/java/com/makersacademy/acebook/model/User.java index 343aaa4f5..84a10a83d 100644 --- a/src/main/java/com/makersacademy/acebook/model/User.java +++ b/src/main/java/com/makersacademy/acebook/model/User.java @@ -48,5 +48,4 @@ public User(String username, String password, String imageUrl, boolean enabled) public void setUsername(String username) { this.username = username; } public void setPassword(String password) { this.password = password; } public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } - } diff --git a/src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql b/src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql new file mode 100644 index 000000000..b0eb4c232 --- /dev/null +++ b/src/main/resources/db/migration/V18__update_imageUrl_column_to_text.sql @@ -0,0 +1,2 @@ +ALTER TABLE USERS +ALTER COLUMN image_url TYPE TEXT; \ No newline at end of file diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 1db761740..4987880a9 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -10,7 +10,7 @@
        - Profile Image + Profile Image
        Friends @@ -40,12 +40,21 @@

        Posts

        -
          -
          -
        • -

          -

          -
          • +
            +
          • +
            +

            +
            +
            +

            +
            +
            +

            + + +

            +
            +
          diff --git a/src/main/resources/templates/users/new.html b/src/main/resources/templates/users/new.html index 77bb3da98..13569c343 100644 --- a/src/main/resources/templates/users/new.html +++ b/src/main/resources/templates/users/new.html @@ -3,14 +3,29 @@ Signup + +
          -

          -

          -

          Username:

          -

          Password:

          -

          Profile Picture:

          +

          Username:

          +

          Password:

          +

          Profile Picture:

          +

          From de7280af91d59602a10a60802b21b07b79b90881 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Tue, 21 Nov 2023 19:04:45 +0000 Subject: [PATCH 32/60] posts showing with names and images --- .../acebook/controller/PostsController.java | 12 ++++---- .../com/makersacademy/acebook/model/Post.java | 10 ------- src/main/resources/templates/posts/index.html | 30 +++++++++---------- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 797965a2e..4afeedfbf 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -36,16 +36,16 @@ public String index(Model model, Principal principal) { ArrayList> postsAndPosters = new ArrayList<>(); for (Post post : posts) { - HashMap hashMap = new HashMap<>(); + HashMap entry = new HashMap<>(); - Optional user = userRepository.findById(post.getUserId()); - User poster = user.orElse(null); + Optional optionalUser = userRepository.findById(post.getUserId()); + User poster = optionalUser.orElse(null); - hashMap.put(post, poster); - postsAndPosters.add(hashMap); + entry.put(post, poster); + postsAndPosters.add(entry); } - System.out.println(postsAndPosters); +// System.out.println(postsAndPosters); model.addAttribute("postsAndPosters", postsAndPosters); model.addAttribute("newPost", new Post()); diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index 1222978f6..bc3320875 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -41,14 +41,4 @@ public Post(String content, Timestamp timestamp, Long userId) { public void setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; } public void setUserId(Long userId) { this.userId = userId; } - - @Override - public String toString() { - return "MyClass{" + - "value=" + content + - "timestamp" + timestamp + - "userId" + userId + - '}'; - } - } diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 4987880a9..0ad34913f 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -40,21 +40,21 @@

          Posts

          -
            -
          • -
            -

            -
            -
            -

            -
            -
            -

            - - -

            -
            -
            • +
              +
                +
              • +

                + +

                +

                +
                +

                + + +

                +
                +
                • +
            From 93dae21a69902ea0c4a1b43748d35cc0d0378e1d Mon Sep 17 00:00:00 2001 From: xengeo Date: Wed, 22 Nov 2023 10:36:36 +0000 Subject: [PATCH 33/60] add comments progress.. sort of --- .../acebook/controller/PostsController.java | 48 +++++++++++-------- .../makersacademy/acebook/model/Comment.java | 16 ++----- src/main/resources/templates/posts/index.html | 2 + src/main/resources/templates/posts/show.html | 20 ++++---- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 229304b00..981240929 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -41,6 +41,9 @@ public String index(Model model) { @PostMapping("/posts") public RedirectView create(@ModelAttribute Post post, Principal principal) { + System.out.println("HEREEEEEEE"); + System.out.println("HEREEEEEEE"); + System.out.println(post); String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date()); post.setTimestamp(Timestamp.valueOf(timeStamp)); Optional currentUser = userRepository.findByUsername(principal.getName()); @@ -51,41 +54,44 @@ public RedirectView create(@ModelAttribute Post post, Principal principal) { } @GetMapping("/post/{id}") - public String show(@PathVariable Long id, Model model) { + public String show(@PathVariable Long id, Model model, Principal principal) { Optional post = postRepository.findById(id); Post currentPost = post.orElse(null); model.addAttribute("currentPost", currentPost); - Comment newComment = new Comment(); - model.addAttribute("newComment", newComment); + Optional currentUser = userRepository.findByUsername(principal.getName()); + User principalUser = currentUser.orElse(null); + model.addAttribute("userID", principalUser.getId()); + + Comment commentObj = new Comment(); + commentObj.setComment("This is our test comment content"); + commentObj.setPostId(1L); + commentObj.setUserId(2L); + System.out.println(commentObj); + model.addAttribute("newComment", commentObj); return "posts/show"; } - @PostMapping("/post/{id}") - public RedirectView createComment(@PathVariable Long id, @ModelAttribute Comment comment, Principal principal) { - - + @PostMapping("/post/addComment") + public RedirectView createComment(@ModelAttribute Comment newComment) { -// to make a new comment for a post: -// comment content, post_id, user_id - -// actual comment property should be set on the Comment object via the form -// Long.parseLong(id); -// Long.valueOf(String id).longValue(); -// set post_id: - comment.setPostId(id); + commentRepository.save(newComment); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println(newComment); // set user_id: - Optional currentUser = userRepository.findByUsername(principal.getName()); - User principalUser = currentUser.orElse(null); - comment.setUserId(principalUser.getId()); +// Optional currentUser = userRepository.findByUsername(principal.getName()); +// User principalUser = currentUser.orElse(null); +// newComment.setUserId(principalUser.getId()); // get visibility: - System.out.println(comment); - - commentRepository.save(comment); + System.out.println("PRINT OBJECT OUT AGAIN: "); + commentRepository.save(newComment); return new RedirectView("/posts"); diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java index 95505f8d8..a5f6d262d 100644 --- a/src/main/java/com/makersacademy/acebook/model/Comment.java +++ b/src/main/java/com/makersacademy/acebook/model/Comment.java @@ -2,6 +2,7 @@ import lombok.Data; +import lombok.Getter; import javax.persistence.*; @@ -15,8 +16,11 @@ public class Comment { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Getter private String comment; + @Getter private Long postId; + @Getter private Long userId; // @ManyToOne(cascade = CascadeType.ALL) @@ -31,26 +35,14 @@ public Comment(String comment, Long postId, Long userId) { this.userId = userId; } - public String getComment() { - return this.comment; - } - public void setComment(String comment) { this.comment = comment; } - public Long getPostId() { - return this.postId; - } - public void setPostId(Long postId) { this.postId = postId; } - public Long getUserId() { - return this.userId; - } - public void setUserId(Long UserId) { this.userId = UserId; } diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 1db761740..bd1027703 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -35,11 +35,13 @@

            Posts

            Signed in as
        +

        Content:

        +
        • diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html index 098f851cc..6a69070d8 100644 --- a/src/main/resources/templates/posts/show.html +++ b/src/main/resources/templates/posts/show.html @@ -1,18 +1,18 @@ - + - - - - Acebook + + Post

          - -

          Comment:

          -

          + + + + + +

          Comment:

          +

          • Comment 1
            • From 36252157a111ccf95b7478a7545e16425984d0fa Mon Sep 17 00:00:00 2001 From: Zakarie Date: Wed, 22 Nov 2023 10:53:11 +0000 Subject: [PATCH 34/60] fix image showing on profile --- src/main/resources/templates/users/show.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index cfc13dcb3..6cef1d1f2 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -17,7 +17,7 @@
            From 697452d8b965a858594a0c841cbab5b9aa9115aa Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Wed, 22 Nov 2023 11:02:40 +0000 Subject: [PATCH 35/60] Add CommentController --- .../acebook/controller/CommentController.java | 39 +++++++++++++++++++ .../acebook/controller/PostsController.java | 24 ------------ 2 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/makersacademy/acebook/controller/CommentController.java diff --git a/src/main/java/com/makersacademy/acebook/controller/CommentController.java b/src/main/java/com/makersacademy/acebook/controller/CommentController.java new file mode 100644 index 000000000..797d7e236 --- /dev/null +++ b/src/main/java/com/makersacademy/acebook/controller/CommentController.java @@ -0,0 +1,39 @@ +package com.makersacademy.acebook.controller; + +import com.makersacademy.acebook.model.Comment; +import com.makersacademy.acebook.repository.CommentRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.servlet.view.RedirectView; + +@Controller +public class CommentController { + + @Autowired + CommentRepository commentRepository; + + @PostMapping("/post/addComment") + public RedirectView createComment(@ModelAttribute Comment newComment) { + + commentRepository.save(newComment); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println("HEREEEEEEEEEEEEE"); + System.out.println(newComment); + +// set user_id: +// Optional currentUser = userRepository.findByUsername(principal.getName()); +// User principalUser = currentUser.orElse(null); +// newComment.setUserId(principalUser.getId()); + +// get visibility: + System.out.println("PRINT OBJECT OUT AGAIN: "); + commentRepository.save(newComment); + + return new RedirectView("/posts"); + + } +} diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 981240929..e4196b05a 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -28,9 +28,6 @@ public class PostsController { @Autowired UserRepository userRepository; - @Autowired - CommentRepository commentRepository; - @GetMapping("/posts") public String index(Model model) { Iterable posts = postRepository.findAllByOrderByTimestampDesc(); @@ -74,26 +71,5 @@ public String show(@PathVariable Long id, Model model, Principal principal) { return "posts/show"; } - @PostMapping("/post/addComment") - public RedirectView createComment(@ModelAttribute Comment newComment) { - - commentRepository.save(newComment); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println(newComment); - -// set user_id: -// Optional currentUser = userRepository.findByUsername(principal.getName()); -// User principalUser = currentUser.orElse(null); -// newComment.setUserId(principalUser.getId()); -// get visibility: - System.out.println("PRINT OBJECT OUT AGAIN: "); - commentRepository.save(newComment); - - return new RedirectView("/posts"); - - } } From 945069dc0bd4907351e0331a6a0f097188d2af5e Mon Sep 17 00:00:00 2001 From: xengeo Date: Wed, 22 Nov 2023 12:08:44 +0000 Subject: [PATCH 36/60] add comment form is working! --- .../acebook/controller/CommentController.java | 38 ++++++---- .../acebook/controller/PostsController.java | 11 +-- src/main/resources/templates/posts/show.html | 1 - .../controller/CommentControllerTest.java | 76 +++++++++++++++++++ .../controller/PostControllerTest.java | 27 ------- 5 files changed, 100 insertions(+), 53 deletions(-) create mode 100644 src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java diff --git a/src/main/java/com/makersacademy/acebook/controller/CommentController.java b/src/main/java/com/makersacademy/acebook/controller/CommentController.java index 797d7e236..c884ea178 100644 --- a/src/main/java/com/makersacademy/acebook/controller/CommentController.java +++ b/src/main/java/com/makersacademy/acebook/controller/CommentController.java @@ -1,39 +1,45 @@ package com.makersacademy.acebook.controller; import com.makersacademy.acebook.model.Comment; +import com.makersacademy.acebook.model.User; import com.makersacademy.acebook.repository.CommentRepository; +import com.makersacademy.acebook.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.servlet.view.RedirectView; +import java.security.Principal; +import java.util.Optional; + @Controller public class CommentController { @Autowired CommentRepository commentRepository; + @Autowired + UserRepository userRepository; + @PostMapping("/post/addComment") - public RedirectView createComment(@ModelAttribute Comment newComment) { + public String createComment(@RequestParam String comment, @RequestParam Long postId, Principal principal) { + +// Get userID + Optional currentUser = userRepository.findByUsername(principal.getName()); + User principalUser = currentUser.orElse(null); + + System.out.println(comment); + System.out.println(postId); + System.out.println(principalUser.getId()); + + Comment newComment = new Comment(comment, postId, principalUser.getId()); - commentRepository.save(newComment); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println("HEREEEEEEEEEEEEE"); - System.out.println(newComment); - -// set user_id: -// Optional currentUser = userRepository.findByUsername(principal.getName()); -// User principalUser = currentUser.orElse(null); -// newComment.setUserId(principalUser.getId()); - -// get visibility: - System.out.println("PRINT OBJECT OUT AGAIN: "); commentRepository.save(newComment); - return new RedirectView("/posts"); + return "redirect:/post/" + postId; } } diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index e4196b05a..9c58fc552 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -51,21 +51,14 @@ public RedirectView create(@ModelAttribute Post post, Principal principal) { } @GetMapping("/post/{id}") - public String show(@PathVariable Long id, Model model, Principal principal) { + public String show(@PathVariable Long id, Model model) { Optional post = postRepository.findById(id); Post currentPost = post.orElse(null); model.addAttribute("currentPost", currentPost); - Optional currentUser = userRepository.findByUsername(principal.getName()); - User principalUser = currentUser.orElse(null); - model.addAttribute("userID", principalUser.getId()); - +// create new comment object Comment commentObj = new Comment(); - commentObj.setComment("This is our test comment content"); - commentObj.setPostId(1L); - commentObj.setUserId(2L); - System.out.println(commentObj); model.addAttribute("newComment", commentObj); return "posts/show"; diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html index 6a69070d8..43f6d6e15 100644 --- a/src/main/resources/templates/posts/show.html +++ b/src/main/resources/templates/posts/show.html @@ -9,7 +9,6 @@
            -

            Comment:

            diff --git a/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java new file mode 100644 index 000000000..a658ce944 --- /dev/null +++ b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java @@ -0,0 +1,76 @@ +package com.makersacademy.aceboook.controller; + +import com.github.javafaker.Faker; +import com.makersacademy.acebook.Application; +import com.makersacademy.acebook.repository.CommentRepository; +import com.makersacademy.acebook.repository.PostRepository; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.chrome.ChromeDriver; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.List; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +public class CommentControllerTest { + + + @Autowired + PostRepository postRepository; + + @Autowired + CommentRepository commentRepository; + + WebDriver driver; + Faker faker; + + @Before + public void setup() { + System.setProperty("webdriver.chrome.driver", "/usr/local/bin/chromedriver"); + driver = new ChromeDriver(); + faker = new Faker(); + } + + @After + public void tearDown() { + driver.close(); + } + + @Test + public void testAddCommentReflectedInCommentsList() { + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("username")).sendKeys("test_user"); + driver.findElement(By.id("password")).sendKeys("password22"); + driver.findElement(By.id("submit")).click(); + driver.findElement(By.id("comment")).click(); + driver.findElement(By.id("addComment")).sendKeys("Here is my new comment!"); + driver.findElement(By.id("submitComment")).click(); + + WebElement commentsUL = driver.findElement(By.tagName("ul")); + List commentsLI = commentsUL.findElements(By.tagName("li")); + String comment = commentsLI.get(0).getText(); + + Assert.assertEquals("Here is my new comment!", comment); + + } + + + +// @Test +// public void testPostPageShowsPostAndListOfComments() { +// driver.get("http://localhost:8080/login"); +// driver.findElement(By.id("username")).sendKeys("test_user"); +// driver.findElement(By.id("password")).sendKeys("password22"); +// driver.findElement(By.id("submit")).click(); +// +// } +} diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index f71461271..1e4c36862 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -94,32 +94,5 @@ public void testCommentButtonNavigatesToPostPageFromPosts() { } - @Test - public void testAddCommentReflectedInCommentsList() { - driver.get("http://localhost:8080/login"); - driver.findElement(By.id("username")).sendKeys("test_user"); - driver.findElement(By.id("password")).sendKeys("password22"); - driver.findElement(By.id("submit")).click(); - driver.findElement(By.id("comment")).click(); - driver.findElement(By.id("addComment")).sendKeys("Here is my new comment!"); - driver.findElement(By.id("submitComment")).click(); - - WebElement commentsUL = driver.findElement(By.tagName("ul")); - List commentsLI = commentsUL.findElements(By.tagName("li")); - String comment = commentsLI.get(0).getText(); - - Assert.assertEquals("Here is my new comment!", comment); - - } - - -// @Test -// public void testPostPageShowsPostAndListOfComments() { -// driver.get("http://localhost:8080/login"); -// driver.findElement(By.id("username")).sendKeys("test_user"); -// driver.findElement(By.id("password")).sendKeys("password22"); -// driver.findElement(By.id("submit")).click(); -// -// } } From 4a4234720b912eff2d9dd4ee3bb98f489da7880d Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Wed, 22 Nov 2023 12:54:03 +0000 Subject: [PATCH 37/60] Show user list of comments on post page --- .../acebook/controller/CommentController.java | 30 ++++++++++++++++--- .../acebook/controller/PostsController.java | 15 ---------- .../acebook/repository/CommentRepository.java | 3 ++ src/main/resources/templates/posts/show.html | 10 +++---- .../controller/CommentControllerTest.java | 4 ++- 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/makersacademy/acebook/controller/CommentController.java b/src/main/java/com/makersacademy/acebook/controller/CommentController.java index c884ea178..81a1f1b32 100644 --- a/src/main/java/com/makersacademy/acebook/controller/CommentController.java +++ b/src/main/java/com/makersacademy/acebook/controller/CommentController.java @@ -1,15 +1,15 @@ package com.makersacademy.acebook.controller; 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.PostRepository; import com.makersacademy.acebook.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.view.RedirectView; import java.security.Principal; @@ -18,12 +18,34 @@ @Controller public class CommentController { + + @Autowired + PostRepository postRepository; + @Autowired CommentRepository commentRepository; @Autowired UserRepository userRepository; + @GetMapping("/post/{id}") + public String show(@PathVariable Long id, Model model) { +// get post + Optional post = postRepository.findById(id); + Post currentPost = post.orElse(null); + model.addAttribute("currentPost", currentPost); + +// create new comment object + Comment commentObj = new Comment(); + model.addAttribute("newComment", commentObj); + +// get list of comments for the post + Iterable comments = commentRepository.findAllByPostId(id); + model.addAttribute("comments", comments); + + return "posts/show"; + } + @PostMapping("/post/addComment") public String createComment(@RequestParam String comment, @RequestParam Long postId, Principal principal) { diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 9c58fc552..320a1e335 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -50,19 +50,4 @@ public RedirectView create(@ModelAttribute Post post, Principal principal) { return new RedirectView("/posts"); } - @GetMapping("/post/{id}") - public String show(@PathVariable Long id, Model model) { - - Optional post = postRepository.findById(id); - Post currentPost = post.orElse(null); - model.addAttribute("currentPost", currentPost); - -// create new comment object - Comment commentObj = new Comment(); - model.addAttribute("newComment", commentObj); - - return "posts/show"; - } - - } diff --git a/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java b/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java index 25107d246..d45833560 100644 --- a/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java +++ b/src/main/java/com/makersacademy/acebook/repository/CommentRepository.java @@ -3,5 +3,8 @@ import com.makersacademy.acebook.model.Comment; import org.springframework.data.repository.CrudRepository; +import java.util.List; + public interface CommentRepository extends CrudRepository { + public List findAllByPostId(Long postId); } diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html index 43f6d6e15..533f5fed9 100644 --- a/src/main/resources/templates/posts/show.html +++ b/src/main/resources/templates/posts/show.html @@ -10,13 +10,11 @@ -

            Comment:

            -

            +

            Comment:

            +

            -
              -
            • Comment 1
              • -
            • Comment 2
              • -
            • Comment 3
              • +
                +
              \ No newline at end of file diff --git a/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java index a658ce944..9fe629b10 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java @@ -56,8 +56,10 @@ public void testAddCommentReflectedInCommentsList() { driver.findElement(By.id("submitComment")).click(); WebElement commentsUL = driver.findElement(By.tagName("ul")); + System.out.println(commentsUL.getText()); List commentsLI = commentsUL.findElements(By.tagName("li")); - String comment = commentsLI.get(0).getText(); + System.out.println(commentsLI); + String comment = commentsLI.get(commentsLI.size() - 1).getText(); Assert.assertEquals("Here is my new comment!", comment); From 08a9f4ff8108c810b405d5109adbcf7b3de4cdcd Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Wed, 22 Nov 2023 14:23:20 +0000 Subject: [PATCH 38/60] Editing add comment test --- .../aceboook/controller/CommentControllerTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java index 9fe629b10..1d207f997 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/CommentControllerTest.java @@ -55,11 +55,9 @@ public void testAddCommentReflectedInCommentsList() { driver.findElement(By.id("addComment")).sendKeys("Here is my new comment!"); driver.findElement(By.id("submitComment")).click(); - WebElement commentsUL = driver.findElement(By.tagName("ul")); - System.out.println(commentsUL.getText()); - List commentsLI = commentsUL.findElements(By.tagName("li")); - System.out.println(commentsLI); - String comment = commentsLI.get(commentsLI.size() - 1).getText(); + WebElement ul = driver.findElement(By.tagName("ul"));; + List commentsList = ul.findElements(By.tagName("li")); + String comment = commentsList.get(0).getText(); Assert.assertEquals("Here is my new comment!", comment); From cb76165b620311d47a617b6f864d8711a2eed005 Mon Sep 17 00:00:00 2001 From: David Sholoye Date: Wed, 22 Nov 2023 15:07:40 +0000 Subject: [PATCH 39/60] Add CSS changes to the code --- src/main/resources/static/website.css | 144 ++++++++++++++++++ src/main/resources/templates/login.html | 7 +- src/main/resources/templates/posts/index.html | 21 ++- src/main/resources/templates/posts/show.html | 30 +++- .../resources/templates/users/friends.html | 3 +- src/main/resources/templates/users/new.html | 4 +- src/main/resources/templates/users/show.html | 7 +- 7 files changed, 192 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/static/website.css diff --git a/src/main/resources/static/website.css b/src/main/resources/static/website.css new file mode 100644 index 000000000..5180b901b --- /dev/null +++ b/src/main/resources/static/website.css @@ -0,0 +1,144 @@ +@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,300;1,400;1,500;1,600;1,700;1,800&display=swap'); + +html { +font-family: 'Poppins', sans-serif; +} + +body { + background-color: #f3f3ec; + color: black; /* Text color for body */ + margin: 0; + padding: 0; +} + +.header { + background-color: #ADD8E6; /* Header background color */ + color: black; /* Text color for header */ + padding: 10px; + display: flex; + justify-content: space-between; +} + +.profile_image { + color: black; + text-decoration: none; + font-size: 1.8rem; + text-transform: capitalize; +} + +.profile_image img { + border-radius: 50%; /* Make the profile image round */ +} + + +.menu-right { + display: flex; + align-items: center; +} + +.menu-right a { + color: black; /* Text color for menu links */ + margin: 0 10px; + text-decoration: none; +} + +.menu-right form { + margin: 0; +} + +.menu-right input[type="submit"] { + background-color: #ADD8E6; + color: black; + padding: 10px 15px; + border: none; + border-radius: 4px; + cursor: pointer; +} + +.menu-right input[type="submit"]:hover { + background-color: #ADD8E6; +} + +.contentForm, .commentForm{ + max-width: 80%; + margin: 3.5rem; + padding: 20px; + background-color: #f3f3ec; +} + +.userSignup, .userLogin { + max-width: 50%; + margin: 0 auto; + padding: 20px; + background-color: #fafaf7; + border-radius: 5px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); +} + + +textarea{ + background-color: #f3f3ec; +} + +.listed { + max-width: 30%; + margin: 0rem; + padding: 20px; + background-color: #fafaf7; + border-radius: 5px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); +} + + +.postContainer { + list-style: none; +} + +p { + margin-bottom: 20px; +} + +input[type="text"], +input[type="password"], +input[type="file"] { + width: 100%; + padding: 10px; + margin-bottom: 10px; + box-sizing: border-box; + border: 1px solid #ccc; + border-radius: 4px; + color: black; /* Text color for input fields */ +} + +input[type="submit"], +input[type="reset"] { + background-color: #ADD8E6; + color: black; + padding: 10px 15px; + border: none; + border-radius: 4px; + cursor: pointer; +} + +input[type="submit"]:hover, +input[type="reset"]:hover { + background-color: #ADD8E6; +} + +button { + background-color: #ADD8E6; + color: black; + padding: 10px 15px; + border: none; + border-radius: 4px; + cursor: pointer; +} + +.friendButton { + background-color: #ADD8E6; + color: black; + padding: 10px 15px; + border: none; + border-radius: 4px; + cursor: pointer; +} \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 4a0cde1e5..91a597a9f 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,10 +1,11 @@ + Please log in
              -
              +
              Please Login
              @@ -22,9 +23,9 @@
              -
              +
              - +
              diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 0ad34913f..d762b31b4 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -4,13 +4,16 @@ Acebook - +
              - Profile Image +
              + Profile Image + +
              Friends @@ -29,20 +32,14 @@
              -

              Posts

              - -
              - Signed in as -
              - -
              -

              Content:

              + +

                -
                  -
                • +
                    +

                  • diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html index 098f851cc..b26a3ff66 100644 --- a/src/main/resources/templates/posts/show.html +++ b/src/main/resources/templates/posts/show.html @@ -6,12 +6,38 @@ + Acebook +
                    + +
                    + Profile Image + +
                    +                     +
                    + Friends + Timeline + + +
                    +
                    + +
                    +
                    + +
                    +
                    +

                    -
                    -

                    Comment:

                    + +

                      diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index 3ee7bc879..9de5e88d5 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -2,7 +2,8 @@ - Title + + Title diff --git a/src/main/resources/templates/users/new.html b/src/main/resources/templates/users/new.html index 13569c343..a25bea50c 100644 --- a/src/main/resources/templates/users/new.html +++ b/src/main/resources/templates/users/new.html @@ -2,6 +2,8 @@ + + Signup -
                      +

                      Username:

                      Password:

                      Profile Picture:

                      diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 6cef1d1f2..22e84d8fc 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -4,7 +4,7 @@ - + @@ -63,36 +77,42 @@

            + + +
            +
            + + + +
            +
        From 5a944d94924a40136c4f967ec2d44f6899a92aa8 Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Thu, 23 Nov 2023 17:29:24 +0000 Subject: [PATCH 56/60] Fix broken tests --- Dockerfile | 4 ++++ src/main/resources/templates/login.html | 2 +- src/main/resources/templates/posts/index.html | 4 ++-- src/main/resources/templates/users/show.html | 2 +- src/test/java/SignUpTest.java | 22 +++---------------- .../controller/PostControllerTest.java | 18 +++++++-------- .../controller/UsersControllerTest.java | 20 ++++++----------- 7 files changed, 26 insertions(+), 46 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..7e41c831e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM eclipse-temurin:17-jdk-alpine +VOLUME /tmp +COPY target/*.jar app.jar +ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 91a597a9f..0ca268afa 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -8,7 +8,7 @@
        Please Login -
        +
        Invalid username and password.
        diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 5287e4c5b..9cce5b811 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -41,7 +41,7 @@
        - +

        @@ -56,7 +56,7 @@
        -

        +

        diff --git a/src/main/resources/templates/users/show.html b/src/main/resources/templates/users/show.html index 7a115ee53..e9f8b04c9 100644 --- a/src/main/resources/templates/users/show.html +++ b/src/main/resources/templates/users/show.html @@ -74,7 +74,7 @@

        Posts

        diff --git a/src/test/java/SignUpTest.java b/src/test/java/SignUpTest.java index fec9926fa..42ba25f74 100644 --- a/src/test/java/SignUpTest.java +++ b/src/test/java/SignUpTest.java @@ -54,28 +54,12 @@ public void signUpButtonLinksToSignUpPage() { } @Test - public void testBlankUsernameReturnsError() { + public void testBlankUsernameStaysOnPage() { driver.get("http://localhost:8080/users/new"); driver.findElement(By.id("username")).sendKeys(" "); driver.findElement(By.id("password")).sendKeys("password"); driver.findElement(By.id("submit")).click(); - // Explicitly wait for the error message to be visible - WebDriverWait wait = new WebDriverWait(driver, 10); - WebElement usernameError = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("usernameError"))); - String errorString = usernameError.getText(); - Assert.assertEquals("Please enter a username", errorString); - } - - @Test - public void testBlankPasswordReturnsError() { - driver.get("http://localhost:8080/users/new"); - driver.findElement(By.id("username")).sendKeys("username_1"); - driver.findElement(By.id("password")).sendKeys(" "); - driver.findElement(By.id("submit")).click(); - // Explicitly wait for the error message to be visible - WebDriverWait wait = new WebDriverWait(driver, 10); - WebElement passwordError = wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("passwordError"))); - String errorString = passwordError.getText(); - Assert.assertEquals("Please enter a password", errorString); + String currentURL = driver.getCurrentUrl(); + Assert.assertEquals("http://localhost:8080/users", currentURL); } } diff --git a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java index aa512eebf..da44dc267 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/PostControllerTest.java @@ -51,12 +51,10 @@ public void testNewPostIsAtTheTopOfList() { driver.findElement(By.id("username")).sendKeys("test_user"); driver.findElement(By.id("password")).sendKeys("password22"); driver.findElement(By.id("submit")).click(); - driver.findElement(By.id("content")).sendKeys("New Post"); - driver.findElement(By.id("submit")).click(); - - WebElement ul = driver.findElement(By.tagName("ul")); - List postList = ul.findElements(By.id("postContent")); + driver.findElement(By.id("timeline-form-content")).sendKeys("New Post"); + driver.findElement(By.id("submit-posts")).click(); + List postList = driver.findElements(By.id("postContent")); String newPost = postList.get(0).getText(); Assert.assertEquals("New Post", newPost); @@ -69,9 +67,9 @@ public void testNewPostHasUserIdAssigned() { driver.findElement(By.id("password")).sendKeys("password22"); driver.findElement(By.id("submit")).click(); WebDriverWait wait = new WebDriverWait(driver, 10); - wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("content"))); - driver.findElement(By.id("content")).sendKeys("New Post"); - driver.findElement(By.id("submit")).click(); + wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("timeline-form-content"))); + driver.findElement(By.id("timeline-form-content")).sendKeys("New Post"); + driver.findElement(By.id("submit-posts")).click(); List posts = postRepository.findAllByOrderByTimestampDesc(); Post latestPost = posts.get(0); Long userId = latestPost.getUserId(); @@ -85,8 +83,8 @@ public void testCommentButtonNavigatesToPostPageFromPosts() { driver.findElement(By.id("username")).sendKeys("test_user"); driver.findElement(By.id("password")).sendKeys("password22"); driver.findElement(By.id("submit")).click(); - driver.findElement(By.id("content")).sendKeys("Testing Comment Button"); - driver.findElement(By.id("submit")).click(); + driver.findElement(By.id("timeline-form-content")).sendKeys("Testing Comment Button"); + driver.findElement(By.id("submit-posts")).click(); driver.findElement(By.id("comment")).click(); WebElement h3Element = driver.findElement(By.tagName("h3")); String h3Text = h3Element.getText(); diff --git a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java index 0f8b6cd87..b7f351105 100644 --- a/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java +++ b/src/test/java/com/makersacademy/aceboook/controller/UsersControllerTest.java @@ -36,20 +36,14 @@ public void tearDown() { @Test public void usersCanReadUsername() { - driver.get("localhost:8080/users/3"); - WebElement pElement = driver.findElement(By.tagName("p")); + driver.get("http://localhost:8080/login"); + driver.findElement(By.id("username")).sendKeys("test_user"); + driver.findElement(By.id("password")).sendKeys("password22"); + driver.findElement(By.id("submit")).click(); + driver.get("http://localhost:8080/users/4"); + WebElement pElement = driver.findElement(By.id("profileUsername")); String pText = pElement.getText(); - Assert.assertEquals("zak ", pText); + Assert.assertEquals("Test_User", pText); } - -// @Test -// public void successfulSignUpRedirectsToSignIn() { -// driver.get("http://localhost:8080/users/new"); -// driver.findElement(By.id("username")).sendKeys(faker.name().firstName()); -// driver.findElement(By.id("password")).sendKeys("password"); -// driver.findElement(By.id("submit")).click(); -// String title = driver.getTitle(); -// Assert.assertEquals("Please sign in", title); -// } } From 04acabd44af6cbedfb5545c4a80c8b5826832f2c Mon Sep 17 00:00:00 2001 From: Natalie Clark Date: Thu, 23 Nov 2023 17:43:01 +0000 Subject: [PATCH 57/60] Fix photo --- src/main/resources/templates/users/friends.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index 1eed18a14..fc22d0c32 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -53,7 +53,7 @@
        Friends
        • - + From 08cca0b90121e37fa85a6c69a3c8836ac221fc49 Mon Sep 17 00:00:00 2001 From: Zakarie Date: Thu, 23 Nov 2023 19:33:26 +0000 Subject: [PATCH 58/60] users can upload photos as posts --- .../acebook/controller/PostsController.java | 6 ++-- .../com/makersacademy/acebook/model/Post.java | 8 +++-- .../V20__add_photo_column_to_posts_table.sql | 2 ++ src/main/resources/static/website.css | 1 - src/main/resources/templates/posts/index.html | 32 ++++++++++++++----- .../makersacademy/acebook/model/PostTest.java | 2 +- 6 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql diff --git a/src/main/java/com/makersacademy/acebook/controller/PostsController.java b/src/main/java/com/makersacademy/acebook/controller/PostsController.java index 9a68afe66..2baaa9fb4 100644 --- a/src/main/java/com/makersacademy/acebook/controller/PostsController.java +++ b/src/main/java/com/makersacademy/acebook/controller/PostsController.java @@ -53,14 +53,14 @@ public String index(Model model, Principal principal) { model.addAttribute("postsAndPosters", postsAndPosters); model.addAttribute("newPost", new Post()); - model.addAttribute("profilePicture", principalUser.getImageUrl()); model.addAttribute("currentUser", principalUser); return "posts/index"; } @PostMapping("/posts") - public RedirectView create(@ModelAttribute Post post, Principal principal) { + public RedirectView create(@ModelAttribute Post post, Principal principal, + @RequestParam String fileData) { // get and set timestamp of post String timeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new java.util.Date()); @@ -71,6 +71,8 @@ public RedirectView create(@ModelAttribute Post post, Principal principal) { User principalUser = currentUser.orElse(null); post.setUserId(principalUser.getId()); + post.setPostPhoto(fileData); + // save post postRepository.save(post); diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java index 45833e725..2ee8eed9f 100644 --- a/src/main/java/com/makersacademy/acebook/model/Post.java +++ b/src/main/java/com/makersacademy/acebook/model/Post.java @@ -18,23 +18,25 @@ public class Post { @Getter private String content; - + @Getter + String postPhoto; @Getter private Timestamp timestamp; - @Getter private Long userId; public Post() {} - public Post(String content, Timestamp timestamp, Long userId) { + public Post(String content, Timestamp timestamp, Long userId, String postPhoto) { this.content = content; this.timestamp = timestamp; this.userId = userId; + this.postPhoto = postPhoto; } public void setContent(String content) { this.content = content; } public void setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; } public void setUserId(Long userId) { this.userId = userId; } + public void setPostPhoto(String postPhoto) { this.postPhoto = postPhoto; } } diff --git a/src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql b/src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql new file mode 100644 index 000000000..a7a249360 --- /dev/null +++ b/src/main/resources/db/migration/V20__add_photo_column_to_posts_table.sql @@ -0,0 +1,2 @@ +ALTER TABLE POSTS +ADD COLUMN post_photo TEXT; diff --git a/src/main/resources/static/website.css b/src/main/resources/static/website.css index a7cce8cc0..a570a72fc 100644 --- a/src/main/resources/static/website.css +++ b/src/main/resources/static/website.css @@ -291,7 +291,6 @@ button:hover { .posts-content-form { max-width: 100%; background-color: #f3f3ec; - padding-left: 40px; } .posts-content-form #timeline-form-content { diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 5287e4c5b..801f50bc4 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -5,6 +5,22 @@ Acebook + +
          @@ -25,11 +41,10 @@
          - Profile Image + Profile Image
          @@ -41,8 +56,10 @@
        - - + + + +

        @@ -57,6 +74,9 @@

        +
        + an image +

        @@ -74,9 +94,5 @@
    - - - - diff --git a/src/test/java/com/makersacademy/acebook/model/PostTest.java b/src/test/java/com/makersacademy/acebook/model/PostTest.java index be918f1d3..59d8dfa39 100644 --- a/src/test/java/com/makersacademy/acebook/model/PostTest.java +++ b/src/test/java/com/makersacademy/acebook/model/PostTest.java @@ -11,7 +11,7 @@ public class PostTest { Timestamp timestamp = Timestamp.valueOf("2007-09-23 10:10:10.0");; - private Post post = new Post("hello", timestamp, 1L); + private Post post = new Post("hello", timestamp, 1L, "empty"); @Test public void postHasContent() { From c559c47c5b0bdd9ad59f081957e9393ac6b9cfd1 Mon Sep 17 00:00:00 2001 From: somunachima Date: Thu, 23 Nov 2023 21:38:15 +0000 Subject: [PATCH 59/60] add styling to post-show --- src/main/resources/static/website.css | 6 +- src/main/resources/templates/posts/index.html | 3 +- src/main/resources/templates/posts/show.html | 102 ++++++++++-------- .../resources/templates/users/friends.html | 3 +- 4 files changed, 60 insertions(+), 54 deletions(-) diff --git a/src/main/resources/static/website.css b/src/main/resources/static/website.css index a7cce8cc0..292e292e5 100644 --- a/src/main/resources/static/website.css +++ b/src/main/resources/static/website.css @@ -274,7 +274,7 @@ button:hover { flex-direction: column; justify-content: center; width: 700px; - margin: 0px auto; + margin: 40px auto; list-style: none; padding-inline-start: 0px; } @@ -291,11 +291,11 @@ button:hover { .posts-content-form { max-width: 100%; background-color: #f3f3ec; - padding-left: 40px; + margin-top: 30px; } .posts-content-form #timeline-form-content { - width: 93%; + width: 94%; padding: 20px; } diff --git a/src/main/resources/templates/posts/index.html b/src/main/resources/templates/posts/index.html index 5287e4c5b..6174d2e46 100644 --- a/src/main/resources/templates/posts/index.html +++ b/src/main/resources/templates/posts/index.html @@ -50,14 +50,13 @@
  • - +

    -

    diff --git a/src/main/resources/templates/posts/show.html b/src/main/resources/templates/posts/show.html index b654b387d..e561defda 100644 --- a/src/main/resources/templates/posts/show.html +++ b/src/main/resources/templates/posts/show.html @@ -10,60 +10,68 @@ -
    - -
    - Acebook -
    -     -
    - Timeline - Friends - - -
    -
    - -
    -
    - - +
    +
    - Profile Image + Acebook
    +
    + Friends + + +
    +
    + +
    +
    + + +
    + Profile Image +
    +     +
    -
    - -
    - - -

    - - -
    - - -

    -
    + +

    + + +

    + +
    Comments
    + + +
    - -
      -
    • - - - - - -

      -
      • -
    - \ No newline at end of file diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index d6630238b..ea2b36dfe 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -16,7 +16,6 @@
    • - Timeline Friends @@ -29,7 +28,7 @@ Log In Register
    - +
    Profile Image
    From 64eed9b75df5936aa3d25389a4b4cd58a6960783 Mon Sep 17 00:00:00 2001 From: somunachima Date: Thu, 23 Nov 2023 21:54:36 +0000 Subject: [PATCH 60/60] fix bugs in friends --- src/main/resources/templates/users/friends.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/users/friends.html b/src/main/resources/templates/users/friends.html index 7e4573a33..74d332923 100644 --- a/src/main/resources/templates/users/friends.html +++ b/src/main/resources/templates/users/friends.html @@ -52,7 +52,8 @@
    Friends