diff --git a/src/main/java/Team5/SmartTowns/Data/location.java b/src/main/java/Team5/SmartTowns/Data/location.java index 61df39a46df09e733fdcaa185adb9e596021bcb6..b882b5bfd1d642a69a9dd477933bcbf38f2755cf 100644 --- a/src/main/java/Team5/SmartTowns/Data/location.java +++ b/src/main/java/Team5/SmartTowns/Data/location.java @@ -11,8 +11,10 @@ import lombok.Data; public class location { private int locationID; private String locationName; - private String locationEmail; - private String locationDescription; - private String locationPlace; - private int locationTrailID; +// private String locationEmail; +// private String locationDescription; +// private String locationPlace; //todo revert this +// private int locationTrailID; + + } diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java index d41141a3dea78a3d80a0e9607be7cd99771b9b65..fd3c92b6b3de68d35a6822210263f14bbca9fa1c 100644 --- a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java @@ -19,15 +19,15 @@ public class locationRepositoryJDBC implements locationRepository { private void setlocationMapper(){ locationMapper = (rs, i) -> new location( rs.getInt("locationID"), - rs.getString("locationName"), - rs.getString("locationEmail"), - rs.getString("locationDescription"), - rs.getString("locationPlace"), - rs.getInt("locationTrailID") + rs.getString("locationName") +// rs.getString("locationEmail"), +// rs.getString("locationDescription"), +// rs.getString("locationPlace"), //todo revert this +// rs.getInt("locationTrailID") ); } public List<location> getAllLocation(){ - String sql= "SELECT * FROM locations"; + String sql= "SELECT locationID,locationName FROM locations"; return jdbc.query(sql, locationMapper); } } diff --git a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java b/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java index 9ffe8bbf6192360192d03190bdca0b6916d2c765..523a807a6323ffc65531baba2351af53efcbcd47 100644 --- a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java +++ b/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java @@ -33,7 +33,7 @@ public class LandmarksController { } else{ System.out.println(landmarks); - // current functionality only prints successful Landmarks, (todo )database integration is necessary here + ModelAndView modelAndView = new ModelAndView("redirect:/home"); diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index e8a1fd0deda4e8a27557f7e935b42d1c6e4c1ed4..3599125bda3f8e258e1aa80b1a0d6f5bcd59abec 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -7,24 +7,24 @@ insert into trails (trailID, Name) value ('1', 'Caerphilly Coffee Trail'); insert into trails (trailID, Name) value ('2', 'Penarth Dragon Trail'); delete from locations; -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('1', 'St Cenydd','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('2', 'The Castle','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('3', 'Medieval Trades','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('4', 'The Queen''s War','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('5', 'The Green Lady','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('6', 'Armoury','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('7', 'Architecture','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('8', '21st Century Landmark','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (1, 'St Cenydd','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (2, 'The Castle','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (3, 'Medieval Trades','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (4, 'The Queen''s War','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (5, 'The Green Lady','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (6, 'Armoury','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (7, 'Architecture','','location description here','Caerphilly',0101); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (8, '21st Century Landmark','','location description here','Caerphilly',0101); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('9', 'JD Wetherspoons-Malcolm Uphill','','location description here','Caerphilly',0102); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('10', 'Caerphilly Cwtch','','location description here','Caerphilly',0102); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('11', 'Caerphilly Conservative Club','','location description here','Caerphilly',0102); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('12', 'The King''s Arms','','location description here','Caerphilly',0102); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (9, 'JD Wetherspoons-Malcolm Uphill','','location description here','Caerphilly',0102); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (10, 'Caerphilly Cwtch','','location description here','Caerphilly',0102); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (11, 'Caerphilly Conservative Club','','location description here','Caerphilly',0102); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (12, 'The King''s Arms','','location description here','Caerphilly',0102); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('13', 'Caerphilly Bus Station','','location description here','Caerphilly',0103); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('14', 'The Medieval Courthouse','','location description here','Caerphilly',0103); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('15', 'Caerphilly Castle','','location description here','Caerphilly',0103); -insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value ('16', 'Ty Vaughan House','','location description here','Caerphilly',0103); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (13, 'Caerphilly Bus Station','','location description here','Caerphilly',0103); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (14, 'The Medieval Courthouse','','location description here','Caerphilly',0103); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (15 ,'Caerphilly Castle','','location description here','Caerphilly',0103); +insert into locations (locationID, locationName , locationEmail,locationDescription,locationPlace, locationTrailID) value (16, 'Ty Vaughan House','','location description here','Caerphilly',0103); # # locationID bigint auto_increment primary key, # locationName varchar(128),