Odczyt klienta i zamówienia SAOP

PC25-SklepWeb/src/main/java/sklep/db/CustomerDAO.java

@@ -54,7 +54,7 @@ public class CustomerDAO {
 	private Customer customerFromRS(ResultSet rs) throws SQLException {
 		return new Customer(
 				rs.getString("customer_email"),
-				rs.getString("name"),
+				rs.getString("customer_name"),
 				rs.getString("phone_number"),
 				rs.getString("address"),
 				rs.getString("postal_code"),
@@ -64,7 +64,7 @@ public class CustomerDAO {
     public void insert(Customer customer) throws DBException {
     	// używać gdy obiekt ma wpisane ID (tu: email)
         final String sql = "INSERT INTO customers("
-                + "customer_email, name, phone_number, address, postal_code, city)"
+                + "customer_email, customer_name, phone_number, address, postal_code, city)"
                 + " VALUES (?, ?, ?, ?, ?, ?)";
         try(PreparedStatement stmt = db.getSqlConnection().prepareStatement(sql)) {
             stmt.setString(1, customer.getEmail());
@@ -81,7 +81,7 @@ public class CustomerDAO {
 
     public boolean update(Customer customer) throws DBException {
         final String sql = "UPDATE customers SET "
-                + " name=?, phone_number=?, address=?, postal_code=?, city=?"
+                + " customer_name=?, phone_number=?, address=?, postal_code=?, city=?"
                 + " WHERE customer_email = ?";
         try(PreparedStatement stmt = db.getSqlConnection().prepareStatement(sql)) {
             stmt.setString(1, customer.getName());

PC31-SoapSerwer/src/main/java/sklep/db/CustomerDAO.java

@@ -54,7 +54,7 @@ public class CustomerDAO {
 	private Customer customerFromRS(ResultSet rs) throws SQLException {
 		return new Customer(
 				rs.getString("customer_email"),
-				rs.getString("name"),
+				rs.getString("customer_name"),
 				rs.getString("phone_number"),
 				rs.getString("address"),
 				rs.getString("postal_code"),
@@ -64,7 +64,7 @@ public class CustomerDAO {
     public void insert(Customer customer) throws DBException {
     	// używać gdy obiekt ma wpisane ID (tu: email)
         final String sql = "INSERT INTO customers("
-                + "customer_email, name, phone_number, address, postal_code, city)"
+                + "customer_email, customer_name, phone_number, address, postal_code, city)"
                 + " VALUES (?, ?, ?, ?, ?, ?)";
         try(PreparedStatement stmt = db.getSqlConnection().prepareStatement(sql)) {
             stmt.setString(1, customer.getEmail());
@@ -81,7 +81,7 @@ public class CustomerDAO {
 
     public boolean update(Customer customer) throws DBException {
         final String sql = "UPDATE customers SET "
-                + " name=?, phone_number=?, address=?, postal_code=?, city=?"
+                + " customer_name=?, phone_number=?, address=?, postal_code=?, city=?"
                 + " WHERE customer_email = ?";
         try(PreparedStatement stmt = db.getSqlConnection().prepareStatement(sql)) {
             stmt.setString(1, customer.getName());

PC31-SoapSerwer/src/main/java/sklep/soap/Sklep.java

@@ -4,10 +4,14 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import jakarta.jws.WebService;
+import sklep.db.CustomerDAO;
 import sklep.db.DBConnection;
 import sklep.db.DBException;
+import sklep.db.OrderDAO;
 import sklep.db.ProductDAO;
 import sklep.db.RecordNotFound;
+import sklep.model.Customer;
+import sklep.model.Order;
 import sklep.model.Product;
 
 @WebService
@@ -41,4 +45,18 @@ public class Sklep {
 		}
 	}
 	
+	public Order zamowienieWgId(int orderId) throws DBException, RecordNotFound {
+		try(DBConnection db = DBConnection.open()) {
+			OrderDAO orderDAO = db.orderDAO();
+			return orderDAO.findById(orderId);
+		}
+	}
+	
+	public Customer klient(String email) throws DBException, RecordNotFound {
+		try(DBConnection db = DBConnection.open()) {
+			CustomerDAO customerDAO = db.customerDAO();
+			return customerDAO.findByEmail(email);
+		}
+	}
+	
 }