Merge branch 'master' into APIUnitTests

Lambdas/Lists/Item/src/Item.java

@@ -13,7 +13,7 @@ public class Item {
     long retrievedDate;
     Integer fetchCounts;
 
-    Item(ResultSet itemRow) throws SQLException {
+    public Item(ResultSet itemRow) throws SQLException {
         this.productID = itemRow.getInt(1);
         System.out.println(this.productID);
         this.chainID = itemRow.getInt(2);

Lambdas/Lists/ItemSearch/src/ItemSearch.java

@@ -0,0 +1,29 @@
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+public class ItemSearch {
+    ArrayList<Item> results;
+
+    ItemSearch(ResultSet searchResults) throws SQLException {
+        results = new ArrayList<>();
+        while (searchResults.next()) {
+            results.add(new Item(searchResults));
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ItemSearch{" +
+                "results=" + results +
+                '}';
+    }
+
+    public ArrayList<Item> getResults() {
+        return results;
+    }
+
+    public void setResults(ArrayList<Item> results) {
+        this.results = results;
+    }
+}

Lambdas/Lists/ItemSearch/src/ItemSearchGET.java

@@ -0,0 +1,11 @@
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+
+import java.util.Map;
+
+public class ItemSearchGET implements RequestHandler<Map<String,Object>, Object> {
+
+    public Object handleRequest(Map<String, Object> inputMap, Context unfilled) {
+        return BasicHandler.handleRequest(inputMap, unfilled, ItemSearcher.class);
+    }
+}

Lambdas/Lists/ItemSearch/src/ItemSearcher.java

@@ -0,0 +1,32 @@
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ItemSearcher implements CallHandler {
+
+    DBConnector connector;
+    String cognitoID;
+
+    private final String GET_ITEM_MATCHES = "SELECT * FROM Product WHERE description LIKE ?";
+
+    public ItemSearcher(DBConnector connector, String cognitoID) {
+        this.connector = connector;
+        this.cognitoID = cognitoID;
+    }
+
+    @Override
+    public Object conductAction(Map<String, Object> body, HashMap<String, String> queryParams, String s) throws SQLException {
+        try (Connection connection = connector.getConnection()) {
+            PreparedStatement getItemMatches = connection.prepareStatement(GET_ITEM_MATCHES);
+            getItemMatches.setString(1, "%" + queryParams.get("id") + "%");
+            System.out.println(getItemMatches);
+            ResultSet searchResults = getItemMatches.executeQuery();
+            ItemSearch searchResultsObject = new ItemSearch(searchResults);
+            System.out.println(searchResultsObject);
+            return searchResultsObject;
+        }
+    }
+}

Lambdas/Lists/List/src/ItemEntry.java

@@ -9,10 +9,29 @@ public class ItemEntry {
     Boolean purchased;
     public ItemEntry(Integer listID, ResultSet listRow) throws SQLException {
         this.listID = listID;
-        productID = listRow.getInt(1);
-        quantity = listRow.getInt(2);
-        addedDate = listRow.getTimestamp(3).toInstant().toEpochMilli();
-        purchased = listRow.getBoolean(4);
+        productID = listRow.getInt(2);
+        quantity = listRow.getInt(3);
+        addedDate = listRow.getTimestamp(4).toInstant().toEpochMilli();
+        purchased = listRow.getBoolean(5);
+    }
+
+    @Override
+    public String toString() {
+        return "ItemEntry{" +
+                "listID=" + listID +
+                ", productID=" + productID +
+                ", quantity=" + quantity +
+                ", addedDate=" + addedDate +
+                ", purchased=" + purchased +
+                '}';
+    }
+
+    public Integer getListID() {
+        return listID;
+    }
+
+    public void setListID(Integer listID) {
+        this.listID = listID;
     }
 
     @Override

Lambdas/Lists/ListEntry/src/ListEntryAdder.java

@@ -1,6 +1,7 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.util.HashMap;
@@ -23,7 +24,7 @@ public class ListEntryAdder implements CallHandler {
         statement.setInt(1, (Integer) bodyMap.get("productID"));
         statement.setInt(2, (Integer) bodyMap.get("listID"));
         statement.setInt(3, (Integer) bodyMap.get("quantity"));
-        statement.setObject(4, Instant.now().atZone(ZoneOffset.UTC).toLocalDateTime());
+        statement.setTimestamp(4, Timestamp.from(Instant.now()));
         statement.setBoolean(5, (Boolean) bodyMap.get("purchased"));
         System.out.println(statement);
         statement.executeUpdate();