From 49efe83d5a44484574eb1c2ff7ad3403010ecfaa Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Fri, 1 Dec 2023 13:21:13 +0000
Subject: [PATCH] implemented PO's Requested changes
---
.../Team5/SmartTowns/Data/UserRepository.java | 1 +
.../SmartTowns/Data/UserRepositoryJDBC.java | 3 +-
.../java/Team5/SmartTowns/Data/location.java | 1 +
.../SmartTowns/Data/locationRepository.java | 1 +
.../Data/locationRepositoryJDBC.java | 1 +
.../java/Team5/SmartTowns/Data/trail.java | 1 +
.../SmartTowns/Data/trailsRepository.java | 1 +
.../SmartTowns/Data/trailsRepositoryJDBC.java | 3 +-
src/main/java/Team5/SmartTowns/Data/user.java | 4 +--
src/main/resources/schema.sql | 36 +++++++++----------
10 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/main/java/Team5/SmartTowns/Data/UserRepository.java b/src/main/java/Team5/SmartTowns/Data/UserRepository.java
index 419ab099..172591d6 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 a1cce5fa..63e0bad0 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 827dabdb..f74adb71 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 cce73286..772f335e 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 f72787ed..b11671ee 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 413431db..86e78b96 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 70f7c2d9..52d8dc39 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 eb26156c..58aa84a9 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 7646aec5..a40350eb 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 890adec1..8d9e102d 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
--
GitLab