Readme seed

.gitignore

@@ -9,3 +9,4 @@ dependency-reduced-pom.xml
 .factorypath
 .project
 .settings/
+.env

README.md

@@ -14,18 +14,40 @@ Below, you'll find specific learning objectives for each tool.
 ## QuickStart Instructions
 
 - Fork and clone this repository to your machine
-- Open the codebase in an IDE like InteliJ or VSCode
+- Open the codebase in an IDE like IntelliJ or VSCode
 - Create a new Postgres database called `acebook_springboot_development`
 - Install Maven `brew install maven`
 - [Set up Auth0](https://journey.makers.tech/pages/auth0) (you only need the "Create an Auth0 app" section)
   - NOTE: Each member of the team will need their own Auth0 app
+  - Create a file .env with this structure:
+    > OKTA_ISSUER=<your-domain> <br>
+      OKTA_CLIENT_ID=<your-client-ID> <br>
+      OKTA_CLIENT_SECRET=<your_client_secret>
+
+  Make sure the naming matches the one on the file application.yml: <br>
+    issuer: ${OKTA_ISSUER} <br>
+    client-id: ${OKTA_CLIENT_ID} <br>
+    client-secret: ${OKTA_CLIENT_SECRET} <br>
+  <br>
+- update your .gitignore with .env
+
+- add dependencies in pom.xml: <br>
+```xml
+  <dependency>
+      <groupId>com.okta.spring</groupId>
+      <artifactId>okta-spring-boot-starter</artifactId>
+      <version>3.0.7</version>
+    </dependency>
+```
 - Build the app and start the server, using the Maven command `mvn spring-boot:run`
 > The database migrations will run automatically at this point
 - Visit `http://localhost:8080/` to sign up
 
 ## Running the tests
 
 - Install chromedriver using `brew install chromedriver`
+- In the terminal, at the same level of the project run:  `psql -U username -d acebook_springboot_development`
+  - And after: `\i src/main/resources/db/seeds/R__new_dev_seed.sql`
 - Start the server in a terminal session `mvn spring-boot:run`
 - Open a new terminal session and navigate to the Acebook directory
 - Run your tests in the second terminal session with `mvn test`

pom.xml

@@ -95,8 +95,23 @@
             <groupId>org.thymeleaf.extras</groupId>
             <artifactId>thymeleaf-extras-springsecurity6</artifactId>
         </dependency>
+        <dependency>
+            <groupId>nz.net.ultraq.thymeleaf</groupId>
+            <artifactId>thymeleaf-layout-dialect</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>me.paulschwarz</groupId>
+            <artifactId>spring-dotenv</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
+
     <build>
         <plugins>
             <plugin>

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

@@ -0,0 +1,26 @@
+package com.makersacademy.acebook.controller;
+
+import com.makersacademy.acebook.model.User;
+import com.makersacademy.acebook.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+@Controller
+public class SearchController {
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/search")
+    public ModelAndView viewSearchResults(@RequestParam(value = "nav-search", required = false) String query) {
+        ModelAndView searchView = new ModelAndView("/search/index");
+        List<User> allUsers = (List<User>) userRepository.findAll();
+        searchView.addObject("users", allUsers);
+        return searchView;
+    }
+}

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 okta:
   oauth2:
-    issuer: https://dev-edward-andress.uk.auth0.com/
+    issuer: ${OKTA_ISSUER}
     client-id: ${OKTA_CLIENT_ID}
     client-secret: ${OKTA_CLIENT_SECRET}

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

@@ -0,0 +1,95 @@
+--UPDATE EXISTING USERS TABLE
+ALTER TABLE users
+ADD my_status VARCHAR(255),
+ADD profile_photo_url TEXT,
+ADD bio TEXT;
+
+--UPDATE EXISTING POSTS TABLE
+ALTER TABLE posts
+ADD photo_url TEXT,
+ADD created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ADD user_id INT,
+ADD CONSTRAINT fk_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
+
+--CREATE POST_LIKES TABLE
+CREATE TABLE post_likes (
+  id bigserial PRIMARY KEY,
+  user_id INT,
+  post_id INT,
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT fk_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_post FOREIGN KEY (post_id) REFERENCES posts(id) ON DELETE CASCADE
+);
+
+--CREATE COMMENTS TABLE
+CREATE TABLE comments (
+  id bigserial PRIMARY KEY,
+  post_id INT,
+  content TEXT,
+  commenter_id INT,
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT fk_post FOREIGN KEY (post_id) REFERENCES posts(id) ON DELETE CASCADE,
+  CONSTRAINT fk_commenter FOREIGN KEY (commenter_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+--CREATE COMMENT_LIKES TABLE
+CREATE TABLE comment_likes (
+  id bigserial PRIMARY KEY,
+  user_id INT,
+  comment_id INT,
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT fk_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_comment FOREIGN KEY (comment_id) REFERENCES comments(id) ON DELETE CASCADE
+);
+
+--CREATE CHATS TABLE
+CREATE TABLE chats (
+  id bigserial PRIMARY KEY,
+  user_1_id INT,
+  user_2_id INT,
+  CONSTRAINT fk_user_1 FOREIGN KEY (user_1_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_user_2 FOREIGN KEY (user_2_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+--CREATE MESSAGES TABLE
+CREATE TABLE messages (
+  id bigserial PRIMARY KEY,
+  sender_id INT,
+  chat_id INT,
+  message TEXT,
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT fk_sender FOREIGN KEY (sender_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_chat FOREIGN KEY (chat_id) REFERENCES chats(id) ON DELETE CASCADE
+);
+
+--CREATE FRIENDSHIPS TABLE
+CREATE TABLE friendships (
+  id bigserial PRIMARY KEY,
+  sender_id INT,
+  receiver_id INT,
+  status VARCHAR(20) DEFAULT 'pending',
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT fk_sender FOREIGN KEY (sender_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_receiver FOREIGN KEY (receiver_id) REFERENCES users(id) ON DELETE CASCADE
+);
+
+--CREATE NOTIFICATIONS TABLE
+CREATE TABLE notifications (
+  id bigserial PRIMARY KEY,
+  sender_id INT,
+  receiver_id INT,
+  type VARCHAR(50),
+  content VARCHAR(255),
+  is_read BOOLEAN DEFAULT FALSE,
+  post_id INT,
+  comment_id INT,
+  friendship_id INT,
+  chat_id INT,
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  CONSTRAINT fk_sender FOREIGN KEY (sender_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_receiver FOREIGN KEY (receiver_id) REFERENCES users(id) ON DELETE CASCADE,
+  CONSTRAINT fk_post FOREIGN KEY (post_id) REFERENCES posts(id) ON DELETE CASCADE,
+  CONSTRAINT fk_comment FOREIGN KEY (comment_id) REFERENCES comments(id) ON DELETE CASCADE,
+  CONSTRAINT fk_friendship FOREIGN KEY (friendship_id) REFERENCES friendships(id) ON DELETE CASCADE,
+  CONSTRAINT fk_chat FOREIGN KEY (chat_id) REFERENCES chats(id) ON DELETE CASCADE
+);

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

@@ -0,0 +1,4 @@
+--UPDATE EXISTING USERS TABLE
+ALTER TABLE users
+ADD first_name VARCHAR(100),
+ADD last_name VARCHAR(100);

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

@@ -0,0 +1,42 @@
+--UPDATE EXISTING POSTS TABLE
+ALTER TABLE posts
+ALTER COLUMN user_id TYPE BIGINT;
+
+--UPDATE POST_LIKES TABLE
+ALTER TABLE post_likes
+ALTER COLUMN user_id TYPE BIGINT,
+ALTER COLUMN post_id TYPE BIGINT;
+
+--UPDATE COMMENTS TABLE
+ALTER TABLE comments
+ALTER COLUMN post_id TYPE BIGINT,
+ALTER COLUMN commenter_id TYPE BIGINT;
+
+--UPDATE COMMENT_LIKES TABLE
+ALTER TABLE comment_likes
+ALTER COLUMN user_id TYPE BIGINT,
+ALTER COLUMN comment_id TYPE BIGINT;
+
+--UPDATE CHATS TABLE
+ALTER TABLE chats
+ALTER COLUMN user_1_id TYPE BIGINT,
+ALTER COLUMN user_2_id TYPE BIGINT;
+
+--UPDATE MESSAGES TABLE
+ALTER TABLE messages
+ALTER COLUMN sender_id TYPE BIGINT,
+ALTER COLUMN chat_id TYPE BIGINT;
+
+--UPDATE FRIENDSHIPS TABLE
+ALTER TABLE friendships
+ALTER COLUMN sender_id TYPE BIGINT,
+ALTER COLUMN receiver_id TYPE BIGINT;
+
+--UPDATE NOTIFICATIONS TABLE
+ALTER TABLE notifications
+ALTER COLUMN sender_id TYPE BIGINT,
+ALTER COLUMN receiver_id TYPE BIGINT,
+ALTER COLUMN post_id TYPE BIGINT,
+ALTER COLUMN comment_id TYPE BIGINT,
+ALTER COLUMN friendship_id TYPE BIGINT,
+ALTER COLUMN chat_id TYPE BIGINT;

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

@@ -0,0 +1,42 @@
+--UPDATE EXISTING POSTS TABLE
+ALTER TABLE posts
+ALTER COLUMN user_id TYPE BIGINT;
+
+--UPDATE POST_LIKES TABLE
+ALTER TABLE post_likes
+ALTER COLUMN user_id TYPE BIGINT,
+ALTER COLUMN post_id TYPE BIGINT;
+
+--UPDATE COMMENTS TABLE
+ALTER TABLE comments
+ALTER COLUMN post_id TYPE BIGINT,
+ALTER COLUMN commenter_id TYPE BIGINT;
+
+--UPDATE COMMENT_LIKES TABLE
+ALTER TABLE comment_likes
+ALTER COLUMN user_id TYPE BIGINT,
+ALTER COLUMN comment_id TYPE BIGINT;
+
+--UPDATE CHATS TABLE
+ALTER TABLE chats
+ALTER COLUMN user_1_id TYPE BIGINT,
+ALTER COLUMN user_2_id TYPE BIGINT;
+
+--UPDATE MESSAGES TABLE
+ALTER TABLE messages
+ALTER COLUMN sender_id TYPE BIGINT,
+ALTER COLUMN chat_id TYPE BIGINT;
+
+--UPDATE FRIENDSHIPS TABLE
+ALTER TABLE friendships
+ALTER COLUMN sender_id TYPE BIGINT,
+ALTER COLUMN receiver_id TYPE BIGINT;
+
+--UPDATE NOTIFICATIONS TABLE
+ALTER TABLE notifications
+ALTER COLUMN sender_id TYPE BIGINT,
+ALTER COLUMN receiver_id TYPE BIGINT,
+ALTER COLUMN post_id TYPE BIGINT,
+ALTER COLUMN comment_id TYPE BIGINT,
+ALTER COLUMN friendship_id TYPE BIGINT,
+ALTER COLUMN chat_id TYPE BIGINT;