Order History now returns valid JSON

Author: Wo1v3r

src/Database.cpp

@@ -80,13 +80,11 @@ int Database::ordersCallback(void *data, int argc, char **argv, char **keyCol)
         canceled = argv[3],
         key = argv[4];
 
-    //TODO: Use Order Object
-    cout << "Order ID: " << orderID 
-            << " Movie ID: " << movieID 
-            << " Location ID:" << locationID
-            << " Canceled: " << canceled
-            << " User Key: " << key << endl;
+    Order order(orderID,movieID,locationID,canceled=="1"?"true":"false",key);
 
+    cout << order.ToJson();
+    if (++selectCounter != counter)
+        cout << ",";
     return 0;
 };
 
@@ -252,9 +250,9 @@ void Database::selectOrdersByKey(string key){
     string query = "SELECT * FROM ORDERS WHERE USERKEY = '" + key + "'";
     rc = sqlite3_exec(dbFile, query.c_str(), countCallback, (void *)data, &errMsg);
 
-    //cout << "{\"status\":\"success\",\"key\":";
+    cout << "{\"status\":\"success\",\"orders\":[";
     rc = sqlite3_exec(dbFile, query.c_str(), ordersCallback, (void *)data, &errMsg);
-    //cout << "}";
+    cout << "]}";
 
     if (rc != SQLITE_OK)
         sqlite3_free(errMsg);

src/Database.h

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include "Location.h"
 #include "Movie.h"
+#include "Order.h"
 
 using namespace std; 
 

src/Order.cpp

@@ -0,0 +1,22 @@
+#include "Order.h"
+
+Order::Order(string _id, string _movieID, string _locationID, bool _canceled, string _userKey)
+    : id(_id), movieID(_movieID), locationID(_locationID), canceled(_canceled), userKey(_userKey)
+{
+}
+
+Order::~Order()
+{
+}
+
+string Order::ToJson() const
+{
+    string result = "{\n\t\t\"id\":\"" + id + "\",\n\t\t\"movieID\":\"" + movieID + "\",\n\t\t\"locationID\":\"" + locationID + "\",\n\t\t\"canceled\":\"";
+    if (canceled)
+        result += "true";
+    else
+        result += "false";
+
+    result += "\",\n\t\t\"userKey\":\"" + userKey + "\"\n\t}";
+    return result;
+}

src/Order.h

@@ -0,0 +1,18 @@
+#ifndef ORDER_H
+#define ORDER_H
+
+#include <string>
+#include <iostream>
+
+using namespace std;
+
+class Order {
+private:
+	string id, movieID, locationID, userKey;
+    bool canceled;
+public:
+	Order(string,string,string,bool,string);
+	~Order();
+	string ToJson()const;
+};
+#endif