diff --git a/src/main/java/Team5/SmartTowns/data/Trail.java b/src/main/java/Team5/SmartTowns/data/Trail.java
index 61ab540fce97c94b709c888e3c261db35c318849..f9056d64b47f0f5104216b6eb15f50f9301d843c 100644
--- a/src/main/java/Team5/SmartTowns/data/Trail.java
+++ b/src/main/java/Team5/SmartTowns/data/Trail.java
@@ -7,7 +7,22 @@ import lombok.Data;
@Data
@AllArgsConstructor
public class Trail {
- private int trailsId;
- private String name;
- private Boolean tru;
+ private String trailsId;
+ private String trailName;
+ private String trailNumber;
+
+
+ public String getTrailsId() {
+ return trailsId;
+ }
+
+ public String getTrailName() {
+ return trailName;
+ }
+
+ public String getTrailNumber() {
+ return trailNumber;
+ }
+
+
}
diff --git a/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
index 0bb20867153d77c2fd47f3e031bf63c7c1fdac7e..f625d22e3757da5e3965d0ad509546bd1d5c8b11 100644
--- a/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
@@ -17,9 +17,9 @@ public class TrailsRepositoryJDBC implements TrailsRepository {
}
private void settrailsMapper(){
trailMapper = (rs, i) -> new Trail(
- rs.getInt("trailID"),
+ rs.getString("trailID"),
rs.getString("name"),
- rs.getBoolean("tru")
+ rs.getString("trailNumber")
);
}
public List<Trail> getAllTrails(){
diff --git a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
index 8d142f83569aa8816ea8d9d1b32c6b795ab96c00..40f5ae3c2d19573c6da10faf2d40b81952ab5e0e 100644
--- a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
+++ b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
@@ -57,7 +57,7 @@ public class PlacesController {
List<Location> locationCoordsWorkaround = new ArrayList<Location>();
int locationID = 999;
int workAroundID=0;// otherwise cases errors e.g. null used. 999 unlikely to be used so safe until then
- for (int i=0;i<locCoords.size();i++){ /// for loop iterating over coordinates table need to match coordinate index with lcoation index manually
+ for (int i=0;i<locCoords.size();i++){ /// for loop iterating over coordinates table need to match coordinate index with location index manually
locationIDIndex.add(locCoords.get(i).getLocationID()-1); // gets location ID and therefore location list index number
locationCoordsWorkaround.add(locations.get(locCoords.get(i).getLocationID()-1));
if ( (locations.get(locCoords.get(i).getLocationID() - 1).getLocationName().replace(' ', '-').trim().equals(location)) ){
@@ -74,4 +74,8 @@ public class PlacesController {
return modelAndView;
}
+
+
+ /// Trail webpage mapping
+
}
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 592b70f73184ea557fe68d2e5c410724e6a3e6c0..54253ec68bfec31882ac4240e1e9d0b617f84d01 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -3,8 +3,11 @@ insert into users (email, name) value ('hannah@gmail.com', 'Hannah');
insert into users (email, name) value ('nigel@gmail.com', 'Nigel');
delete from trails;
-insert into trails ( Name,tru) value ( 'Caerphilly Coffee Trail',false);
-insert into trails ( Name,tru) value ( 'Penarth Dragon Trail',true);
+insert into trails ( trailID, trailName, trailNumber) value ( 0101,'Caerphilly Castle Trail','0101');
+insert into trails ( trailID, trailName, trailNumber) value ( 0102,'Caerphilly Pub Trail','0102');
+insert into trails ( trailID, trailName, trailNumber) value ( 0103,'Caerphilly Heritage Trail','0103');
+insert into trails ( trailID, trailName, trailNumber) value ( 0201,'Risca Heritage Trail','0201');
+insert into trails ( trailID, trailName, trailNumber) value ( 0301,'Penarth Heritage Trail','0301');
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 83a9327f1be3a0cb598bac93df6edfbaede42c39..b1cddde6590d933e0ce6f041a1a15b5e7abc8ee6 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,13 +1,16 @@
+
+drop table if exists locationCoordinates;
+drop table if exists locations;
drop table if exists trails;
+
create table if not exists trails
(
- trailID bigint auto_increment primary key,
- name varchar(128),
- tru boolean
+ trailID varchar(128) primary key,
+ trailName varchar(128),
+ trailNumber varchar(128)
) engine=InnoDB;
-drop table if exists locationCoordinates;
-drop table if exists locations;
+
create table if not exists locations
(
locationID bigint auto_increment primary key,
@@ -16,6 +19,9 @@ create table if not exists locations
locationDescription longtext,
locationPlace varchar(255),
locationTrailID varchar(128),
+ Foreign Key (locationTrailID) REFERENCES trails(trailID)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT,
locationApproved boolean
) engine=InnoDB;