commiting changes

src/main/java/Team5/SmartTowns/data/LocationRepository.java

@@ -9,11 +9,11 @@ public interface LocationRepository {
     void addLocation(Location loc);
 
 
-    List<Location> getApprovedLocations();
+    List<Location> getAllApprovedLocations();
 
 //    List<Location> getApprovedLocations2(List<Location> list);
 
-    List<Location> getUnapprovedLocations();
+    List<Location> getAllUnapprovedLocations();
 
 
 //     List<Location> approvedLocations();

src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java

@@ -52,8 +52,8 @@ public class LocationRepositoryJDBC implements LocationRepository {
 //        this.locationMapper = locationMapper;
 //    }
 
-
-    public List<Location> getAllApprovedLocation(){
+    @Override
+    public List<Location> getAllApprovedLocations(){
         String sql= "SELECT * FROM locations";
         List<Location> lis = jdbc.query(sql, locationMapper);
         List<Location> lisFiltered = new ArrayList<>();
@@ -65,8 +65,8 @@ public class LocationRepositoryJDBC implements LocationRepository {
         return lisFiltered;
     }
 
-
-    public List<Location> getAllUnapprovedLocation(){
+    @Override
+    public List<Location> getAllUnapprovedLocations(){
         String sql= "SELECT * FROM locations";
         List<Location> lis = jdbc.query(sql, locationMapper);
         List<Location> lisFiltered = new ArrayList<>();
@@ -85,17 +85,17 @@ public class LocationRepositoryJDBC implements LocationRepository {
         jdbc.update(sql,loc.getLocationName(),loc.getLocationEmail(),loc.getLocationDescription(),loc.getLocationPlace(),loc.getLocationTrailID(), false);
     }
 
-    @Override
-    public List<Location> getApprovedLocations(){
-        JdbcTemplate jdbc = new JdbcTemplate();
-        List<Location> locations = new LocationRepositoryJDBC(jdbc).getAllLocation();
-        List<Location> locationApprovalList= new ArrayList<Location>();
-        for (Location loc :locations){
-            if (loc.isLocationApproved()) {
-                locationApprovalList.add(loc);
-            }
-        } return locationApprovalList;
- }
+//    @Override
+//    public List<Location> getApprovedLocations(){
+//        JdbcTemplate jdbc = new JdbcTemplate();
+//        List<Location> locations = new LocationRepositoryJDBC(jdbc).getAllLocation();
+//        List<Location> locationApprovalList= new ArrayList<Location>();
+//        for (Location loc :locations){
+//            if (loc.isLocationApproved()) {
+//                locationApprovalList.add(loc);
+//            }
+//        } return locationApprovalList;
+// }
 //
 //    @Override
 //    public List<Location> getApprovedLocations2(List<Location> list){
@@ -110,16 +110,16 @@ public class LocationRepositoryJDBC implements LocationRepository {
 //
 
 
-    @Override
-    public List<Location> getUnapprovedLocations(){
-        List<Location> locations = getAllLocation();
-        List<Location> locationUnapprovedList= new ArrayList<Location>();
-        for (Location loc :locations){
-            if (!loc.isLocationApproved()) {
-                locationUnapprovedList.add(loc);
-            }
-        } return locationUnapprovedList;
-    }
+//    @Override
+//    public List<Location> getUnapprovedLocations(){
+//        List<Location> locations = getAllLocation();
+//        List<Location> locationUnapprovedList= new ArrayList<Location>();
+//        for (Location loc :locations){
+//            if (!loc.isLocationApproved()) {
+//                locationUnapprovedList.add(loc);
+//            }
+//        } return locationUnapprovedList;
+//    }
 
 
 //    public JdbcTemplate getJdbc() {

src/main/java/Team5/SmartTowns/placeswithcoordinates/LocationsCoordinates.java

@@ -92,11 +92,11 @@ public class LocationsCoordinates {
 //        JdbcTemplate jdbcSuper= new LocationRepositoryJDBC().getJdbc();
 //        return new LocationRepositoryJDBC(jdbcSuper).getApprovedLocations();
 //    }
-
-    public List<Location> getFullUnapprovedLocations(JdbcTemplate aJdbc){
-//        LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);
-        return new LocationRepositoryJDBC(aJdbc).getUnapprovedLocations();
-    }
+//
+//    public List<Location> getFullUnapprovedLocations(JdbcTemplate aJdbc){
+////        LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);
+//        return new LocationRepositoryJDBC(aJdbc).getUnapprovedLocations();
+//    }
 
 
 

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepository.java

@@ -13,7 +13,7 @@ public interface PlacesCoordinatesRepository {
     List<TownWithTrails> getAllTownCoords();
     void addTownWithCoords(TownWithTrails town);
 
-    List<Location> getFullApprovedLocations(JdbcTemplate aJdbc);
+//    List<Location> getFullApprovedLocations(JdbcTemplate aJdbc);
 
 
 

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java

@@ -77,10 +77,10 @@ public class PlacesCoordinatesRepositoryJDBC implements PlacesCoordinatesReposit
     }
 
 
-    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc) {
-//        LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);
-        return new LocationRepositoryJDBC(aJdbc).getApprovedLocations();
-    }
+//    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc) {
+////        LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);
+//        return new LocationRepositoryJDBC(aJdbc).getApprovedLocations();
+//    }
 
 //    @Override //TODO CHECK
 //    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc) {