completed except for repo interface

src/main/java/io/zipcoder/persistenceapp/Home.java

@@ -0,0 +1,59 @@
+package io.zipcoder.persistenceapp;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Home {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+    private String address;
+    private String homeNumber;
+
+    public Home() {
+        this.address = "address";
+        this.homeNumber = "home number";
+    }
+
+    public Home(String address, String homeNumber) {
+        this.address = address;
+        this.homeNumber = homeNumber;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getHomeNumber() {
+        return homeNumber;
+    }
+
+    public void setHomeNumber(String homeNumber) {
+        this.homeNumber = homeNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "Home{" +
+                "id=" + id +
+                ", address='" + address + '\'' +
+                ", homeNumber='" + homeNumber + '\'' +
+                '}';
+    }
+}

src/main/java/io/zipcoder/persistenceapp/HomeAndPersonService.java

@@ -0,0 +1,102 @@
+package io.zipcoder.persistenceapp;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class HomeAndPersonService {
+
+    /**
+     // Find a home by person id
+     // Generate a list of people that live in a home
+     // List all of the homes that have more that one person that live there. Group people by the home that they live in
+     // List all of the people that live a the address 11 Essex Dr.Farmingdale, NY 11735
+     // Create a query to update a person's home
+     // Create a query to update a person's 'HOMENUMBER"
+     * Find the home number of John Smith
+     */
+
+    @Autowired
+    PersonServiceClass personService;
+
+    @Autowired
+    HomeService homeService;
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    public Home getHomeByPersonId(int personId){
+        Person person = personService.findById(personId);
+        Home home = homeService.findHomeById(person.getHomeId());
+        return home;
+    }
+
+    public List<Person> findPersonListByHomeId(int homeId){
+        List<Person> people = personService.getAllPeople();
+        List<Person> peopleWithHomeId = new ArrayList<>();
+        for(Person person : people){
+            if(person.getHomeId() == homeId){
+                peopleWithHomeId.add(person);
+            }
+        }
+        return peopleWithHomeId;
+    }
+
+    public List<Home> groupPeopleByHomeId(){
+        List<Map<String, Object>> list = jdbcTemplate.queryForList("select count(home_id) as count, address, homenumber from person join home on person.home_id = home.id group by address having count (home_id) > 1");
+        List<Home> homes = new ArrayList<>();
+        for (Map<String, Object> row : list) {
+            Home home = new Home(String.valueOf(row.get("ADDRESS")), String.valueOf(row.get("HOMENUMBER")));
+            home.setId((Integer)row.get("ID"));
+            homes.add(home);
+        }
+        return homes;
+    }
+
+    public List<Person> findHomesAtAddress() {
+        List<Home> homes = homeService.getAllHomes();
+        List<Person> peopleAtHome = new ArrayList<>();
+        for (Home home : homes) {
+            if (home.getAddress().equals("11 Essex Dr.Farmingdale, NY 11735")) {
+                Person person = personService.findByHomeId(home.getId());
+                if (person != null) {
+                    peopleAtHome.add(person);
+                }
+            }
+        }
+        return peopleAtHome;
+    }
+
+    public int updatePersonsHome(Person p, Home h){
+        Person person = personService.findById(p.getId());
+        if(person != null){
+            return homeService.updateHome(h);
+        }
+        return -1;
+    }
+
+    public int updatePersonHomeNumber(Person p, int homeNumber) {
+        Person person = personService.findById(p.getId());
+        if (person != null) {
+            person.setHomeId(homeNumber);
+            return personService.updatePerson(person);
+        }
+        return -1;
+    }
+
+    public String findHomeNumberOfJohnSmith(){
+        List<Person> people = personService.getAllPeople();
+        for(Person person : people){
+            if(person.getFirstName().equals("John") && person.getLastName().equals("Smith")){
+                Home home = homeService.findHomeById(person.getId());
+                return home.getHomeNumber();
+            }
+        }
+        return null;
+    }
+}

src/main/java/io/zipcoder/persistenceapp/HomeController.java

@@ -0,0 +1,51 @@
+package io.zipcoder.persistenceapp;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+public class HomeController {
+
+    @Autowired
+    HomeService serv;
+
+    @PostMapping("/home")
+    public Home createHome(Home h){
+        int id = serv.saveHome(h);
+        h.setId(id);
+        return h;
+    }
+
+    @PutMapping("/home/{id}")
+    public Home updateHome(@PathVariable int id, @RequestBody Home updatedHome){
+        Home p = serv.findHomeById(id);
+        updatedHome.setId(p.getId());
+        if(p != null) {
+            serv.updateHome(updatedHome);
+        } else {
+            new ResponseEntity(HttpStatus.NOT_FOUND);
+        }
+        return updatedHome;
+    }
+
+    @GetMapping("/home")
+    public List<Home> getAllPeople(){
+        return serv.getAllHomes();
+    }
+
+
+    @GetMapping("/home/{id}")
+    public Home getPersonById(@PathVariable int id){
+        return serv.findHomeById(id);
+    }
+
+    @DeleteMapping("/home/{id}")
+    public Person deletePersonById(@PathVariable int id){
+        Home home = serv.findHomeById(id);
+        serv.deleteHome(home);
+        return null;
+    }
+}

src/main/java/io/zipcoder/persistenceapp/HomeService.java

@@ -0,0 +1,113 @@
+package io.zipcoder.persistenceapp;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class HomeService {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    /**
+    // Add a "Home" to the database
+    // Add a person to a home
+    // Update an existing 'Home' in the database
+    // Remove a home from the database
+    // Remove a list of homes from the database
+    // Find a home by id
+    // Find a home by home number
+    //Find a home by address
+
+    * Find a home by person id
+    * Generate a list of people that live in a home
+    */
+
+    public List<Home> getAllHomes(){
+            List<Map<String, Object>> list = jdbcTemplate.queryForList("SELECT * FROM HOME");
+            List<Home> homes = new ArrayList<>();
+            for (Map<String, Object> row : list) {
+                Home home = new Home(String.valueOf(row.get("ADDRESS")), String.valueOf(row.get("HOMENUMBER")));
+                home.setId((Integer)row.get("ID"));
+                homes.add(home);
+            }
+            return homes;
+    }
+
+    public int saveHome(Home h){
+        KeyHolder holder = new GeneratedKeyHolder();
+        SqlParameterSource parameters = new MapSqlParameterSource()
+                .addValue("address", h.getAddress())
+                .addValue("homenumber", h.getHomeNumber());
+
+        namedParameterJdbcTemplate.update("INSERT INTO HOME (ADDRESS, HOMENUMBER) VALUES (:address, :homenumber);", parameters, holder);
+        return holder.getKey().intValue();
+    }
+
+    public void addPersonToHome(Person p, int homeID){
+        Home home = findHomeById(homeID);
+        if(home != null){
+            p.setHomeId(homeID);
+        }
+    }
+
+    public Home findHomeById(int homeID){
+        List<Home> allHomes = getAllHomes();
+        for(Home home : allHomes){
+            if(home.getId().equals(homeID)){
+                return home;
+            }
+        }
+        return null;
+    }
+
+    public int updateHome(Home h){
+        return jdbcTemplate.update("UPDATE PERSON SET ADDRESS = '" +
+                h.getAddress() + "', HOMENUMBER = '" +
+                h.getHomeNumber() + "' where id = " + h.getId() + ";");
+    }
+
+    public int deleteHome(Home h){
+        return jdbcTemplate.update("DELETE FROM PERSON where ID = " + h.getId() + ";");
+    }
+
+    public void deleteAllHome(List<Home> homes){
+        for(Home home : homes){
+            deleteHome(home);
+        }
+    }
+
+    public Home findByHomeNumber(Integer homeNumber){
+        List<Home> homes = getAllHomes();
+        for(Home home : homes){
+            if(home.getHomeNumber().equals(homeNumber)){
+                return home;
+            }
+        }
+        return null;
+    }
+
+    public Home findByAddress(String address){
+        List<Home> homes = getAllHomes();
+        for(Home home : homes){
+            if(home.getAddress().equals(address)){
+                return home;
+            }
+        }
+        return null;
+    }
+}
+

src/main/java/io/zipcoder/persistenceapp/JdbcPersonServiceImpl.java

@@ -0,0 +1,7 @@
+package io.zipcoder.persistenceapp;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class JdbcPersonServiceImpl {
+}

src/main/java/io/zipcoder/persistenceapp/PersonController.java

@@ -13,7 +13,7 @@ import java.util.Map;
 public class PersonController {
 
     @Autowired
-    PersonService serv;
+    PersonServiceClass serv;
 
     @PostMapping("/people")
     public Person createPerson(@RequestBody Person person){
@@ -23,14 +23,11 @@ public class PersonController {
     }
 
     @PutMapping("/people/{id}")
-    //@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "Person not found.")
     public Person updatePerson(@PathVariable int id, @RequestBody Person updatedPerson){
         Person p = serv.findById(id);
-        System.out.println(p + " line 29");
         updatedPerson.setId(p.getId());
         if(p != null) {
             serv.updatePerson(updatedPerson);
-            System.out.println("Updated");
         } else {
             new ResponseEntity(HttpStatus.NOT_FOUND);
         }
@@ -54,7 +51,6 @@ public class PersonController {
         return null;
     }
 
-
     @GetMapping("/people/reverselookup/{mobileNumber}")
     public List<Person> getPeopleByNumber(@PathVariable String mobileNumber){
         List<Person> people = serv.getAllPeople();
@@ -93,7 +89,6 @@ public class PersonController {
 
     @GetMapping("/people/firstname/stats")
     public String getFirstNameCount(){
-        //Get the report of first name frequencies
         String report = "";
         Map<String, Integer> map = serv.firstNameCount();
         for(String name : map.keySet()){
@@ -101,7 +96,4 @@ public class PersonController {
         }
         return report;
     }
-
-
-
 }

src/main/java/io/zipcoder/persistenceapp/PersonRepository.java

@@ -0,0 +1,6 @@
+package io.zipcoder.persistenceapp;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface PersonRepository extends JpaRepository<Person, Integer> {
+}

src/main/java/io/zipcoder/persistenceapp/PersonService.java

@@ -1,113 +1,4 @@
 package io.zipcoder.persistenceapp;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class PersonService {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
-
-
-    public List<Person> getAllPeople(){
-        List<Map<String, Object>> list = jdbcTemplate.queryForList("SELECT * FROM PERSON");
-        List<Person> people = new ArrayList<>();
-        for (Map<String, Object> row : list) {
-            Person person = new Person(String.valueOf(row.get("FIRST_NAME")), String.valueOf(row.get("LAST_NAME")), String.valueOf(row.get("MOBILE")), row.get("BIRTHDAY").toString(), (Short)row.get("HOME_ID"));
-            person.setId((Integer)row.get("ID"));
-            people.add(person);
-        }
-        return people;
-    }
-
-    public int savePerson(Person e){
-        System.out.println(e.toString());
-        KeyHolder holder = new GeneratedKeyHolder();
-        SqlParameterSource parameters = new MapSqlParameterSource()
-                .addValue("first_name", e.getFirstName())
-                .addValue("last_name", e.getLastName())
-                .addValue("mobile", e.getMobile())
-                .addValue("birthday", e.getBirthday())
-                .addValue("home_id", e.getHomeId());
-
-        namedParameterJdbcTemplate.update("INSERT INTO PERSON (FIRST_NAME, LAST_NAME, MOBILE, BIRTHDAY, HOME_ID) VALUES (:first_name, :last_name, :mobile, :birthday, :home_id);", parameters, holder);
-        return holder.getKey().intValue();
-    }
-
-    public int updatePerson(Person e){
-        return jdbcTemplate.update("UPDATE PERSON SET FIRST_NAME = '" +
-                e.getFirstName() + "', LAST_NAME = '" +
-                e.getLastName() + "', MOBILE = '" +
-                e.getMobile() + "', BIRTHDAY = '" +
-                e.getBirthday() + "', HOME_ID = " +
-                e.getHomeId() + " where id = " + e.getId() + ";");
-    }
-
-    public int deletePerson(Person e){
-        return jdbcTemplate.update("DELETE FROM PERSON where ID = " + e.getId() + ";");
-    }
-
-    public void removeList(Person... e){
-        for(Person person : e){
-            deletePerson(person);
-        }
-    }
-
-    public List<Person> findAllByFirstName(String firstName, Class objectType){
-        return jdbcTemplate.queryForList("SELECT * FROM PERSON WHERE FIRST_NAME = '" + firstName + "';", Person.class);
-    }
-
-    public Person findById(int ID){
-        List<Person> people = getAllPeople();
-        for(Person person : people){
-            if(person.getId() == ID){
-                return person;
-            }
-        }
-        return null;
-    }
-
-    public Map<String, List<Person>> surnameQuery(){
-        List<Person> people = getAllPeople();
-        Map<String, List<Person>> map = new HashMap<>();
-        for(Person person : people){
-            if(map.containsKey(person.getLastName())){
-                map.get(person.getLastName()).add(person);
-            } else {
-                map.put(person.getLastName(), new ArrayList<Person>());
-                map.get(person.getLastName()).add(person);
-            }
-        }
-        return map;
-    }
-
-    public Map<String, Integer> firstNameCount(){
-        List<Person> people = getAllPeople();
-        Map<String, Integer> map = new HashMap<>();
-        for(Person person : people){
-            if(map.containsKey(person.getFirstName())){
-                int amount = map.get(person.getFirstName());
-                amount = amount + 1;
-                map.put(person.getFirstName(), amount);
-            } else {
-                map.put(person.getFirstName(), 1);
-            }
-        }
-        return map;
-    }
+public interface PersonService {
 }

src/main/java/io/zipcoder/persistenceapp/PersonServiceClass.java

@@ -0,0 +1,123 @@
+package io.zipcoder.persistenceapp;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class PersonServiceClass {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+
+    public List<Person> getAllPeople(){
+        List<Map<String, Object>> list = jdbcTemplate.queryForList("SELECT * FROM PERSON");
+        List<Person> people = new ArrayList<>();
+        for (Map<String, Object> row : list) {
+            Person person = new Person(String.valueOf(row.get("FIRST_NAME")), String.valueOf(row.get("LAST_NAME")), String.valueOf(row.get("MOBILE")), row.get("BIRTHDAY").toString(), (Short)row.get("HOME_ID"));
+            person.setId((Integer)row.get("ID"));
+            people.add(person);
+        }
+        return people;
+    }
+
+    public int savePerson(Person e){
+        System.out.println(e.toString());
+        KeyHolder holder = new GeneratedKeyHolder();
+        SqlParameterSource parameters = new MapSqlParameterSource()
+                .addValue("first_name", e.getFirstName())
+                .addValue("last_name", e.getLastName())
+                .addValue("mobile", e.getMobile())
+                .addValue("birthday", e.getBirthday())
+                .addValue("home_id", e.getHomeId());
+
+        namedParameterJdbcTemplate.update("INSERT INTO PERSON (FIRST_NAME, LAST_NAME, MOBILE, BIRTHDAY, HOME_ID) VALUES (:first_name, :last_name, :mobile, :birthday, :home_id);", parameters, holder);
+        return holder.getKey().intValue();
+    }
+
+    public int updatePerson(Person e){
+        return jdbcTemplate.update("UPDATE PERSON SET FIRST_NAME = '" +
+                e.getFirstName() + "', LAST_NAME = '" +
+                e.getLastName() + "', MOBILE = '" +
+                e.getMobile() + "', BIRTHDAY = '" +
+                e.getBirthday() + "', HOME_ID = " +
+                e.getHomeId() + " where id = " + e.getId() + ";");
+    }
+
+    public int deletePerson(Person e){
+        return jdbcTemplate.update("DELETE FROM PERSON where ID = " + e.getId() + ";");
+    }
+
+    public void removeList(Person... e){
+        for(Person person : e){
+            deletePerson(person);
+        }
+    }
+
+    public List<Person> findAllByFirstName(String firstName, Class objectType){
+        return jdbcTemplate.queryForList("SELECT * FROM PERSON WHERE FIRST_NAME = '" + firstName + "';", Person.class);
+    }
+
+    public Person findById(int ID){
+        List<Person> people = getAllPeople();
+        for(Person person : people){
+            if(person.getId() == ID){
+                return person;
+            }
+        }
+        return null;
+    }
+
+    public Person findByHomeId(int ID){
+        List<Person> people = getAllPeople();
+        for(Person person : people){
+            if(person.getHomeId() == ID){
+                return person;
+            }
+        }
+        return null;
+    }
+
+    public Map<String, List<Person>> surnameQuery(){
+        List<Person> people = getAllPeople();
+        Map<String, List<Person>> map = new HashMap<>();
+        for(Person person : people){
+            if(map.containsKey(person.getLastName())){
+                map.get(person.getLastName()).add(person);
+            } else {
+                map.put(person.getLastName(), new ArrayList<Person>());
+                map.get(person.getLastName()).add(person);
+            }
+        }
+        return map;
+    }
+
+    public Map<String, Integer> firstNameCount(){
+        List<Person> people = getAllPeople();
+        Map<String, Integer> map = new HashMap<>();
+        for(Person person : people){
+            if(map.containsKey(person.getFirstName())){
+                int amount = map.get(person.getFirstName());
+                amount = amount + 1;
+                map.put(person.getFirstName(), amount);
+            } else {
+                map.put(person.getFirstName(), 1);
+            }
+        }
+        return map;
+    }
+}