diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepository.java b/src/main/java/Team5/SmartTowns/Data/UserRepository.java index 419ab099ad577ca7f2e274e8b1587222ab7b2fbf..172591d6500927a341d6534dca6c34728965db06 100644 --- a/src/main/java/Team5/SmartTowns/Data/UserRepository.java +++ b/src/main/java/Team5/SmartTowns/Data/UserRepository.java @@ -1,3 +1,4 @@ +//Holds users data repository package Team5.SmartTowns.Data; import java.util.List; diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java index a1cce5fa84b0d18c4f1b6c3a2cc9c481bd644e56..63e0bad0a8a3abf5f09c435a749066f51f7100fc 100644 --- a/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/UserRepositoryJDBC.java @@ -1,3 +1,4 @@ +//Implements the users repository using JDBC package Team5.SmartTowns.Data; import org.springframework.jdbc.core.JdbcTemplate; @@ -20,7 +21,7 @@ public class UserRepositoryJDBC implements UserRepository{ private void setuserMapper(){ userMapper = (rs, i) -> new user( - rs.getInt("userId"), + rs.getInt("userID"), rs.getString("name") ); } diff --git a/src/main/java/Team5/SmartTowns/Data/location.java b/src/main/java/Team5/SmartTowns/Data/location.java index 827dabdb39c93f15e04b97e939509465a3cab458..f74adb71039eb1a254e379e56a16ca16d7e3cf32 100644 --- a/src/main/java/Team5/SmartTowns/Data/location.java +++ b/src/main/java/Team5/SmartTowns/Data/location.java @@ -1,3 +1,4 @@ +//Holds variable data for the locations table package Team5.SmartTowns.Data; import lombok.AllArgsConstructor; diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepository.java b/src/main/java/Team5/SmartTowns/Data/locationRepository.java index cce73286be5e46308af9461fd35d923cab819cec..772f335edeb43376b96a4a2045ceddbbb8bf9690 100644 --- a/src/main/java/Team5/SmartTowns/Data/locationRepository.java +++ b/src/main/java/Team5/SmartTowns/Data/locationRepository.java @@ -1,3 +1,4 @@ +//Holds locations data repository package Team5.SmartTowns.Data; import java.util.List; diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java index f72787ed88f8b894a3a90a73e6bdab3d02971a39..b11671ee54d102354431f6917b297ba179f388d9 100644 --- a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java @@ -1,3 +1,4 @@ +//Implements the locations repository using JDBC package Team5.SmartTowns.Data; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/Team5/SmartTowns/Data/trail.java b/src/main/java/Team5/SmartTowns/Data/trail.java index 413431db009d718d1ffc6adfcb7b5383745610c7..86e78b96712ecf7a5756edbf20a4bae35839ca70 100644 --- a/src/main/java/Team5/SmartTowns/Data/trail.java +++ b/src/main/java/Team5/SmartTowns/Data/trail.java @@ -1,3 +1,4 @@ +//Holds variable data for the trails table package Team5.SmartTowns.Data; import lombok.AllArgsConstructor; diff --git a/src/main/java/Team5/SmartTowns/Data/trailsRepository.java b/src/main/java/Team5/SmartTowns/Data/trailsRepository.java index 70f7c2d960be7dfef85b29999882cc0c780f1a50..52d8dc39b9bda0a7390f06afca8769a5fd0607a9 100644 --- a/src/main/java/Team5/SmartTowns/Data/trailsRepository.java +++ b/src/main/java/Team5/SmartTowns/Data/trailsRepository.java @@ -1,3 +1,4 @@ +//Holds trails data repository package Team5.SmartTowns.Data; import java.util.List; diff --git a/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java index eb26156c1fa41ec6c5ccf9866623cbd10ef44e09..58aa84a95b00b8f8b5d7f97d240e04f405d2ac3b 100644 --- a/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/Data/trailsRepositoryJDBC.java @@ -1,3 +1,4 @@ +//Implements the trails repository using JDBC package Team5.SmartTowns.Data; import org.springframework.jdbc.core.JdbcTemplate; @@ -10,7 +11,7 @@ import java.util.List; public class trailsRepositoryJDBC implements trailsRepository{ private JdbcTemplate jdbc; private RowMapper<trail> trailMapper; - public trailsRepositoryJDBC(JdbcTemplate aJdbc){ + public trailsRepositoryJDBC(JdbcTemplate aJdbc){ this.jdbc = aJdbc; settrailsMapper(); } diff --git a/src/main/java/Team5/SmartTowns/Data/user.java b/src/main/java/Team5/SmartTowns/Data/user.java index 7646aec59c40043f6c7262000ad252eb2bcc947f..a40350ebc13621da4fb8a89f4e58d2ccb5be2568 100644 --- a/src/main/java/Team5/SmartTowns/Data/user.java +++ b/src/main/java/Team5/SmartTowns/Data/user.java @@ -1,3 +1,4 @@ +//Holds variable data for the users table package Team5.SmartTowns.Data; import lombok.AllArgsConstructor; @@ -7,8 +8,5 @@ import lombok.Data; @AllArgsConstructor public class user { private int userId; -// private String title; private String name; -// private String lastName; -// private String emailAddress; } diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 890adec1b70049a64a85ed25f8c164783b12a513..8d9e102d1f6b02b1f864e396f591a4a61aad8b41 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -1,18 +1,18 @@ -drop table if exists trail; - create table if not exists trail - ( - trailID bigint auto_increment primary key, - name varchar - ) engine=InnoDB; - drop table if exists locations; - create table if not exists locations - ( - locationID bigint auto_increment primary key, - name varchar - ) engine=InnoDB; - drop table if exists users; - create table if not exists users - ( - userID bigint auto_increment primary key, - name varchar - ) engine=InnoDB; \ No newline at end of file +drop table if exists trails; +create table if not exists trails +( + trailID bigint auto_increment primary key, + name varchar(128) +) engine=InnoDB; +drop table if exists locations; +create table if not exists locations +( + locationID bigint auto_increment primary key, + name varchar(128) +) engine=InnoDB; +drop table if exists users; +create table if not exists users +( + userID bigint auto_increment primary key, + name varchar(128) +) engine=InnoDB; \ No newline at end of file