Aida gutierrez

migration.sql

@@ -2,11 +2,13 @@ USE adlister_db;
 
 DROP TABLE IF EXISTS ads;
 DROP TABLE IF EXISTS users;
+DROP TABLE IF EXISTS categories;
+DROP TABLE IF EXISTS ads_categories;
 
 CREATE TABLE users (
     id INT UNSIGNED NOT NULL AUTO_INCREMENT,
-    username VARCHAR(240) NOT NULL,
-    email VARCHAR(240) NOT NULL,
+    username VARCHAR(240) NOT NULL UNIQUE,
+    email VARCHAR(240) NOT NULL UNIQUE,
     password VARCHAR(255) NOT NULL,
     PRIMARY KEY (id)
 );
@@ -20,3 +22,47 @@ CREATE TABLE ads (
     FOREIGN KEY (user_id) REFERENCES users(id)
         ON DELETE CASCADE
 );
+# table to store category names being created
+CREATE TABLE categories (
+    id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+    category VARCHAR(240) UNIQUE NOT NULL,
+    PRIMARY KEY (id)
+);
+# table for the categories each add can fit into
+CREATE TABLE ads_categories (
+    id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+    ads_id INT UNSIGNED NOT NULL,
+    category_id INT UNSIGNED NOT NULL,
+    PRIMARY KEY (id),
+    FOREIGN KEY (ads_id) REFERENCES ads(id),
+    FOREIGN KEY (category_id) REFERENCES categories(id)
+);
+
+INSERT INTO categories (category) VALUES ('Automotive');
+INSERT INTO categories (category) VALUES ('Clothing');
+INSERT INTO categories (category) VALUES ('Electronics');
+INSERT INTO categories (category) VALUES ('Furniture');
+INSERT INTO categories (category) VALUES ('Home');
+INSERT INTO categories (category) VALUES ('Tools');
+INSERT INTO categories (category) VALUES ('Toys');
+INSERT INTO categories (category) VALUES ('Miscellaneous');
+
+
+
+# DROP DATABASE IF EXISTS adlister_db;
+#
+# CREATE DATABASE IF NOT EXISTS adlister_db;
+
+
+
+SELECT *
+FROM ads
+WHERE id IN (
+    SELECT ads_id
+    FROM ads_categories
+    WHERE category_id IN(
+        SELECT id
+        FROM categories
+        WHERE category LIKE 'Furniture'
+    )
+);

pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.mindrot</groupId>
             <artifactId>jbcrypt</artifactId>
-            <version>0.3m</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>6.0.5</version>
+            <version>8.0.23</version>
         </dependency>
     </dependencies>
 

src/main/java/com/codeup/adlister/controllers/ChangeEmailServlet.java

@@ -0,0 +1,26 @@
+package com.codeup.adlister.controllers;
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.User;
+import com.codeup.adlister.util.Password;
+
+import javax.imageio.IIOException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "ChangeEmailServlet", urlPatterns = "/user/email")
+public class ChangeEmailServlet extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        User editUser = (User) request.getSession().getAttribute("User");
+        String newEmail = request.getParameter("newEmail");
+       // String newPassword = null;
+        //String hashPower = Password.hash(newPassword);
+
+//        DaoFactory.getUsersDao().updateUserEmail(editUser.getId(), newEmail);
+        response.sendRedirect("/profile");
+
+    }
+}

src/main/java/com/codeup/adlister/controllers/ChangePasswordServlet.java

@@ -0,0 +1,25 @@
+package com.codeup.adlister.controllers;
+
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.User;
+import com.codeup.adlister.util.Password;
+
+import javax.imageio.IIOException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "ChangePasswordServlet", urlPatterns = "/user/password")
+public class ChangePasswordServlet extends HttpServlet {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        User editUser = (User) request.getSession().getAttribute("user");
+        String newPassword = request.getParameter("newPassword");
+        String hashPassword = Password.hash(newPassword);
+
+//        DaoFactory.getUsersDao().updateUserPassword(editUser.getId(),hashPassword);
+        response.sendRedirect("/profile");
+    }
+}

src/main/java/com/codeup/adlister/controllers/CreateAdServlet.java

@@ -2,6 +2,7 @@
 
 import com.codeup.adlister.dao.DaoFactory;
 import com.codeup.adlister.models.Ad;
+import com.codeup.adlister.models.Category;
 import com.codeup.adlister.models.User;
 
 import javax.servlet.ServletException;
@@ -10,6 +11,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 @WebServlet(name = "controllers.CreateAdServlet", urlPatterns = "/ads/create")
 public class CreateAdServlet extends HttpServlet {
@@ -18,18 +20,49 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             response.sendRedirect("/login");
             return;
         }
+        List <Category> allCategories = DaoFactory.getCategoriesDao().all();
+        request.getSession().setAttribute("allCategories",allCategories);
+
         request.getRequestDispatcher("/WEB-INF/ads/create.jsp")
-            .forward(request, response);
+                .forward(request, response);
     }
 
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
         User user = (User) request.getSession().getAttribute("user");
-        Ad ad = new Ad(
-            user.getId(),
-            request.getParameter("title"),
-            request.getParameter("description")
-        );
-        DaoFactory.getAdsDao().insert(ad);
-        response.sendRedirect("/ads");
+        String title = request.getParameter("title");
+        String description = request.getParameter("description");
+
+        String [] selectedCategories = request.getParameterValues("categoryCheckbox");
+//        List<Category> categoryObjects = new ArrayList<>();
+//        for (int i = 0; i < selectedCategories.length; i++) {
+//            categoryObjects.add(DaoFactory.getCategoriesDao().getCategoryByCatName(selectedCategories[i]));
+//        }
+
+
+        //if title or description is missing error message will be created
+        if (title.isEmpty() || description.isEmpty()) {
+            String errorMessage = "Missing information.";
+            //errorMessage variable is set to attribute createError
+            request.getSession().setAttribute("createError", errorMessage);
+            //user is redirected to create page
+            response.sendRedirect("/ads/create");
+        } else {
+            //when all conditions are met new ad is created
+            Ad ad = new Ad(
+                    user.getId(),
+                    request.getParameter("title"),
+                    request.getParameter("description")
+
+            );
+            if (selectedCategories == null) {
+                DaoFactory.getAdsDao().insert(ad);
+            }else {
+                DaoFactory.getAdsDao().insertCategories(ad, selectedCategories);
+            }
+//            DaoFactory.getAdsDao().insert(ad);
+//            DaoFactory.getCategoriesDao().insert(categoryObjects);
+            response.sendRedirect("/ads");
+        }
+
     }
 }

src/main/java/com/codeup/adlister/controllers/DeleteAdsServlet.java

@@ -0,0 +1,21 @@
+package com.codeup.adlister.controllers;
+
+import com.codeup.adlister.dao.DaoFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "DeleteAdsServlet", value = "/ads/delete")
+public class DeleteAdsServlet extends HttpServlet {
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, IOException {
+        long id = Long.parseLong(request.getParameter("ad_id"));
+        DaoFactory.getAdsDao().deleteCategories(id);
+        DaoFactory.getAdsDao().delete(id);
+        response.sendRedirect("/profile");
+    }
+}

src/main/java/com/codeup/adlister/controllers/EditProfileServlet.java

@@ -0,0 +1,91 @@
+package com.codeup.adlister.controllers;
+
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.User;
+import com.codeup.adlister.util.Password;
+import com.codeup.adlister.util.Validate;
+
+import javax.imageio.IIOException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet(name = "EditProfileServlet", urlPatterns = "/editProfile")
+public class EditProfileServlet extends HttpServlet {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        //if user is null, will be redirected to login page
+        if (request.getSession().getAttribute("user") == null) {
+            response.sendRedirect("/login");
+            return;
+        }
+        request.getRequestDispatcher("/WEB-INF/editProfile.jsp").forward(request,response);
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String email = request.getParameter("email");
+        String password = request.getParameter("password");
+        String passwordConfirmation = request.getParameter("confirmPassword");
+        //set hash password
+        String hash = Password.hash(password);
+        String errorMessage = "";
+        //created user to access id and username
+        User user = (User) request.getSession().getAttribute("user");
+        System.out.println(user.getId());
+        System.out.println(email);
+        System.out.println(password);
+        System.out.println(passwordConfirmation);
+
+        //boolean if email and password are empty or passwords don't match
+        boolean inputHasErrors = email.isEmpty()
+                || password.isEmpty()
+                || (! password.equals(passwordConfirmation));
+        //if statement with inputHasErrors boolean
+        //if has any error then other if statements will add string to
+        //errorMessage variable
+        if(inputHasErrors){
+            if(email.isEmpty()){
+                errorMessage += "Please enter a valid email";
+            }
+            if(password.isEmpty()){
+                errorMessage += "Please enter a password";
+            }
+            if(! password.equals(passwordConfirmation)){
+                errorMessage += "Passwords do not match";
+            }
+
+            //sets errorMessage to editError
+            request.getSession().setAttribute("editError", errorMessage);
+            response.sendRedirect("/editProfile");
+        }else if(!Validate.emailVal(email) || !Validate.passVal(password)){
+
+            if (!Validate.passVal(password)){
+                errorMessage += "Password must have at least: <br>" +
+                        " one numeric character<br>" +
+                        "one lowercase character<br>" +
+                        "one uppercase character<br>" +
+                        "one special symbol of !@#$%<br>" +
+                        "and 6-15 characters long<br>";
+            }
+            if(!Validate.emailVal(email)){
+                errorMessage +="Enter a valid email<br>";
+            }
+            request.getSession().setAttribute("editError", errorMessage);
+            response.sendRedirect("/editProfile");
+        }else{
+            //create new User object called update adds User object user username and id with email and hash
+            User update = new User(user.getId(), user.getUsername(), email, hash);
+            DaoFactory.getUsersDao().updateUser(update);
+            request.getSession().removeAttribute("user");
+            request.getSession().invalidate();
+            response.sendRedirect("/login");
+
+        }
+
+
+    }
+}

src/main/java/com/codeup/adlister/controllers/IndividualAdServlet.java

@@ -0,0 +1,26 @@
+package com.codeup.adlister.controllers;
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.Ad;
+import com.codeup.adlister.models.User;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.SQLException;
+
+@WebServlet(name = "controllers.IndividualAdServlet", urlPatterns = "/ads/individualAd")
+public class IndividualAdServlet extends HttpServlet {
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        long individualAd = Long.parseLong(request.getParameter("ad"));
+        User user = DaoFactory.getUsersDao().findByAd(individualAd);
+        //Ad ad = DaoFactory.getAdsDao().findById(individualAd);
+        request.setAttribute("ad", DaoFactory.getAdsDao().findById(individualAd));
+        request.setAttribute("userAd", user.getUsername());
+        request.getRequestDispatcher("/WEB-INF/ads/ShowIndvAd.jsp").forward(request, response);
+    }
+}

src/main/java/com/codeup/adlister/controllers/LoginServlet.java

@@ -25,19 +25,37 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         String username = request.getParameter("username");
         String password = request.getParameter("password");
         User user = DaoFactory.getUsersDao().findByUsername(username);
+        String errorMessage = "";
 
+        //if username or password field is empty error message occurs
+        if(username.isEmpty() || password.isEmpty()){
+            errorMessage = "Username and Password are required";
+            request.getSession().setAttribute("loginError", errorMessage);
+            response.sendRedirect("/login");
+            return;
+        }
+
+        //if user doesn't exist message will occur then will redirect to login
         if (user == null) {
+            errorMessage = "You have entered an invalid username or password";
+            request.getSession().setAttribute("loginError", errorMessage);
             response.sendRedirect("/login");
             return;
         }
 
+        //boolean if password can be made into hash
         boolean validAttempt = Password.check(password, user.getPassword());
 
+        //if boolean validattempt true user is redirected to profile
+        //if false error message is created
         if (validAttempt) {
             request.getSession().setAttribute("user", user);
             response.sendRedirect("/profile");
         } else {
+            errorMessage = "You have entered an invalid username or password";
+            request.getSession().setAttribute("loginError", errorMessage);
             response.sendRedirect("/login");
         }
+
     }
 }