diff --git a/src/main/java/Team5/SmartTowns/data/DatabaseController.java b/src/main/java/Team5/SmartTowns/data/DatabaseController.java index c93f4b28096b507eccf0d4b44aecdb856486ac04..62372a9991d60431b121f6b877d5343bb09afd54 100644 --- a/src/main/java/Team5/SmartTowns/data/DatabaseController.java +++ b/src/main/java/Team5/SmartTowns/data/DatabaseController.java @@ -1,4 +1,4 @@ -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/DatabaseController.java + //package Team5.SmartTowns.Data; // //import Team5.SmartTowns.users.User; @@ -34,7 +34,7 @@ // return mav2; // } //} -======= + package Team5.SmartTowns.data; import org.springframework.beans.factory.annotation.Autowired; @@ -83,4 +83,3 @@ public class DatabaseController { // } return locationApprovalList; // } } ->>>>>>> main:src/main/java/Team5/SmartTowns/data/DatabaseController.java diff --git a/src/main/java/Team5/SmartTowns/data/Location.java b/src/main/java/Team5/SmartTowns/data/Location.java index 7fd2de0c1d0295a2c0af26372e233abfee2291a8..0f1e73ad5aa68a592d5131c448be2602cf58d800 100644 --- a/src/main/java/Team5/SmartTowns/data/Location.java +++ b/src/main/java/Team5/SmartTowns/data/Location.java @@ -16,15 +16,12 @@ public class Location { private String locationPlace; private int locationTrailID; -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/Location.java -======= private boolean locationApproved; public Location() { } ->>>>>>> main:src/main/java/Team5/SmartTowns/data/Location.java @Override public String toString() { @@ -58,15 +55,21 @@ public class Location { return locationTrailID; } -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/Location.java - public int testMe(){ - int a=4; - return 4; -======= + + public boolean isLocationApproved() { return locationApproved; ->>>>>>> main:src/main/java/Team5/SmartTowns/data/Location.java + + } + + public Location(String locationName, String locationEmail, String locationDescription, String locationPlace, int locationTrailID, boolean locationApproved) { + this.locationName = locationName; + this.locationEmail = locationEmail; + this.locationDescription = locationDescription; + this.locationPlace = locationPlace; + this.locationTrailID = locationTrailID; + this.locationApproved = locationApproved; } } diff --git a/src/main/java/Team5/SmartTowns/data/LocationRepository.java b/src/main/java/Team5/SmartTowns/data/LocationRepository.java index 7d77f923525ba9509db32677925c94536e690765..5e7e8b8578ab840eda371f59fb2655e90d34c6fc 100644 --- a/src/main/java/Team5/SmartTowns/data/LocationRepository.java +++ b/src/main/java/Team5/SmartTowns/data/LocationRepository.java @@ -1,9 +1,9 @@ //Holds locations data repository (landmarks) -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepository.java -package Team5.SmartTowns.Data; -======= + package Team5.SmartTowns.data; ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepository.java + + +import Team5.SmartTowns.data.Location; import java.util.List; @@ -13,8 +13,7 @@ public interface LocationRepository { void addLocation(Location loc); -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepository.java -======= + List<Location> getApprovedLocations(); // List<Location> getApprovedLocations2(List<Location> list); @@ -25,5 +24,5 @@ public interface LocationRepository { // List<Location> approvedLocations(); ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepository.java + } diff --git a/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java index 4a1a0108d5713ff95bd69877a9da500fa4ddec49..186151ea6c33d96b542bc33267476110e3942fad 100644 --- a/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java @@ -1,36 +1,33 @@ //Implements the locations repository using JDBC -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java -package Team5.SmartTowns.Data; -======= + package Team5.SmartTowns.data; ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java + +import Team5.SmartTowns.data.LocationRepository; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Repository; -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java + import javax.sql.DataSource; -======= + import java.util.ArrayList; ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java + import java.util.List; @Repository public class LocationRepositoryJDBC implements LocationRepository { -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java - private JdbcTemplate jdbc; -======= + + private JdbcTemplate jdbc; ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java + private RowMapper<Location> locationMapper; public LocationRepositoryJDBC(JdbcTemplate aJdbc) { this.jdbc = aJdbc; setlocationMapper(); } -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java -======= + // public LocationRepositoryJDBC() { // JdbcTemplate ajdbc = new JdbcTemplate(); @@ -40,7 +37,6 @@ public class LocationRepositoryJDBC implements LocationRepository { // } ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java private void setlocationMapper(){ locationMapper = (rs, i) -> new Location( @@ -48,8 +44,8 @@ public class LocationRepositoryJDBC implements LocationRepository { rs.getString("locationEmail"), rs.getString("locationDescription"), rs.getString("locationPlace"), -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java - rs.getInt("locationTrailID") + rs.getInt("locationTrailID"), + rs.getBoolean() ); } public String getCountOfEmployees() { @@ -60,22 +56,22 @@ public class LocationRepositoryJDBC implements LocationRepository { String sql= "SELECT * FROM locations"; return aJdbc.query(sql, locationMapper); } -======= + rs.getInt("locationTrailID"), rs.getBoolean("locationApproved") ); } ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java + public List<Location> getAllLocation(){ String sql= "SELECT * FROM locations"; return jdbc.query(sql, locationMapper); } -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java - @Override // intended implementation at current: user data from templates/Landmarks/LandmarkFormTh.html is added to the Location table - public void addLocation(Location loc) { - String sql = "insert into locations( locationName , locationEmail,locationDescription,locationPlace, locationTrailID) values (?,?,?,?,?)"; -======= + +// @Override // intended implementation at current: user data from templates/Landmarks/LandmarkFormTh.html is added to the Location table +// public void addLocation(Location loc) { +// String sql = "insert into locations( locationName , locationEmail,locationDescription,locationPlace, locationTrailID) values (?,?,?,?,?)";} + // public LocationRepositoryJDBC() { // JdbcTemplate ajdbc = new JdbcTemplate(); // this.jdbc =ajdbc; @@ -90,12 +86,9 @@ public class LocationRepositoryJDBC implements LocationRepository { @Override // intended implementation at current: user data from templates/Landmarks/LandmarkFormTh.html is added to the Location table public void addLocation(Location loc) { String sql = "insert into locations( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved) values (?,?,?,?,?,?)"; ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java - jdbc.update(sql,loc.getLocationName(),loc.getLocationEmail(),loc.getLocationDescription(),loc.getLocationPlace(),loc.getLocationTrailID()); } -<<<<<<< HEAD:src/main/java/Team5/SmartTowns/Data/LocationRepositoryJDBC.java public void setDataSource(DataSource dataSource) { jdbc = new JdbcTemplate(dataSource); @@ -107,7 +100,7 @@ public class LocationRepositoryJDBC implements LocationRepository { public void setJdbc(JdbcTemplate jdbc) { this.jdbc = jdbc; } -======= + @Override public List<Location> getApprovedLocations(){ JdbcTemplate jdbc = new JdbcTemplate(); @@ -150,5 +143,5 @@ public class LocationRepositoryJDBC implements LocationRepository { // } ->>>>>>> main:src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java + } diff --git a/src/main/java/Team5/SmartTowns/data/Town.java b/src/main/java/Team5/SmartTowns/data/Town.java index 22b7a435d692ddf234ce0f3735811830680bed34..0cb1ddc0533274bffb573ccc91da29d7c900d97d 100644 --- a/src/main/java/Team5/SmartTowns/data/Town.java +++ b/src/main/java/Team5/SmartTowns/data/Town.java @@ -1,4 +1,4 @@ -package Team5.SmartTowns.Data; +package Team5.SmartTowns.data; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/Team5/SmartTowns/data/TownRepository.java b/src/main/java/Team5/SmartTowns/data/TownRepository.java index ea6255b4e56753683c5643027590dca92197e298..86577a4bcd8f31840e81dd1aef2cfa5a58958959 100644 --- a/src/main/java/Team5/SmartTowns/data/TownRepository.java +++ b/src/main/java/Team5/SmartTowns/data/TownRepository.java @@ -1,4 +1,4 @@ -package Team5.SmartTowns.Data; +package Team5.SmartTowns.data; import java.util.List; diff --git a/src/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java index 89436f4d6bb6f11d2ecca82e64b7bef945878d8e..c40d6c00cb9590a68a22b8291da20a02c2257163 100644 --- a/src/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java +++ b/src/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.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; diff --git a/src/main/java/Team5/SmartTowns/towns/TownController.java b/src/main/java/Team5/SmartTowns/towns/TownController.java index 37758cb09f9d4e5e120d46853888f1a4178dfd38..ece2bb1e8ed2700be94c9999f8b4d26e8d23fa95 100644 --- a/src/main/java/Team5/SmartTowns/towns/TownController.java +++ b/src/main/java/Team5/SmartTowns/towns/TownController.java @@ -1,8 +1,8 @@ package Team5.SmartTowns.towns; -import Team5.SmartTowns.Data.Location; -import Team5.SmartTowns.Data.Town; -import Team5.SmartTowns.Data.LocationRepository; +import Team5.SmartTowns.data.Location; +import Team5.SmartTowns.data.Town; +import Team5.SmartTowns.data.LocationRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -17,7 +17,7 @@ public class TownController { @Autowired private LocationRepository locationRepository; @Autowired - private Team5.SmartTowns.Data.TownRepository townRepository; + private Team5.SmartTowns.data.TownRepository townRepository; @GetMapping("/home") public ModelAndView getTownList(){ diff --git a/src/test/java/CalculatorTest.java b/src/test/java/CalculatorTest.java index c0fae0f9979e35d0182bd44a555f4bbfec1a1c59..67f7188b69d68e843ee28d769d0960084475947b 100644 --- a/src/test/java/CalculatorTest.java +++ b/src/test/java/CalculatorTest.java @@ -1,15 +1,13 @@ -import Team5.SmartTowns.Data.Calculator; +import Team5.SmartTowns.data.Calculator; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.core.NestedRuntimeException; //import org.springframework.dao.DataAccessException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; //import org.junit.platform.engine.TestDescriptor; //import org.junit.platform.commons.util.Preconditions; -import org.apache.commons.logging.LogFactory; + //@SpringBootTest public class CalculatorTest { // String asd= getLegacyReportingName("das"); diff --git a/src/test/java/Team5/SmartTowns/Data/LocationTest.java b/src/test/java/Team5/SmartTowns/Data/LocationTest.java deleted file mode 100644 index 3607963a152f412345ceaa0bf90908940edd74e4..0000000000000000000000000000000000000000 --- a/src/test/java/Team5/SmartTowns/Data/LocationTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package Team5.SmartTowns.Data; - -import static org.junit.jupiter.api.Assertions.*; - -class LocationTest { - -} \ No newline at end of file diff --git a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java index 022d9fea6aadd68bc7bf7118141460e504919f8b..47c720ca72fd244fb90d1b14109856674f6e399d 100644 --- a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java +++ b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java @@ -1,63 +1,63 @@ -package Team5.SmartTowns; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class SmartTownsApplicationTests { - - @Test - void contextLoads() { - } - -} -@Test -//// test2 -// public void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount1() { -// DataSource dataSource = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) -// .addScript("classpath:jdbc/schema.sql") -// .addScript("classpath:jdbc/test-data.sql") -// .build(); +//package Team5.SmartTowns; // -// LocationRepositoryJDBC employeeDAO = new LocationRepositoryJDBC(); -// employeeDAO.setDataSource(dataSource); +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.test.context.SpringBootTest; // -// assertEquals(4, employeeDAO.getCountOfEmployees());} +//@SpringBootTest +//class SmartTownsApplicationTests { // // @Test -//// test 1 -// void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() { -// LocationRepositoryJDBC employeeDAO = new LocationRepositoryJDBC(ajdbc); -//// employeeDAO.setJdbcTemplate(ajdbc); -// assertEquals(4, employeeDAO.getAllLocation().size()); +// void contextLoads() { +// } +// +//} // -//// assertEquals(4, employeeDAO.getCountOfEmployees()); -// }} +////// test2 +//// public void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount1() { +//// DataSource dataSource = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) +//// .addScript("classpath:jdbc/schema.sql") +//// .addScript("classpath:jdbc/test-data.sql") +//// .build(); +//// +//// LocationRepositoryJDBC employeeDAO = new LocationRepositoryJDBC(); +//// employeeDAO.setDataSource(dataSource); +//// +//// assertEquals(4, employeeDAO.getCountOfEmployees());} +//// //// @Test +////// test 1 //// void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() { -//// EmployeeDAO employeeDAO = new EmployeeDAO(); -//// employeeDAO.setJdbcTemplate(jdbcTemplate); +//// LocationRepositoryJDBC employeeDAO = new LocationRepositoryJDBC(ajdbc); +////// employeeDAO.setJdbcTemplate(ajdbc); +//// assertEquals(4, employeeDAO.getAllLocation().size()); +//// +////// assertEquals(4, employeeDAO.getCountOfEmployees()); +//// }} +////// @Test +////// void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() { +////// EmployeeDAO employeeDAO = new EmployeeDAO(); +////// employeeDAO.setJdbcTemplate(jdbcTemplate); +////// +////// assertEquals(4, employeeDAO.getCountOfEmployees()); +////// } //// -//// assertEquals(4, employeeDAO.getCountOfEmployees()); -//// } // - -// @Test -// public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){ -// /// Discover number of approved/unapproved locations before adding tests -// List<Location> approvedNumber = locationRepo.approvedLocations(); +//// @Test +//// public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){ +//// /// Discover number of approved/unapproved locations before adding tests +//// List<Location> approvedNumber = locationRepo.approvedLocations(); +//// } +////// Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here", +////// "Caerphilly", 103, false); +////// Location loc2= new Location("TestFail", "Test@PleaseFail2.test", "Fail Description here", +////// "Caerphilly", 103, false); +////// Location loc3= new Location("TestPass", "Test@PleasePass.test", "Pass Description here", +////// "Caerphilly", 103, true); +////// locationRepository.addLocation(loc1); +////// locationRepository.addLocation(loc2); +////// locationRepository.addLocation(loc3); +////// List<Location> ApprovedNumberAfter=locationRepository.approvedLocations(); +////// +////// assertEquals(1,( ApprovedNumber.size()-ApprovedNumberAfter.size())); +//// } // } -//// Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here", -//// "Caerphilly", 103, false); -//// Location loc2= new Location("TestFail", "Test@PleaseFail2.test", "Fail Description here", -//// "Caerphilly", 103, false); -//// Location loc3= new Location("TestPass", "Test@PleasePass.test", "Pass Description here", -//// "Caerphilly", 103, true); -//// locationRepository.addLocation(loc1); -//// locationRepository.addLocation(loc2); -//// locationRepository.addLocation(loc3); -//// List<Location> ApprovedNumberAfter=locationRepository.approvedLocations(); -//// -//// assertEquals(1,( ApprovedNumber.size()-ApprovedNumberAfter.size())); -// } - } diff --git a/src/test/java/Team5/SmartTowns/Test5.java b/src/test/java/Team5/SmartTowns/Test5.java index 8fc92e7fffc7d7406caab9050be1933173d33c81..7c6fbb4adbd9536827e594f1b9ffb0dbc7eaf9e9 100644 --- a/src/test/java/Team5/SmartTowns/Test5.java +++ b/src/test/java/Team5/SmartTowns/Test5.java @@ -1,6 +1,6 @@ package Team5.SmartTowns; -import Team5.SmartTowns.Data.LocationRepository; +import Team5.SmartTowns.data.LocationRepository; //import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/Team5/SmartTowns/data/LocationTest.java b/src/test/java/Team5/SmartTowns/data/LocationTest.java new file mode 100644 index 0000000000000000000000000000000000000000..637098284a988e0eb5486b1b9aef974d907aa856 --- /dev/null +++ b/src/test/java/Team5/SmartTowns/data/LocationTest.java @@ -0,0 +1,5 @@ +package Team5.SmartTowns.data; + +class LocationTest { + +} \ No newline at end of file diff --git a/src/test/java/Team5/SmartTowns/Data/locationRepositoryJDBCTest.java b/src/test/java/Team5/SmartTowns/data/locationRepositoryJDBCTest.java similarity index 100% rename from src/test/java/Team5/SmartTowns/Data/locationRepositoryJDBCTest.java rename to src/test/java/Team5/SmartTowns/data/locationRepositoryJDBCTest.java