Tobias young

.gitignore

@@ -1,2 +1,3 @@
 target/
 .idea/
+.DS_Store

.travis.yml

@@ -0,0 +1,10 @@
+language: java
+jdk: openjdk13
+services: postgresql
+before_install: psql -c 'CREATE DATABASE acebook_test;' -U postgres
+install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -V
+script: mvn clean test
+after_success: bash <(curl -s https://codecov.io/bash)
+env:
+  global:
+    - CODECOV_TOKEN=b9222ee2-bb39-4262-94d4-52926dd25dba

README.md

@@ -1,5 +1,8 @@
 ### Acebook
 
+[![Build Status](https://travis-ci.org/luke-jones-1/acebook-java-spark-template.svg?branch=master)](https://travis-ci.org/luke-jones-1/acebook-java-spark-template)
+[![codecov](https://codecov.io/gh/luke-jones-1/acebook-java-spark-template/branch/master/graph/badge.svg)](https://codecov.io/gh/luke-jones-1/acebook-java-spark-template)
+
 #### Running the application
 
  - Make sure postgres is running
@@ -31,3 +34,19 @@
  - [Velocity template blog post](https://www.learnhowtoprogram.com/java-old-reference-only/web-applications-in-java/velocity-templates-in-spark)
  - [Velocity template + spark project example](https://github.com/epicodus-lessons/java-hello-friend-with-spark)
  - [Flyway migrations (db schema management) docs](https://flywaydb.org/documentation/migrations) 
+
+#### Posting user stories (Leatherhead)
+- As a user I would like to see the latest posts
+  listed on the acebook
+- As a user I would like to create a new post
+  and have it appear with the latest posts
+- As a user I would like to be able to like a post
+  and see the number of likes next to the post
+- As a user I only want people to be able to
+  like a post once to avoid spam
+- As a user I would like to be able to make
+  and receive comments on posts
+- As a user I would like to see
+  the date of a post
+
+heyfrens

acebook.iml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.flywaydb:flyway-core:6.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.7.2" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.8.v20171121" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: org.sql2o:sql2o:1.5.4" level="project" />
+    <orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4-1201-jdbc41" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.despegar:spark-test:1.1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.despegar:http-java-native-client:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:17.0.0" level="project" />
+  </component>
+</module>

codecov.yml

@@ -0,0 +1,35 @@
+codecov:
+  require_ci_to_pass: yes
+
+ignore:
+  - "src/main/java/*.java"
+  - "src/main/java/VelocityTemplateEngine.java"
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach, diff, flags, files"
+  behavior: default
+  require_changes: false  # if true: only post the comment if coverage changes
+  require_base: no        # [yes :: must have a base report to post]
+  require_head: yes       # [yes :: must have a head report to post]
+  branches: null          # branch names that can post comment
+  after_n_builds: 1 #e.g., 5. The number of uploaded reports codecov will receive before posting a comment on a pull request.
+
+

pom.xml

@@ -12,11 +12,59 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>8</source>
                     <target>8</target>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.3</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains the execution data. -->
+
+                            <dataFile>target/jacoco.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage report. -->
+                            <outputDirectory>target/my-reports</outputDirectory>
+
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <systemPropertyVariables>
+                        <jacoco-agent.destfile>${project.build.directory}/target/jacoco.exec</jacoco-agent.destfile>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M4</version>
+            </plugin>
         </plugins>
     </build>
 
@@ -57,7 +105,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>edge-SNAPSHOT</version>
+            <version>1.18.10</version>
         </dependency>
 
         <dependency>
@@ -71,11 +119,18 @@
             <artifactId>junit-jupiter-api</artifactId>
             <version>5.5.2</version>
         </dependency>
+
         <dependency>
             <groupId>com.despegar</groupId>
             <artifactId>spark-test</artifactId>
             <version>1.1.8</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>17.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 </project>

src/main/java/Main.java

@@ -1,16 +1,17 @@
-import models.Model;
-import models.Sql2oModel;
+import models.*;
 import org.apache.log4j.BasicConfigurator;
 import org.flywaydb.core.Flyway;
 import org.sql2o.Sql2o;
 import org.sql2o.converters.UUIDConverter;
 import org.sql2o.quirks.PostgresQuirks;
 import spark.ModelAndView;
+import spark.Spark;
 
 import java.util.HashMap;
 import java.util.UUID;
 
-import static spark.Spark.get;
+
+import static spark.Spark.*;
 
 public class Main {
 
@@ -28,18 +29,108 @@ public static void main(String[] args) {
         });
 
         Model model = new Sql2oModel(sql2o);
+        UserModel userModel = new Sql2oModel(sql2o);
 
+        Spark.get("/posts", (req, res) -> {
+            HashMap posts = new HashMap();
+            posts.put("posts", model.getAllPosts());
+            posts.put("comments", model.getAllComments());
 
-        get("/", (req, res) -> "Hello World");
+            return new ModelAndView(posts, "templates/posts.vtl");
+        }, new VelocityTemplateEngine());
 
 
-        get("/posts", (req, res) -> {
+        Spark.get("/newpost", (req, res) -> {
+            return new ModelAndView(new HashMap<>(),"templates/newPost.vtl");
+        }, new VelocityTemplateEngine());
 
+        post("/newpost", (request, response) -> {
+            String title;
+            String content;
+            title = request.queryParams("title");
+            content = request.queryParams("content");
+            response.redirect("/posts");
+            UUID id = model.createPost(title, content);
+            return null;
+        });
 
-            HashMap posts = new HashMap();
+        post("/likepost", (request, response) -> {
+            String id;
+            id = request.queryParams("id");
+            model.addLike(id);
+            response.redirect("/posts");
+            return null;
+        });
 
+        //Sign in methods
 
-            return new ModelAndView(posts, "templates/posts.vtl");
+        Spark.get("/", (req, res) -> {
+            HashMap users = new HashMap();
+            return new ModelAndView(users, "templates/sign-in.vtl");
         }, new VelocityTemplateEngine());
-    }
+
+
+        post("/sign-in", (req,res) -> {
+
+            String password = req.queryParams("password");
+            String email = req.queryParams("email");
+
+            if(userModel.verifyUser(email, password)) {
+                res.redirect("/posts");
+            }
+            res.redirect("/");
+            return null;
+        });
+
+
+        //Sign up methods
+
+        Spark.get("/sign-up", (req, res) -> {
+            HashMap users = new HashMap();
+            return new ModelAndView(users, "templates/sign-up.vtl");
+        }, new VelocityTemplateEngine());
+
+        post("/sign-up", (req,res) -> {
+            String first_name = req.queryParams("first_name");
+            String last_name = req.queryParams("last_name");
+            String password = req.queryParams("password");
+            String email = req.queryParams("email");
+
+            if (model.doesEmailExist(email)) {
+                res.redirect("/sign-up");
+            } else {
+                userModel.createUser(first_name, last_name, password, email);
+                res.redirect("/posts");
+            }
+            return null;
+        });
+
+        post("/postcomment", (request, response) -> {
+           String comment = request.queryParams("comment");
+           String post_id = request.queryParams("post_id");
+
+           model.postComment(comment, post_id);
+
+           response.redirect("/posts");
+           return null;
+        });
+
+        post("/deletecomment", (request, response) -> {
+            String comment_id = request.queryParams("comment_id");
+
+            model.deleteComment(comment_id);
+
+            response.redirect("/posts");
+            return null;
+        });
+
+        post("/deletepost", (request, response) -> {
+            String post_id = request.queryParams("post_id");
+
+            model.deletePost(post_id);
+
+            response.redirect("/posts");
+            return null;
+        });
+    };
 }

src/main/java/models/Comment.java

@@ -0,0 +1,22 @@
+package models;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.UUID;
+
+import lombok.Data;
+@Data
+
+public class Comment {
+    UUID post_id;
+    UUID comment_id;
+    String comment;
+
+    public Comment (UUID post_id, UUID comment_id, String comment) {
+        this.post_id = post_id;
+        this.comment_id = comment_id;
+        this.comment = comment;
+    }
+}

src/main/java/models/Model.java

@@ -8,6 +8,14 @@
 public interface Model {
     UUID createPost(String title, String content);
     List getAllPosts();
+    void addLike(String id);
+    String gettingComments(UUID post_id);
+    String gettingPost(String title);
+    void postComment(String comment, String post_id);
+    List getAllComments();
+    void deleteComment(String comment_id);
+    void deletePost(String post_id);
+    boolean doesEmailExist(String email);
 }