Ramaj johnson

pom.xml

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

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

@@ -1,18 +1,31 @@
 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.util.List;
 
 @WebServlet(name = "controllers.AdsIndexServlet", urlPatterns = "/ads")
 public class AdsIndexServlet extends HttpServlet {
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         request.setAttribute("ads", DaoFactory.getAdsDao().all());
         request.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(request, response);
     }
-}
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        String searchQuery = req.getParameter("search");
+        System.out.println(searchQuery);
+
+        req.setAttribute("ads2", DaoFactory.getAdsDao().findByTitle(searchQuery));
+
+        req.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(req, resp);
+//        resp.sendRedirect("/ads");
+    }
+}

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

@@ -22,14 +22,26 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             .forward(request, response);
     }
 
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, IllegalStateException {
         User user = (User) request.getSession().getAttribute("user");
         Ad ad = new Ad(
             user.getId(),
             request.getParameter("title"),
             request.getParameter("description")
         );
+
+        String title = request.getParameter("title");
+        String description = request.getParameter("description");
+
+        boolean inputHasErrors = title.isEmpty() || description.isEmpty();
+
+        if (inputHasErrors) {
+            response.sendRedirect("/ads/create");
+            return;
+        }
         DaoFactory.getAdsDao().insert(ad);
         response.sendRedirect("/ads");
     }
 }
+
+

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

@@ -0,0 +1,26 @@
+package com.codeup.adlister.controllers;
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.Ad;
+
+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(urlPatterns = "/profile/delete")
+public class DeleteServlet extends HttpServlet {
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, SecurityException, ServletException {
+        Long id = Long.parseLong(request.getParameter("id"));
+
+        DaoFactory.getAdsDao().deleteAd(id);
+        response.sendRedirect("/profile");
+
+    }
+
+
+
+}

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

@@ -32,8 +32,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         }
 
         boolean validAttempt = Password.check(password, user.getPassword());
+        boolean validUser = user.getUsername().equals(username);
 
-        if (validAttempt) {
+        if (validAttempt && validUser) {
             request.getSession().setAttribute("user", user);
             response.sendRedirect("/profile");
         } else {

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

@@ -33,9 +33,28 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             return;
         }
 
+
+
         // create and save a new user
         User user = new User(username, email, password);
-        DaoFactory.getUsersDao().insert(user);
-        response.sendRedirect("/login");
+        try {
+
+            User user1 = DaoFactory.getUsersDao().findByUsername(user.getUsername());
+
+//            System.out.println(DaoFactory.getUsersDao().findByUsername());
+//            System.out.println(user1.getUsername());
+
+            if (user1.getUsername().equals(user.getUsername())){
+                response.sendRedirect("/register");
+
+            }
+
+        }
+        catch(NullPointerException e)
+        {
+            DaoFactory.getUsersDao().insert(user);
+            response.sendRedirect("/login");
+        }
+
     }
 }

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

@@ -0,0 +1,26 @@
+package com.codeup.adlister.controllers;
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.Ad;
+
+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 = "controllers.IndividualAdServlet", urlPatterns = "/ads/singles")
+public class SingleAdServlet  extends HttpServlet
+{
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+    {
+        long ad_id = Long.parseLong(req.getParameter("ad_id"));
+        Ad ad = (Ad) DaoFactory.getAdsDao().findByID(ad_id);
+        System.out.println(ad_id);
+        System.out.println(ad);
+        req.setAttribute("singleAd", ad);
+        req.getRequestDispatcher("/WEB-INF/ads/single-ad.jsp").forward(req, resp);
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.codeup.adlister.controllers;
+
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.Ad;
+
+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(urlPatterns = "/profile/update")
+public class UpdateProfileServlet extends HttpServlet
+{
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, SecurityException, ServletException {
+        Long id = Long.parseLong(request.getParameter("id"));
+
+        Ad newAd = DaoFactory.getAdsDao().findByID(id);
+
+        request.setAttribute("adToEdit", newAd);
+
+        request.getRequestDispatcher("/WEB-INF/update.jsp").forward(request, response);
+    }
+
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, SecurityException, ServletException {
+        Long id = Long.valueOf(request.getParameter("id"));
+        String title = request.getParameter("title");
+        String description = request.getParameter("description");
+
+        DaoFactory.getAdsDao().updateAd(id, title, description);
+
+        response.sendRedirect("/profile");
+    }
+}

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

@@ -1,5 +1,10 @@
 package com.codeup.adlister.controllers;
 
+import com.codeup.adlister.dao.DaoFactory;
+import com.codeup.adlister.models.Ad;
+import com.codeup.adlister.models.User;
+import com.codeup.adlister.util.Password;
+
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -14,6 +19,18 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             response.sendRedirect("/login");
             return;
         }
+
+        User user = (User) request.getSession().getAttribute("user");
+
+        long id = user.getId();
+
+        System.out.println(user.getId());
+//
+        request.setAttribute("ads", DaoFactory.getAdsDao().findByUserID(id));
+
         request.getRequestDispatcher("/WEB-INF/profile.jsp").forward(request, response);
+
     }
+
+
 }

src/main/java/com/codeup/adlister/dao/Ads.java

@@ -1,6 +1,7 @@
 package com.codeup.adlister.dao;
 
 import com.codeup.adlister.models.Ad;
+import com.codeup.adlister.models.User;
 
 import java.util.List;
 
@@ -9,4 +10,12 @@ public interface Ads {
     List<Ad> all();
     // insert a new ad and return the new ad's id
     Long insert(Ad ad);
+    List<Ad> findByUserID(long userID);
+    List<Ad> findByTitle(String search);
+
+    Ad findByID(Long user_id);
+//    List<Ad> findByTitle(String search);
+    void updateAd(Long ad_id, String title, String description);
+
+    void deleteAd(long ad_id);
 }