From 54476352c1c8f4f50d89fcb430ae8172724473eb Mon Sep 17 00:00:00 2001
From: gopi17701 <GopiKatwala@gmail.com>
Date: Sun, 27 Jan 2019 00:38:41 -0500
Subject: [PATCH]  Fixed defects.

---
 AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java    | 9 +++++----
 .../java/com/astute/requests/CustomerContactRequest.java | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
index 833625e..2c8f47b 100644
--- a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
+++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java
@@ -832,10 +832,11 @@ public class SqlDAO extends DAO {
         try {
             List<CustomerContact> contacts = new ArrayList<>();
             Statement stmt = conn.createStatement();
-            String sql = "SELECT customer_id, contact_id, name, title, work_phone, work_phone_ext, mobile, fax, email, address, FROM astute.customer_contact";
+            String sql = "SELECT customer_id, contact_id, `name`, title, work_phone, work_phone_ext, mobile, fax, email, address FROM customer_contact";
             if (customerId!=null && !customerId.isEmpty()) {
                 sql += " WHERE customer_id = '" + customerId + "'";
             }
+            System.out.println(sql);
             ResultSet rs = stmt.executeQuery(sql);
             while (rs.next()) {
                 String customerID = rs.getString(1);
@@ -893,8 +894,8 @@ public class SqlDAO extends DAO {
 
             updateClause = updateClause + " name = '" + name + "',";
             updateClause = updateClause + " title = '" + title + "',";
-            updateClause = updateClause + " workPhone = " + workPhone + ",";
-            updateClause = updateClause + " phext = " + phExt + ",";
+            updateClause = updateClause + " work_phone = " + workPhone + ",";
+            updateClause = updateClause + " work_phone_ext = " + phExt + ",";
             updateClause = updateClause + " mobile = " + mobile + ",";
             updateClause = updateClause + " fax = " + fax + ",";
             updateClause = updateClause + " address = '" + address + "',";
@@ -922,7 +923,7 @@ public class SqlDAO extends DAO {
             CallableStatement stmt = conn.prepareCall("{? = call delete_customer_contact(?,?)}");
             stmt.registerOutParameter(1, Types.VARCHAR);
             stmt.setString(2, customerId);
-            stmt.setInt(2, contactId);
+            stmt.setInt(3, contactId);
             stmt.executeUpdate();
             result = stmt.getString(1);
             System.out.println(result);
diff --git a/AstuteSystem/src/main/java/com/astute/requests/CustomerContactRequest.java b/AstuteSystem/src/main/java/com/astute/requests/CustomerContactRequest.java
index d1a776c..6b422d4 100644
--- a/AstuteSystem/src/main/java/com/astute/requests/CustomerContactRequest.java
+++ b/AstuteSystem/src/main/java/com/astute/requests/CustomerContactRequest.java
@@ -12,6 +12,9 @@ public class CustomerContactRequest {
     String email;
     String address;
 
+    public CustomerContactRequest() {
+
+    }
     public CustomerContactRequest(String customerId,int contactId,String name,String title,int workPhone,int phExt,int mobile, int fax, String email, String address) {
         this.customerId = customerId;
         this.contactId = contactId;