Further work on tables, m,oved onto inserting form data into tables

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;
+
+
 }

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);
     }
 }

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");

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),