diff --git a/src/main/java/Team5/SmartTowns/Data/Main.java b/src/main/java/Team5/SmartTowns/Data/Main.java index 7271a232d044ec478f971094f332761b39cd2487..8f2a890b66299d6c3662b6bd7e68c6d897792847 100644 --- a/src/main/java/Team5/SmartTowns/Data/Main.java +++ b/src/main/java/Team5/SmartTowns/Data/Main.java @@ -1,10 +1,16 @@ -package Team5.SmartTowns.Data; - -import java.util.List; - -public class Main { - public static void main(String[] args) { - List<Location> approvedNumber= locationRepository.approvedLocations(); - - } -} +//package Team5.SmartTowns.Data; +// +//import org.springframework.beans.factory.annotation.Autowired; +// +//import java.util.List; +// +//public class Main { +// @Autowired +// private locationRepository locationRepository; +// List<Location> approvedNumber= locationRepository.approvedLocations(); +// public static void main(String[] args) { +// for (Location loc: approvedNumber){} +// +// +// } +//} diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepository.java b/src/main/java/Team5/SmartTowns/Data/locationRepository.java index bbd227d20dc42f168023bcfbd1095d4137ff6298..ba8aec4f841b391f1f034065ad3f1235d18c9e1e 100644 --- a/src/main/java/Team5/SmartTowns/Data/locationRepository.java +++ b/src/main/java/Team5/SmartTowns/Data/locationRepository.java @@ -7,6 +7,6 @@ import java.util.List; public interface locationRepository { List<Location> getAllLocation(); void addLocation(Location loc); - List<Location> approvedLocations(); +// List<Location> approvedLocations(); } diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java index 9172965843105e5c24c0cb52dc184ac352961338..8f889cb77956e48bb9b45cd38b02b94d016f7839 100644 --- a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java @@ -42,14 +42,15 @@ public class locationRepositoryJDBC implements locationRepository { @Override public List<Location> approvedLocations(){ - List<Location> locations = getAllLocation(); + String sql= "SELECT * FROM locations"; + List<Location> locations = jdbc.query(sql, locationMapper); List<Location> locationApprovalList= new ArrayList<>(); for (Location loc :locations){ if (loc.isLocationApproved()) { locationApprovalList.add(loc); } } return locationApprovalList; - } + } } diff --git a/src/main/java/Team5/SmartTowns/Data/trail.java b/src/main/java/Team5/SmartTowns/Data/trail.java index 86e78b96712ecf7a5756edbf20a4bae35839ca70..8c0fdf5c9ce51b635a9023fb4dd62d1ab1223dfe 100644 --- a/src/main/java/Team5/SmartTowns/Data/trail.java +++ b/src/main/java/Team5/SmartTowns/Data/trail.java @@ -9,4 +9,5 @@ import lombok.Data; public class trail { private int trailsId; private String name; + private Boolean tru; } diff --git a/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java index 58aa84a95b00b8f8b5d7f97d240e04f405d2ac3b..c325e1599f4d50681616aa782673e284f26a5097 100644 --- a/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java @@ -18,7 +18,8 @@ public class trailsRepositoryJDBC implements trailsRepository{ private void settrailsMapper(){ trailMapper = (rs, i) -> new trail( rs.getInt("trailID"), - rs.getString("name") + rs.getString("name"), + rs.getBoolean("tru") ); } public List<trail> getAllTrails(){ diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 3ee0f305e54ba659e89dcb69bc6cc62bc02caa4e..8a101c70afdec58101acc188db87c1f60e7eba7a 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -3,8 +3,8 @@ insert into users (email, name, dragonProgress) value ('hannah@gmail.com', 'Hann insert into users (userID, email, name, dragonProgress) value ('2', 'nigel@gmail.com', 'Nigel', '40'); delete from trails; -insert into trails ( Name) value ( 'Caerphilly Coffee Trail'); -insert into trails ( Name) value ( 'Penarth Dragon Trail'); +insert into trails ( Name,tru) value ( 'Caerphilly Coffee Trail',false); +insert into trails ( Name,tru) value ( 'Penarth Dragon Trail',true); delete from locations; insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved)value ( 'St Cenydd','','Location description here','Caerphilly',0101, true); diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 264fc1e2b2b758a15447a6e2366ab00750ead704..bc9715064e57769378d8459f10d59b36a19b8a0a 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -2,7 +2,8 @@ drop table if exists trails; create table if not exists trails ( trailID bigint auto_increment primary key, - name varchar(128) + name varchar(128), + tru boolean ) engine=InnoDB; drop table if exists locations; diff --git a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java index 93eb2bfd9f7ca5706688f91e8e8bb230404d1237..fdbecff81122ff5942c024da57b5239b1b87b22f 100644 --- a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java +++ b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java @@ -24,30 +24,30 @@ class SmartTownsApplicationTests { void contextLoads() { } - private static Location location; - @BeforeAll - public static void before() { - location = new Location(); } - @Autowired - private locationRepository locationRepository; - - @Test - public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){ - /// Discover number of approved/unapproved locations before adding tests - List<Location> approvedNumber= locationRepository.approvedLocations(); -// Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here", -// "Caerphilly", 103, false); -// Location loc2= new Location("TestFail", "Test@PleaseFail2.test", "Fail Description here", -// "Caerphilly", 103, false); -// Location loc3= new Location("TestPass", "Test@PleasePass.test", "Pass Description here", -// "Caerphilly", 103, true); -// locationRepository.addLocation(loc1); -// locationRepository.addLocation(loc2); -// locationRepository.addLocation(loc3); -// List<Location> ApprovedNumberAfter=locationRepository.approvedLocations(); -// -// assertEquals(1,( ApprovedNumber.size()-ApprovedNumberAfter.size())); - } +// private static Location location; +// @BeforeAll +// public static void before() { +// location = new Location(); } +// @Autowired +// private locationRepository locationRepository; + +// @Test +// public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){ +// /// Discover number of approved/unapproved locations before adding tests +// List<Location> approvedNumber= locationRepository.approvedLocations(); +//// Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here", +//// "Caerphilly", 103, false); +//// Location loc2= new Location("TestFail", "Test@PleaseFail2.test", "Fail Description here", +//// "Caerphilly", 103, false); +//// Location loc3= new Location("TestPass", "Test@PleasePass.test", "Pass Description here", +//// "Caerphilly", 103, true); +//// locationRepository.addLocation(loc1); +//// locationRepository.addLocation(loc2); +//// locationRepository.addLocation(loc3); +//// List<Location> ApprovedNumberAfter=locationRepository.approvedLocations(); +//// +//// assertEquals(1,( ApprovedNumber.size()-ApprovedNumberAfter.size())); +// } }