diff --git a/src/main/java/Team5/SmartTowns/data/DatabaseController.java b/src/main/java/Team5/SmartTowns/data/DatabaseController.java index 6252083616ff54a6934ab6098e400edd18ef492f..77853b538d790d9db467f39967884f7887941343 100644 --- a/src/main/java/Team5/SmartTowns/data/DatabaseController.java +++ b/src/main/java/Team5/SmartTowns/data/DatabaseController.java @@ -9,8 +9,10 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.*; + @Controller public class DatabaseController { + @Autowired private LocationRepository locationRepository; @Autowired diff --git a/src/main/java/Team5/SmartTowns/data/LocationRepository.java b/src/main/java/Team5/SmartTowns/data/LocationRepository.java index f4b79d1ff90858e3c574c1f724e60be4077182b1..a8c8ca81722933a480cefabacd8a863ff2b2524b 100644 --- a/src/main/java/Team5/SmartTowns/data/LocationRepository.java +++ b/src/main/java/Team5/SmartTowns/data/LocationRepository.java @@ -8,5 +8,4 @@ public interface LocationRepository { List<Location> getAllLocation(); void addLocation(Location loc); - } diff --git a/src/main/java/Team5/SmartTowns/data/MockUser.java b/src/main/java/Team5/SmartTowns/data/MockUser.java index 48748a17a4ac6fe230ee7f12119d5c71ab73839a..344dbbd77e6aeba32c362c4955c87464125ab0e4 100644 --- a/src/main/java/Team5/SmartTowns/data/MockUser.java +++ b/src/main/java/Team5/SmartTowns/data/MockUser.java @@ -1,4 +1,4 @@ -package Team5.SmartTowns.Data; +package Team5.SmartTowns.data; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; @@ -8,8 +8,8 @@ import java.util.List; public class MockUser { private JdbcTemplate jdbc; - private RowMapper<trail> trailMapper; - public List<trail> getAllTrails(){ + private RowMapper<Trail> trailMapper; + public List<Trail> getAllTrails(){ String sql= "SELECT * FROM trails"; return jdbc.query(sql, trailMapper); } diff --git a/src/main/java/Team5/SmartTowns/data/QRCodes.java b/src/main/java/Team5/SmartTowns/data/QRCodes.java index ef350eb418b959e1069ee51d061471448c3b7457..28ebf97c96d884a6629208ce8ce58505334b63b6 100644 --- a/src/main/java/Team5/SmartTowns/data/QRCodes.java +++ b/src/main/java/Team5/SmartTowns/data/QRCodes.java @@ -1,4 +1,4 @@ -package Team5.SmartTowns.Data; +package Team5.SmartTowns.data; public class QRCodes { } diff --git a/src/main/java/Team5/SmartTowns/trails/TrailsController.java b/src/main/java/Team5/SmartTowns/trails/TrailsController.java index 004fdabd4e836fb7e4110f8d3f63bad76fb8b3d4..c6472019b4e17f3ff6aa4c60188ad524bfc10010 100644 --- a/src/main/java/Team5/SmartTowns/trails/TrailsController.java +++ b/src/main/java/Team5/SmartTowns/trails/TrailsController.java @@ -1,7 +1,7 @@ package Team5.SmartTowns.trails; -import Team5.SmartTowns.Landmarks.Landmarks; +import Team5.SmartTowns.landmarks.Landmarks; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static Team5.SmartTowns.Landmarks.Landmarks.landmarksDragonstrail; +import static Team5.SmartTowns.landmarks.Landmarks.landmarksDragonstrail; //import static Team5.SmartTowns.Landmarks.Landmarks.landmarksDragonstrail; diff --git a/src/main/java/Team5/SmartTowns/users/User.java b/src/main/java/Team5/SmartTowns/users/User.java index d0da0d6d974af401d29274e2f4aa8858ec70acc6..4ef65c3b288f9433e37d60e8e984b869f3a8d53e 100644 --- a/src/main/java/Team5/SmartTowns/users/User.java +++ b/src/main/java/Team5/SmartTowns/users/User.java @@ -17,7 +17,6 @@ public class User { String name; String imgPath; int dragonProgress; - Map<Badge, Integer> badgeProgress = new HashMap<>(); // Demonstrates the progress towards a specific badge (0-100) Map<Sticker, Boolean> hasStickers = new HashMap<>(); // True if User has sticker (key) Map<Integer, Boolean> dragonstaleLandmarkIDs = new HashMap<>(); // Storing the IDs of the landmarks associated with Dragonstale, as well as if the user has visited it before (boolean) @@ -26,14 +25,12 @@ public class User { this.email = email; this.name = name; this.dragonProgress = dragonProgress; -// this.dragonstaleLandmarkIDs = dragonstaleLandmarkIDs; imgPath = findImagePath(); } - public User(int id, String email, String name, int dragonProgress) { + public User(int id, String email, String name) { this.id = id; this.email = email; this.name = name; - this.dragonProgress = dragonProgress; imgPath = findImagePath(); } diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index e964d63dd7313b3a8040a43d2cfa609dc40e7370..b5908000f5460b1c03f7531b5615a19f9c5e5d01 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -28,7 +28,6 @@ create table if not exists users id bigint auto_increment primary key, email varchar(128), name varchar(30), - name varchar(128), dragonProgress int, dragonsLandmarkIDs longtext ) engine=InnoDB;