From 52db1c0f8e9f932c8edb1ef41d61305ab208ecf9 Mon Sep 17 00:00:00 2001
From: Rhys Evans <EvansRM17@cardiff.ac.uk>
Date: Wed, 13 Dec 2023 12:27:01 +0000
Subject: [PATCH] Fixed merge conflicts
---
.../SmartTowns/data/DatabaseController.java | 5 +-
.../java/Team5/SmartTowns/data/Location.java | 21 ++--
.../SmartTowns/data/LocationRepository.java | 13 +--
.../data/LocationRepositoryJDBC.java | 49 ++++----
src/main/java/Team5/SmartTowns/data/Town.java | 2 +-
.../Team5/SmartTowns/data/TownRepository.java | 2 +-
.../SmartTowns/data/TownRepositoryJDBC.java | 2 +-
.../SmartTowns/towns/TownController.java | 8 +-
src/test/java/CalculatorTest.java | 6 +-
.../Team5/SmartTowns/Data/LocationTest.java | 7 --
.../SmartTownsApplicationTests.java | 106 +++++++++---------
src/test/java/Team5/SmartTowns/Test5.java | 2 +-
.../Team5/SmartTowns/data/LocationTest.java | 5 +
.../locationRepositoryJDBCTest.java | 0
14 files changed, 109 insertions(+), 119 deletions(-)
delete mode 100644 src/test/java/Team5/SmartTowns/Data/LocationTest.java
create mode 100644 src/test/java/Team5/SmartTowns/data/LocationTest.java
rename src/test/java/Team5/SmartTowns/{Data => data}/locationRepositoryJDBCTest.java (100%)
diff --git a/src/main/java/Team5/SmartTowns/data/DatabaseController.java b/src/main/java/Team5/SmartTowns/data/DatabaseController.java
index c93f4b28..62372a99 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 7fd2de0c..0f1e73ad 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 7d77f923..5e7e8b85 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 4a1a0108..186151ea 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 22b7a435..0cb1ddc0 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 ea6255b4..86577a4b 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 89436f4d..c40d6c00 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 37758cb0..ece2bb1e 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 c0fae0f9..67f7188b 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 3607963a..00000000
--- 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 022d9fea..47c720ca 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 8fc92e7f..7c6fbb4a 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 00000000..63709828
--- /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
--
GitLab