From 222dbc5ab936fdf67daecafc7a66c93aa5d8adf6 Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Wed, 13 Dec 2023 14:20:57 +0000
Subject: [PATCH] ready to merge
---
.../Organisation/organisationControllers.java | 3 +++
.../java/Team5/SmartTowns/business/business.java | 16 ++++++++--------
.../SmartTowns/business/businessRepository.java | 2 --
.../business/businessRepositoryJDBC.java | 12 +++---------
4 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
index 3e8ff837..a5927d4c 100644
--- a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
+++ b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.stereotype.Controller;
+import java.util.List;
+
@Controller
public class organisationControllers {
@GetMapping("/localauthorities")
@@ -23,6 +25,7 @@ public class organisationControllers {
@GetMapping("/businesses")
public ModelAndView getBusinessPage(){
ModelAndView modelAndView = new ModelAndView("businesses");
+ List<business> business = businessRepository.getAllBusinesses();
modelAndView.addObject("busiSub", business);
return modelAndView;
}
diff --git a/src/main/java/Team5/SmartTowns/business/business.java b/src/main/java/Team5/SmartTowns/business/business.java
index 4f291feb..ccb7db13 100644
--- a/src/main/java/Team5/SmartTowns/business/business.java
+++ b/src/main/java/Team5/SmartTowns/business/business.java
@@ -18,15 +18,15 @@ public class business {
@Override
public String toString(){
- return "business{" +
- businessName + '\'' +
- address1 + '\'' +
- address2 + '\'' +
- city + '\'' +
- county + '\'' +
- postcode + '\'' +
+ return "Business:" + " " +
+ businessName + '\'' + " " +
+ address1 + '\'' + " " +
+ address2 + '\'' + " " +
+ city + '\'' + " " +
+ county + '\'' + " " +
+ postcode + '\'' + " " +
website +
- '}';
+ " ";
}
public String getBusinessName() {
diff --git a/src/main/java/Team5/SmartTowns/business/businessRepository.java b/src/main/java/Team5/SmartTowns/business/businessRepository.java
index 00bcc879..dc36607c 100644
--- a/src/main/java/Team5/SmartTowns/business/businessRepository.java
+++ b/src/main/java/Team5/SmartTowns/business/businessRepository.java
@@ -5,6 +5,4 @@ import java.util.List;
public interface businessRepository {
List<business> getAllBusinesses();
void addBusiness(business bus);
-
- void addLocalAuthority(business bus);
}
diff --git a/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java
index cdf4f78b..0e307350 100644
--- a/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java
@@ -27,21 +27,15 @@ public class businessRepositoryJDBC implements businessRepository{
);
}
public List<business> getAllBusinesses(){
- String sql = "SELECT * FROM localAuthority";
+ String sql = "SELECT * FROM businesses";
return jdbc.query(sql, businessMapper);
}
@Override
public void addBusiness(business bus) {
-
- }
-
- @Override
- public void addLocalAuthority(business bus){
- String sql = "INSERT INTO business( businessName, address1, address2, city, county, postcode, website) values (?, ?, ?, ?, ?, ?, ?)";
+ String sql = "INSERT INTO businesses( businessName, address1, address2, city, county, postcode, website) values (?, ?, ?, ?, ?, ?, ?)";
jdbc.update(sql, bus.getBusinessName(),bus.getAddress1(),bus.getAddress2(),bus.getCity(),bus.getCounty(),bus.getPostcode(),bus.getWebsite());
}
-
- }
+}
--
GitLab