Diaz navbar search #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

nicholasdiazjr509 wants to merge 122 commits into gocodeup:master from RegulusBlue:diaz-navbar-search

.DS_Store

Binary file not shown.

migration.sql

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,22 +1,56 @@
  
    USE adlister_db;

    DROP TABLE IF EXISTS ads;

    DROP TABLE IF EXISTS users;

    CREATE TABLE users (

        id INT UNSIGNED NOT NULL AUTO_INCREMENT,

        username VARCHAR(240) NOT NULL,

        email VARCHAR(240) NOT NULL,

    CREATE TABLE users

    (

        id       INT UNSIGNED NOT NULL AUTO_INCREMENT,

        username VARCHAR(240) NOT NULL UNIQUE,

        email    VARCHAR(240) NOT NULL UNIQUE,

        password VARCHAR(255) NOT NULL,

        PRIMARY KEY (id)

        PRIMARY KEY (id) # added these ND

        # maybe only dateCreated could be added

        # UNIQUE is identified in username/email above

        # will comment out until okayed by team

        # dateCreated VARCHAR (50) NOT NULL

        # UNIQUE (username),

        # UNIQUE (email)

    );

    CREATE TABLE ads (

        id INT UNSIGNED NOT NULL AUTO_INCREMENT,

        user_id INT UNSIGNED NOT NULL,

        title VARCHAR(240) NOT NULL,

        description TEXT NOT NULL,

    DROP TABLE IF EXISTS ads;

    CREATE TABLE ads

    (

        id          INT UNSIGNED NOT NULL AUTO_INCREMENT,

        user_id     INT UNSIGNED NOT NULL,

        title       VARCHAR(240) NOT NULL,

        description VARCHAR(400) NOT NULL,

        PRIMARY KEY (id),

        FOREIGN KEY (user_id) REFERENCES users(id)

        FOREIGN KEY (user_id) REFERENCES users (id)

            ON DELETE CASCADE

    -- # added these ND

        # commenting out the below,

        # don't believe is needed

        # will discuss with team

        # dateCreated VARCHAR (50) NOT NULL,

        #           categoryName VARCHAR(255) NOT NULL,

        # UNIQUE (user_id, title, description)

    );

    DROP TABLE IF EXISTS categories;

    CREATE TABLE categories

    (

        id           INT UNSIGNED NOT NULL AUTO_INCREMENT,

        categoryName VARCHAR(240) NOT NULL,

        PRIMARY KEY (id)

    );

    DROP TABLE IF EXISTS ad_category;

    CREATE TABLE ad_category

    (

        category_id INT UNSIGNED NOT NULL,

        ad_id       INT UNSIGNED NOT NULL,

        FOREIGN KEY (ad_id) REFERENCES ads (id)

            ON DELETE CASCADE,

        FOREIGN KEY (category_id) REFERENCES categories (id)

    );

pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -27,22 +27,23 @@
  
            <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>

                <artifactId>jstl</artifactId>

                <version>1.2</version>

            </dependency>

            <dependency>

                <groupId>mysql</groupId>

                <artifactId>mysql-connector-java</artifactId>

                <version>6.0.5</version>

                <version>8.0.23</version>

            </dependency>

        </dependencies>

seeder.sql

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    USE adlister_db;
+    -- # TRUNCATE categories;
+    INSERT INTO categories (categoryName)
+    VALUES ('For Sale'),
+           ('Auto'),
+           ('Housing'),
+           ('Jobs'),
+           ('Community');
+    SELECT * FROM categories;

src/.DS_Store

Binary file not shown.

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,21 @@ @@
     public class AdsIndexServlet extends HttpServlet {
         protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
             request.setAttribute("ads", DaoFactory.getAdsDao().all());
+    //        if (request.getSession().getAttribute("vp") != null) {
+    //            request.getSession().removeAttribute("vp");
+    //        }
+    //        request.getSession().setAttribute("vi", "hi");
             request.getRequestDispatcher("/WEB-INF/ads/index.jsp").forward(request, response);
+        }
+        @Override
+        protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         }
     }
+    //  urlPattern does not work; get a 500 error code stating
+    //  Error retrieving all ads
+    //  Root Cause: Unknown database 'ads'

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

-Original file line number
+Diff line change
@@ Expand Up @@
                 request.getParameter("description")
             );
             DaoFactory.getAdsDao().insert(ad);
+            //  consider changing redirect to /profile until adIndex is setup
             response.sendRedirect("/ads");
         }
     }

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

-Original file line number
+Diff line change
@@ -0,0 +1,42 @@
+    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;
+    @WebServlet("/ads/delete")
+    public class DeleteAdServlet extends HttpServlet {
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+    //        String idQuery = req.getParameter("id");
+    //        Ad ad = DaoFactory.getAdsDao().findByStringId(idQuery);
+    //        User user = (User) req.getSession().getAttribute("user");
+    //        if (ad.getUserId() != user.getId()) {
+    //            resp.sendRedirect("/profile");
+    //        } else {
+    //            req.getSession().setAttribute("ad", ad);
+    //        }
+            req.getRequestDispatcher("/WEB-INF/ads/delete.jsp").forward(req, resp);
+        }
+        @Override
+        protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+            Long id = Long.parseLong(req.getParameter("ad_id"));
+            Ad ad = DaoFactory.getAdsDao().findById(id);
+            DaoFactory.getAdsDao().delete(ad);
+            if (req.getSession().getAttribute("vp") == null){
+                resp.sendRedirect("/ads");
+            } else {
+                resp.sendRedirect("/profile");
+            }
+        }
+    }

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

-Original file line number
+Diff line change
@@ -0,0 +1,36 @@
+    package com.codeup.adlister.controllers;
+    import com.codeup.adlister.dao.DaoFactory;
+    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;
+    @WebServlet("/profile/delete")
+    public class DeleteProfileServlet extends HttpServlet {
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+            if (req.getSession().getAttribute("user") == null) {
+                resp.sendRedirect("/login");
+                return;
+            }
+            req.getRequestDispatcher("/WEB-INF/profile/delete.jsp").forward(req,resp);
+        }
+        @Override
+        protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+            User user = (User) req.getSession().getAttribute("user");
+            DaoFactory.getUsersDao().delete(user.getUsername());
+            req.getSession().removeAttribute("user");
+            req.getSession().invalidate();
+            resp.sendRedirect("/login");
+        }
+    }

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,14 +1,14 @@
  
    package com.codeup.adlister.controllers;

    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.HelloWorldServlet", urlPatterns = "/")

    public class HelloWorldServlet extends HttpServlet {

        protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {

            response.getWriter().println("<h1>Hello, World!</h1>");

        }

    }

    //package com.codeup.adlister.controllers;

    //

    //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.HelloWorldServlet", urlPatterns = "/")

    //public class HelloWorldServlet extends HttpServlet {

    //    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {

    //        response.getWriter().println("<h1>Hello, World!</h1>");

    //    }

    //}

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

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    package com.codeup.adlister.controllers;
+    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("/pickad")
+    public class PickAdServlet extends HttpServlet {
+        protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+            req.getRequestDispatcher("/WEB-INF/profile/profile.jsp").forward(req, res);
+        }
+        protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+            String selectAd = req.getParameter("id");
+            req.setAttribute("ad", selectAd);
+            res.sendRedirect("/ad?id=" + selectAd);
+        }
+    }

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,10 +9,13 @@
  
    import javax.servlet.http.HttpServletRequest;

    import javax.servlet.http.HttpServletResponse;

    import java.io.IOException;

    import java.sql.SQLException;

    @WebServlet(name = "controllers.RegisterServlet", urlPatterns = "/register")

    @WebServlet(name = "RegisterServlet", urlPatterns = "/register")

    public class RegisterServlet extends HttpServlet {

        protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

            String errorMessage = request.getParameter("errorMessage");

            request.setAttribute("errorMessage", errorMessage);

            request.getRequestDispatcher("/WEB-INF/register.jsp").forward(request, response);

        }

    @@ -24,9 +27,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
  
            // validate input

            boolean inputHasErrors = username.isEmpty()

                || email.isEmpty()

                || password.isEmpty()

                || (! password.equals(passwordConfirmation));

                    || email.isEmpty()

                    || password.isEmpty()

                    || (!password.equals(passwordConfirmation));

            if (inputHasErrors) {

                response.sendRedirect("/register");

    @@ -35,7 +38,42 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
  
            // create and save a new user

            User user = new User(username, email, password);

            DaoFactory.getUsersDao().insert(user);

            response.sendRedirect("/login");

            try {

                boolean usernameAndEmailNotValid = DaoFactory.getUsersDao().validateUsername(username) &&

                        DaoFactory.getUsersDao().validateEmail(email);

                boolean usernameNotValid = DaoFactory.getUsersDao().validateUsername(username);

                boolean userEmailNotValid = DaoFactory.getUsersDao().validateEmail(email);

                if (usernameAndEmailNotValid) {

                    request.setAttribute("bothTaken", true);

                    request.getRequestDispatcher("/WEB-INF/register.jsp").forward(request, response);

                } else if (usernameNotValid) {

                    request.setAttribute("usernameTaken", true);

                    request.getRequestDispatcher("/WEB-INF/register.jsp").forward(request, response);

                } else if (userEmailNotValid) {

                    request.setAttribute("emailTRaken", true);

                    request.getRequestDispatcher("/WEB-INF/register.jsp").forward(request, response);

                }

            } catch (SQLException e) {

                e.printStackTrace();

            } catch (ServletException e) {

                e.printStackTrace();

            }

            try {

                user = new User(username, email, password);

                request.getSession().setAttribute("user", user);

                DaoFactory.getUsersDao().insert(user);

                response.sendRedirect("/profile");

    //        } catch (SQLException e) {

    //            e.printStackTrace();

            } catch (IOException e) {

                e.printStackTrace();

            }

    //        request.getSession().setAttribute("username", null);

    //        request.getSession().setAttribute("email", null);

    //        DaoFactory.getUsersDao().insert(user);

    //        response.sendRedirect("/login");

        }

    }

    }

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

-Original file line number
+Diff line change
@@ -0,0 +1,48 @@
+    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;
+    import java.sql.SQLException;
+    import java.util.List;
+    @WebServlet(name="controllers.SearchAdsServlet", urlPatterns="/searchAds")
+    public class SearchAdsServlet extends HttpServlet {
+    //    public void doGet(HttpServletRequest request, HttpServletResponse response)
+    //            throws IOException{
+    //
+    //    }
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+        String keyword = request.getParameter("keyword");
+        if(keyword.isEmpty()) {
+            response.sendRedirect("/ads");
+            return;
+        }
+                try{
+        List<Ad> keywordAds = DaoFactory.getAdsDao().findAdByKeyword(keyword);
+        request.setAttribute("ads", keywordAds);
+        request.getRequestDispatcher("/WEB-INF/ads/keywordAds.jsp").forward(request, response);
+                if (keywordAds.size() == 0) {
+                    request.setAttribute("zeroResults", true);
+                } else {
+                    request.setAttribute("zeroResults", false);
+                }
+                request.setAttribute("keyword", keyword.toLowerCase());
+                request.setAttribute("ads", keywordAds);
+                request.getRequestDispatcher("/WEB-INF/ads/showAd.jsp").forward(request, response);
+                for (Ad ad : keywordAds) {
+                    System.out.println(ad.getTitle());
+                }
+            }catch(SQLException e){
+                e.printStackTrace();
+            }
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Diaz navbar search #49

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Diaz navbar search #49

Are you sure you want to change the base?

Uh oh!

Diaz navbar search #49

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!