accountOperation now gets earnings and payments, then sorts

src/database.cpp

@@ -19,8 +19,8 @@ Budget::Models::Account Database::getAccount(const std::string &accountName, sql
 	
 	if (rc == SQLITE_ROW) {
 		long long id = sqlite3_column_int64(stmt, 0);
-		char* name = (char*)(sqlite3_column_text(stmt, 1));
+		std::string name = (char *) (sqlite3_column_text(stmt, 1));
-		char* description = (char*)sqlite3_column_text(stmt, 2);
+		std::string description = (sqlite3_column_type(stmt, 2) == SQLITE_NULL) ? "" : (char*) sqlite3_column_text(stmt, 2);
 		if (sqlite3_column_type(stmt, 3) == SQLITE_NULL || sqlite3_column_type(stmt, 4) == SQLITE_NULL) {
 			sqlite3_finalize(stmt);
 			return {id, name, description, nullptr};
@@ -55,10 +55,12 @@ void Database::deleteAccount(Budget::Models::Account *account, sqlite3 *db) {
 
 void Database::cacheAccountValue(Budget::Models::Account *account, sqlite3 *db) {
 	sqlite3_stmt *stmt;
-	int rc = sqlite3_prepare_v2(db, "SELECT SUM(dollars * 100 + cents) / 100 as nDollars, SUM(dollars * 100 + cents) % 100 as nCents FROM("
+	int rc = sqlite3_prepare_v2(db,
+								"SELECT SUM(dollars * 100 + cents) / 100 as nDollars, SUM(dollars * 100 + cents) % 100 as nCents FROM("
 								"SELECT SUM(dollars * 100 + cents) / 100 AS dollars, SUM(dollars * 100 + cents) % 100 AS cents FROM earning WHERE accountId = ? "
 								"UNION ALL "
-									"SELECT SUM(dollars * 100 + cents) / 100 * -1 AS dollars, SUM(dollars * 100 + cents) % 100 * -1 AS cents FROM payment WHERE accountId = ?);", -1, &stmt, nullptr);
+								"SELECT SUM(dollars * 100 + cents) / 100 * -1 AS dollars, SUM(dollars * 100 + cents) % 100 * -1 AS cents FROM payment WHERE accountId = ?);",
+								-1, &stmt, nullptr);
 	
 	if (rc != SQLITE_OK)
 		throw std::runtime_error("Failed preparing get cashedValue " + account->name);
@@ -73,16 +75,15 @@ void Database::cacheAccountValue(Budget::Models::Account *account, sqlite3 *db)
 	if (rc == SQLITE_ROW) {
 		dollars = sqlite3_column_int64(stmt, 0);
 		cents = sqlite3_column_int64(stmt, 1);
-	}
+	} else if (rc == SQLITE_DONE) {
-	else if (rc == SQLITE_DONE) {
 		dollars = 0;
 		cents = 0;
-	}
+	} else
-	else
 		throw std::runtime_error("Failed get cashedValue " + account->name);
 	
 	sqlite3_reset(stmt);
-	rc = sqlite3_prepare_v2(db, "UPDATE account SET cachedDollars = ?, cachedCents = ? WHERE id = ?", -1, &stmt, nullptr);
+	rc = sqlite3_prepare_v2(db, "UPDATE account SET cachedDollars = ?, cachedCents = ? WHERE id = ?", -1, &stmt,
+							nullptr);
 	if (rc != SQLITE_OK)
 		throw std::runtime_error("Failed preparing set cashedValue " + account->name);
 	
@@ -115,7 +116,8 @@ void Database::accountDescription(Budget::Models::Account *account, sqlite3 *db)
 		throw std::runtime_error("Failed to set description on " + account->name);
 }
 
-long long int Database::createAccount(Budget::OptHandlers::CreateOperation::Flags *flags, std::string &account, sqlite3 *db) {
+long long int
+Database::createAccount(Budget::OptHandlers::CreateOperation::Flags *flags, std::string &account, sqlite3 *db) {
 	sqlite3_stmt *stmt;
 	int rc = sqlite3_prepare_v2(db, "INSERT INTO account (name, description) VALUES (?, ?)", -1, &stmt, nullptr);
 	
@@ -123,7 +125,8 @@ long long int Database::createAccount(Budget::OptHandlers::CreateOperation::Flag
 		throw std::runtime_error("Failed preparing createAccount statement");
 	
 	sqlite3_bind_text(stmt, 1, account.c_str(), -1, SQLITE_TRANSIENT);
-	sqlite3_bind_text(stmt, 2, (flags->description.empty() ? nullptr : flags->description.c_str()), -1, SQLITE_TRANSIENT);
+	sqlite3_bind_text(stmt, 2, (flags->description.empty() ? nullptr : flags->description.c_str()), -1,
+					  SQLITE_TRANSIENT);
 	
 	rc = sqlite3_step(stmt);
 	
@@ -136,9 +139,11 @@ long long int Database::createAccount(Budget::OptHandlers::CreateOperation::Flag
 	return sqlite3_last_insert_rowid(db);
 }
 
-long long int Database::earn(Budget::Models::Account *account, Budget::OptHandlers::EarnOperation::Flags *flags, sqlite3 *db) {
+long long int
+Database::earn(Budget::Models::Account *account, Budget::OptHandlers::EarnOperation::Flags *flags, sqlite3 *db) {
 	sqlite3_stmt *stmt;
-	int rc = sqlite3_prepare_v2(db, "INSERT INTO earning (dollars, cents, description, receipt, accountId, date) VALUES "
+	int rc = sqlite3_prepare_v2(db,
+								"INSERT INTO earning (dollars, cents, description, receipt, accountId, date) VALUES "
 								"(?, ?, ?, ?, ?, ?);",
 								-1, &stmt, nullptr);
 	
@@ -147,7 +152,8 @@ long long int Database::earn(Budget::Models::Account *account, Budget::OptHandle
 	
 	sqlite3_bind_int64(stmt, 1, flags->dollars);
 	sqlite3_bind_int64(stmt, 2, flags->cents);
-	sqlite3_bind_text(stmt, 3, (flags->description.empty() ? nullptr : flags->description.c_str()), -1, SQLITE_TRANSIENT);
+	sqlite3_bind_text(stmt, 3, (flags->description.empty() ? nullptr : flags->description.c_str()), -1,
+					  SQLITE_TRANSIENT);
 	sqlite3_bind_text(stmt, 4, (flags->receipt.empty() ? nullptr : flags->receipt.c_str()), -1, SQLITE_TRANSIENT);
 	sqlite3_bind_int64(stmt, 5, account->id);
 	sqlite3_bind_int64(stmt, 6, flags->date);
@@ -162,9 +168,11 @@ long long int Database::earn(Budget::Models::Account *account, Budget::OptHandle
 	return sqlite3_last_insert_rowid(db);
 }
 
-long long int Database::pay(Budget::Models::Account *account, Budget::OptHandlers::PaymentOperation::Flags *flags, sqlite3 *db) {
+long long int
+Database::pay(Budget::Models::Account *account, Budget::OptHandlers::PaymentOperation::Flags *flags, sqlite3 *db) {
 	sqlite3_stmt *stmt;
-	int rc = sqlite3_prepare_v2(db, "INSERT INTO payment (dollars, cents, description, receipt, accountId, date) VALUES "
+	int rc = sqlite3_prepare_v2(db,
+								"INSERT INTO payment (dollars, cents, description, receipt, accountId, date) VALUES "
 								"(?, ?, ?, ?, ?, ?);",
 								-1, &stmt, nullptr);
 	
@@ -173,7 +181,8 @@ long long int Database::pay(Budget::Models::Account *account, Budget::OptHandler
 	
 	sqlite3_bind_int64(stmt, 1, flags->dollars);
 	sqlite3_bind_int64(stmt, 2, flags->cents);
-	sqlite3_bind_text(stmt, 3, (flags->description.empty() ? nullptr : flags->description.c_str()), -1, SQLITE_TRANSIENT);
+	sqlite3_bind_text(stmt, 3, (flags->description.empty() ? nullptr : flags->description.c_str()), -1,
+					  SQLITE_TRANSIENT);
 	sqlite3_bind_text(stmt, 4, (flags->receipt.empty() ? nullptr : flags->receipt.c_str()), -1, SQLITE_TRANSIENT);
 	sqlite3_bind_int64(stmt, 5, account->id);
 	sqlite3_bind_int64(stmt, 6, flags->date);
@@ -187,3 +196,75 @@ long long int Database::pay(Budget::Models::Account *account, Budget::OptHandler
 	
 	return sqlite3_last_insert_rowid(db);
 }
+
+std::list<Budget::Models::Earning>
+Database::getEarnings(Budget::Models::Account *account, long long int dateStart, long long int dateEnd, sqlite3 *db) {
+	sqlite3_stmt *stmt;
+	int rc = sqlite3_prepare_v2(db,
+								"SELECT * FROM earning WHERE accountId = ? AND date BETWEEN ? AND ?;", -1, &stmt, nullptr);
+	
+	if (rc != SQLITE_OK)
+		throw std::runtime_error("Failed preparing getEarnings statement");
+	
+	sqlite3_bind_int64(stmt, 1, account->id);
+	sqlite3_bind_int64(stmt, 2, dateStart);
+	sqlite3_bind_int64(stmt, 3, dateEnd);
+	
+	rc = sqlite3_step(stmt);
+	
+	std::list<Budget::Models::Earning> earnings;
+	while (rc == SQLITE_ROW) {
+		long long id = sqlite3_column_int64(stmt, 0);
+		long long dollars = sqlite3_column_int64(stmt, 1);
+		long long cents = sqlite3_column_int64(stmt, 2);
+		std::string description = (sqlite3_column_type(stmt, 3) == SQLITE_NULL) ? "" : (char*) sqlite3_column_text(stmt, 3);
+		std::string receipt = (sqlite3_column_type(stmt, 4) == SQLITE_NULL) ? "" : (char*) sqlite3_column_text(stmt, 4);
+		long long accountId = sqlite3_column_int64(stmt, 5);
+		long long date = sqlite3_column_int64(stmt, 6);
+		
+		earnings.emplace_back(Budget::Models::Earning(id, {dollars, cents}, description, receipt, accountId, date));
+		rc = sqlite3_step(stmt);
+	}
+	sqlite3_finalize(stmt);
+	
+	if (rc != SQLITE_DONE)
+		throw std::runtime_error("Failed getting all earnings from getEarnings");
+	
+	return earnings;
+}
+
+std::list<Budget::Models::Payment>
+Database::getPayments(Budget::Models::Account *account, long long int dateStart, long long int dateEnd, sqlite3 *db) {
+	sqlite3_stmt *stmt;
+	int rc = sqlite3_prepare_v2(db,
+								"SELECT * FROM payment WHERE accountId = ? AND date BETWEEN ? AND ?;", -1, &stmt, nullptr);
+	
+	if (rc != SQLITE_OK)
+		throw std::runtime_error("Failed preparing getPayments statement");
+	
+	sqlite3_bind_int64(stmt, 1, account->id);
+	sqlite3_bind_int64(stmt, 2, dateStart);
+	sqlite3_bind_int64(stmt, 3, dateEnd);
+	
+	rc = sqlite3_step(stmt);
+	
+	std::list<Budget::Models::Payment> earnings;
+	while (rc == SQLITE_ROW) {
+		long long id = sqlite3_column_int64(stmt, 0);
+		long long dollars = sqlite3_column_int64(stmt, 1);
+		long long cents = sqlite3_column_int64(stmt, 2);
+		std::string description = (sqlite3_column_type(stmt, 3) == SQLITE_NULL) ? "" : (char*) sqlite3_column_text(stmt, 3);
+		std::string receipt = (sqlite3_column_type(stmt, 4) == SQLITE_NULL) ? "" : (char*) sqlite3_column_text(stmt, 4);
+		long long accountId = sqlite3_column_int64(stmt, 5);
+		long long date = sqlite3_column_int64(stmt, 6);
+		
+		earnings.emplace_back(Budget::Models::Payment(id, {dollars, cents}, description, receipt, accountId, date));
+		rc = sqlite3_step(stmt);
+	}
+	sqlite3_finalize(stmt);
+	
+	if (rc != SQLITE_DONE)
+		throw std::runtime_error("Failed getting all payments from getPayments");
+	
+	return earnings;
+}

src/database.h

@@ -9,9 +9,12 @@
 #include "optHandlers/createOperation.h"
 #include "optHandlers/earnOperation.h"
 #include "optHandlers/paymentOperation.h"
+#include "models/earning.h"
+#include "models/payment.h"
 
 #include <string>
 #include <sqlite3.h>
+#include <list>
 
 class Database {
 public:
@@ -71,7 +74,8 @@ public:
 	 *
 	 * @throws std::runtime_error If the accountName could not be created in the database
 	 */
-	static long long int createAccount(Budget::OptHandlers::CreateOperation::Flags *flags, std::string &account, sqlite3 *db);
+	static long long int
+	createAccount(Budget::OptHandlers::CreateOperation::Flags *flags, std::string &account, sqlite3 *db);
 	
 	/**
 	 * @brief The function records an earning in the database
@@ -111,6 +115,10 @@ public:
 	 */
 	static long long int
 	pay(Budget::Models::Account *account, Budget::OptHandlers::PaymentOperation::Flags *flags, sqlite3 *db);
+	
+	static std::list<Budget::Models::Earning> getEarnings(Budget::Models::Account *account, long long dateStart, long long dateEnd, sqlite3 *db);
+	
+	static std::list<Budget::Models::Payment> getPayments(Budget::Models::Account *account, long long dateStart, long long dateEnd, sqlite3 *db);
 };
 
 

src/models/earning.h

@@ -8,7 +8,16 @@
 #include "transaction.h"
 
 namespace Budget::Models {
-	class Earning : Transaction {};
+	class Earning : public Transaction {
+	public:
+		Earning(long long int id, const Money &value, const std::string &description, const std::string &receipt,
+				long long int accountId, long long int date) : Transaction(id, value, description, receipt, accountId,
+																		   date) {}
+		
+		Money getAdjustedMoney() override {
+			return value;
+		};
+	};
 }
 
 #endif //BUDGET_EARNING_H

src/models/money.cpp

@@ -17,8 +17,6 @@ Money operator+(const Money &lhs, const Money &rhs) {
 	return {total_dollars, total_cents};
 }
 
-
-
 Money operator-(const Money &lhs, const Money &rhs) {
 	long long total_cents = lhs.getDollars() * 100 + lhs.getCents() - rhs.getDollars() * 100 - rhs.getCents();
 	return {total_cents / 100, std::abs(total_cents % 100)};
@@ -32,11 +30,16 @@ bool operator<(const Money &lhs, const Money &rhs) {
 	return lhs.getDollars() * 100 + lhs.getCents() < rhs.getDollars() * 100 + rhs.getCents();
 }
 
+Money Budget::Models::operator*(const Money &lhs, int rhs) {
+	long long total_cents = (lhs.getDollars() * 100 + lhs.getCents()) * rhs;
+	return {total_cents / 100, std::abs(total_cents % 100)};
+}
+
 std::ostream &operator<<(std::ostream &os, const Money &money) {
 	os << "$" << money.getDollars() << ".";
-	if (money.getCents() < 10) {
+	if (std::abs(money.getCents()) < 10) {
 		os << "0";
 	}
-	os << money.getCents();
+	os << std::abs(money.getCents());
 	return os;
 }

src/models/money.h

@@ -23,6 +23,8 @@ namespace Budget::Models {
 		
 		friend Money operator-(const Money &lhs, const Money &rhs);
 		
+		friend Money operator*(const Money &lhs, int rhs);
+		
 		friend bool operator==(const Money &lhs, const Money &rhs);
 		
 		friend bool operator<(const Money &lhs, const Money &rhs);
@@ -33,6 +35,7 @@ namespace Budget::Models {
 	};
 	
 }
+
 std::ostream &operator<<(std::ostream &os, const Budget::Models::Money &money);
 
 #endif //BUDGET_MONEY_H

src/models/payment.h

@@ -2,13 +2,22 @@
 // Created by quentin on 2/2/23.
 //
 
-#ifndef BUDGET_EARNING_H
+#ifndef BUDGET_PAYMENT_H
-#define BUDGET_EARNING_H
+#define BUDGET_PAYMENT_H
 
 #include "transaction.h"
 
 namespace Budget::Models {
-	class Payment : Transaction {};
+	class Payment : public Transaction {
+	public:
+		Payment(long long int id, const Money &value, const std::string &description, const std::string &receipt,
+				long long int accountId, long long int date) : Transaction(id, value, description, receipt, accountId,
+																		   date) {}
+																		   
+		Money getAdjustedMoney() override {
+			return value * -1;
+		}
+	};
 }
 
-#endif //BUDGET_EARNING_H
+#endif //BUDGET_PAYMENT_H

src/models/transaction.h

@@ -9,9 +9,16 @@
 
 namespace Budget::Models {
 	class Transaction {
+	public:
+		Transaction(long long int id, const Money &value, std::string description, std::string receipt,
+					long long int accountId, long long int date) : id(id), value(value), description(std::move(description)),
+																   receipt(std::move(receipt)), accountId(accountId), date(date) {};
+		
+		virtual Money getAdjustedMoney() = 0;
+	
 	public:
 		long long int id;
-		long double value;
+		Money value;
 		std::string description;
 		std::string receipt;
 		long long int accountId;

src/optHandlers/accountOperation.cpp

@@ -9,12 +9,34 @@
 
 #include <utility>
 #include <iostream>
+#include <memory>
+#include <algorithm>
 
 using namespace Budget::OptHandlers;
 
 void AccountOperation::commit() {
 	Budget::Models::Account account = Database::getAccount(accountName, db);
 	
+	if (!flags.value && !flags.forceDel && !flags.del && flags.description.empty()) {
+		std::list<Models::Earning> earnings = Database::getEarnings(&account, 5, 8, db);
+		std::list<Models::Payment> payments = Database::getPayments(&account, 5, 8, db);
+		
+		std::list<std::unique_ptr<Models::Transaction>> mergedList;
+		for (Models::Earning &earning : earnings) {
+			mergedList.push_back(std::make_unique<Models::Earning>(earning));
+		}
+		for (Models::Payment &payment : payments) {
+			mergedList.push_back(std::make_unique<Models::Payment>(payment));
+		}
+		mergedList.sort([](const std::unique_ptr<Models::Transaction>& a, const std::unique_ptr<Models::Transaction>& b) {
+			return a->date < b->date;
+		});
+		
+		std::cout << "Account: " << account.name << std::endl;
+		std::cout << std::string(account.name.size()+9, '-') << std::endl;
+		
+		
+	}
 	
 	if (flags.value) {
 		if (account.cachedValue == nullptr) {

src/optHandlers/earnOperation.cpp

@@ -22,12 +22,12 @@ void EarnOperation::commit() {
 				extension = flags.receipt.substr(pos);
 			}
 			
-			std::ofstream dest(storageD + "receipts/receipt/" + std::to_string(account.id) + extension, std::ios::binary);
+			std::ofstream dest(storageD + "receipts/receipt/" + std::to_string(account.id) + extension,
+							   std::ios::binary);
 			dest << source.rdbuf();
 			source.close();
 			dest.close();
-		}
+		} else {
-		else {
 			throw Exceptions::BadValue("File " + flags.receipt + " does not exist");
 		}
 	}

src/optHandlers/paymentOperation.cpp

@@ -22,12 +22,12 @@ void PaymentOperation::commit() {
 				extension = flags.receipt.substr(pos);
 			}
 			
-			std::ofstream dest(storageD + "receipts/receipt/" + std::to_string(account.id) + extension, std::ios::binary);
+			std::ofstream dest(storageD + "receipts/receipt/" + std::to_string(account.id) + extension,
+							   std::ios::binary);
 			dest << source.rdbuf();
 			source.close();
 			dest.close();
-		}
+		} else {
-		else {
 			throw Exceptions::BadValue("File " + flags.receipt + " does not exist");
 		}
 	}