From a4a631917577b950ce2879027a42a60dbbe567ae Mon Sep 17 00:00:00 2001 From: Stephen Ngozi Date: Mon, 9 Feb 2026 06:35:23 +0100 Subject: [PATCH 1/2] Add Rust project files and .gitignore --- .../Stephen-Ngozi-Merkle-Tree/.gitignore | 1 + .../Stephen-Ngozi-Merkle-Tree/Cargo.lock | 7 ++ .../Stephen-Ngozi-Merkle-Tree/Cargo.toml | 6 ++ .../Stephen-Ngozi-Merkle-Tree/src/main.rs | 80 +++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/.gitignore create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.lock create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.toml create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/.gitignore b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/.gitignore new file mode 100644 index 0000000..c41cc9e --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/.gitignore @@ -0,0 +1 @@ +/target \ No newline at end of file diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.lock b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.lock new file mode 100644 index 0000000..ae2415d --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "Stephen-Ngozi-Merkle-Tree" +version = "0.1.0" diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.toml b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.toml new file mode 100644 index 0000000..0587fb5 --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "Stephen-Ngozi-Merkle-Tree" +version = "0.1.0" +edition = "2024" + +[dependencies] diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs new file mode 100644 index 0000000..a544e80 --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs @@ -0,0 +1,80 @@ +use std::{collections::HashMap, io}; + +// Expense tracker +// Add the expenses +// Remove +// Update +// View + +// Hashmaps +// structs +// enums +// Hashmaps + +#[derive(Debug, Clone)] +enum TransactionType { + Credit, + Debit, +} +#[derive(Debug, Clone)] +struct Expense { + id: u8, + name: String, + amount: f64, + tx_type: TransactionType, +} + +struct ExpenseTracker { + values: HashMap, + next_id: u8, +} + +impl ExpenseTracker { + fn new() -> Self { + Self { + values: HashMap::new(), + next_id: 1, + } + } + + fn add(&mut self, name: String, amount: f64, tx_type: TransactionType) -> Expense { + let current_id = self.next_id; + let new_expense = Expense { + id: current_id, + name, + amount, + tx_type, + }; + self.values.insert(current_id, new_expense.clone()); + self.next_id += 1; + new_expense + } + + fn view_all(&self) -> Vec<&Expense> { + self.values.values().collect() + } + + fn update(&mut self, id: u8, amount: f64, tx_type: TransactionType) -> bool { + match self.values.get_mut(&id) { + Some(exp) => { + exp.amount = amount; + exp.tx_type = tx_type; + true + } + None => false, + } + // let updated_expense = Expense { + // id, + // amount, + // tx_type, + // }; + // self.values.put(id) + } + + fn delete(&mut self, id: u8) -> bool { + self.values.remove(&id).is_some() + } +} +fn main() { + println!("Hello, world!"); +} From ad4803bb6d7922b3f52a361d1f35144e07ee8902 Mon Sep 17 00:00:00 2001 From: Stephen Ngozi Date: Mon, 9 Feb 2026 10:37:03 +0100 Subject: [PATCH 2/2] Initialize Week 2 Day 5 Assignment - Stephen Ngozi --- .../Stephen-Ngozi-Merkle-Tree/src/expense.rs | 17 ++ .../Stephen-Ngozi-Merkle-Tree/src/main.rs | 209 +++++++++++------- .../Stephen-Ngozi-Merkle-Tree/src/tracker.rs | 84 +++++++ .../stephen_expences.txt | 2 + 4 files changed, 238 insertions(+), 74 deletions(-) create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/expense.rs create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/tracker.rs create mode 100644 submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/stephen_expences.txt diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/expense.rs b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/expense.rs new file mode 100644 index 0000000..986fe5d --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/expense.rs @@ -0,0 +1,17 @@ + + +#[derive(Debug, Clone)] +pub enum TransactionType { + Credit, + Debit, +} + + + +#[derive(Debug, Clone)] +pub struct Expense { + pub id: u8, + pub name: String, + pub amount: f64, + pub tx_type: TransactionType, +} \ No newline at end of file diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs index a544e80..eec5b9f 100644 --- a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/main.rs @@ -1,80 +1,141 @@ -use std::{collections::HashMap, io}; - -// Expense tracker -// Add the expenses -// Remove -// Update -// View - -// Hashmaps -// structs -// enums -// Hashmaps - -#[derive(Debug, Clone)] -enum TransactionType { - Credit, - Debit, -} -#[derive(Debug, Clone)] -struct Expense { - id: u8, - name: String, - amount: f64, - tx_type: TransactionType, -} +mod expense; +mod tracker; + +use std::io; +use expense::TransactionType; +use tracker::ExpenseTracker; + -struct ExpenseTracker { - values: HashMap, - next_id: u8, + + +fn print_menu() { + println!("\n=== Expense Tracker ==="); + println!("1 - Add Expense"); + println!("2 - View Expenses"); + println!("3 - Update Expense"); + println!("4 - Delete Expense"); + println!("q - Quit"); } +fn main() { + // println!("Hello, world!"); -impl ExpenseTracker { - fn new() -> Self { - Self { - values: HashMap::new(), - next_id: 1, - } - } - - fn add(&mut self, name: String, amount: f64, tx_type: TransactionType) -> Expense { - let current_id = self.next_id; - let new_expense = Expense { - id: current_id, - name, - amount, - tx_type, - }; - self.values.insert(current_id, new_expense.clone()); - self.next_id += 1; - new_expense - } - - fn view_all(&self) -> Vec<&Expense> { - self.values.values().collect() - } - - fn update(&mut self, id: u8, amount: f64, tx_type: TransactionType) -> bool { - match self.values.get_mut(&id) { - Some(exp) => { - exp.amount = amount; - exp.tx_type = tx_type; - true + let mut tracker = ExpenseTracker::new(); + + loop { + print_menu(); + + let mut input = String::new(); + io::stdin().read_line(&mut input).expect("Failed"); + let input = input.trim(); + + + if input == "q" { + println!("Are you sure you want to quit? (y/n)"); + let mut confirm = String::new(); + io::stdin().read_line(&mut confirm).expect("Failed "); + let confirm = confirm.trim(); + + if confirm == "y" { + tracker.save_to_file("stephen_expences.txt"); + println!("Data saved to stephen_expences.txt"); + println!("Bye bye go home!"); + break; + } + }else if input == "1" { + println!("Enter expense name:"); + let mut name = String::new(); + io::stdin().read_line(&mut name).expect("Failed to read input"); + let name = name.trim().to_string(); + + println!("Enter amount:"); + let mut amount_input = String::new(); + io::stdin().read_line(&mut amount_input).expect("Failed to read input"); + let amount: f64 = amount_input.trim().parse().expect("Please enter a valid number"); + + println!("Is this Credit or Debit? (c/d):"); + let mut tx_input = String::new(); + io::stdin().read_line(&mut tx_input).expect("Failed to read input"); + let tx_input = tx_input.trim(); + + let tx_type = if tx_input == "c" { + TransactionType::Credit + } else { + TransactionType::Debit + }; + + let new_expense = tracker.add(name, amount, tx_type); + println!(" Expense added successfully!"); + println!("ID: {}, Name: {}, Amount: ${:.2}, Type: {:?}", + new_expense.id, new_expense.name, new_expense.amount, new_expense.tx_type); + }else if input == "2" { + let expenses = tracker.view_all(); + + if expenses.is_empty() { + println!("No Expenses in the Tracker"); + } else { + println!("All Expenses"); + for expense in expenses { + println!("ID: {} | Name: {} | Amount: Naria{:.2} | Type: {:?}", + expense.id, expense.name, expense.amount, expense.tx_type); + } + } + } else if input == "3" { + println!("Enter the ID of the Expence"); + + let mut new_id_input = String::new(); + + io::stdin().read_line(&mut new_id_input).expect("Failed to read input"); + let id: u8 = new_id_input.trim().parse().expect("Please enter a valid ID"); + + + + println!("Enter new amount:"); + let mut amount_input = String::new(); + io::stdin().read_line(&mut amount_input).expect("Failed to read input"); + let amount: f64 = amount_input.trim().parse().expect("Please enter a valid number"); + + println!("Is this Credit or Debit? (c/d):"); + let mut tx_input = String::new(); + io::stdin().read_line(&mut tx_input).expect("Failed to read input"); + let tx_input = tx_input.trim(); + + let tx_type = if tx_input == "c" { + TransactionType::Credit + } else { + TransactionType::Debit + }; + + if tracker.update(id, amount, tx_type){ + println!("Expense Updated Successfu"); + + if let Some(expense) = tracker.values.get(&id) { + println!("ID: {}, Name: {}, Amount: Naria{:.2}, Type: {:?}", + expense.id, expense.name, expense.amount, expense.tx_type); + }else { + println!("Expense with ID {} not found!", id); + + } + } + }else if input == "4" { + println!("Enter the ID of the expense you to delete:"); + + let mut id_input = String::new(); + + io::stdin().read_line(&mut id_input).expect("Failed to read input"); + let id: u8 = id_input.trim().parse().expect("Please enter a valid ID"); + + if tracker.delete(id){ + println!(" Your Expence is Deleted "); + }else { + println!("Expense with ID {} not found!", id); + } + }else { + println!("Invalid choice. Please try again."); } - None => false, + + + + } - // let updated_expense = Expense { - // id, - // amount, - // tx_type, - // }; - // self.values.put(id) - } - - fn delete(&mut self, id: u8) -> bool { - self.values.remove(&id).is_some() - } -} -fn main() { - println!("Hello, world!"); + } diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/tracker.rs b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/tracker.rs new file mode 100644 index 0000000..d454c42 --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/src/tracker.rs @@ -0,0 +1,84 @@ +use std::{collections::HashMap,fs::File,io::Write}; +use crate::expense::{Expense, TransactionType}; + + +// Expense tracker +// Add the expenses +// Remove +// Update +// View + +// Hashmaps +// structs +// enums +// Hashmaps + + + + +pub struct ExpenseTracker { + pub values: HashMap, + pub next_id: u8, +} + +impl ExpenseTracker { + pub fn new() -> Self { + Self { + values: HashMap::new(), + next_id: 1, + } + } + + pub fn add(&mut self, name: String, amount: f64, tx_type: TransactionType) -> Expense { + let current_id = self.next_id; + let new_expense = Expense { + id: current_id, + name, + amount, + tx_type, + }; + self.values.insert(current_id, new_expense.clone()); + self.next_id += 1; + new_expense + } + + pub fn view_all(&self) -> Vec<&Expense> { + let mut expenses: Vec<&Expense> = self.values.values().collect(); + + expenses.sort_by(|a, b|{a.id.cmp(&b.id)}); + expenses + + } + + pub fn update(&mut self, id: u8, amount: f64, tx_type: TransactionType) -> bool { + match self.values.get_mut(&id) { + Some(exp) => { + exp.amount = amount; + exp.tx_type = tx_type; + true + } + None => false, + } + // let updated_expense = Expense { + // id, + // amount, + // tx_type, + // }; + // self.values.put(id) + } + + pub fn delete(&mut self, id: u8) -> bool { + self.values.remove(&id).is_some() + } + + + pub fn save_to_file(&self, filename: &str) { + let mut file = File::create(filename).expect("Could not create file"); + + for expense in self.values.values() { + let line = format!("ID: {}, Name: {}, Amount: {:.2}, Type: {:?}\n", + expense.id, expense.name, expense.amount, expense.tx_type); + file.write_all(line.as_bytes()).expect("Could not write to file"); + } + } +} \ No newline at end of file diff --git a/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/stephen_expences.txt b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/stephen_expences.txt new file mode 100644 index 0000000..15371be --- /dev/null +++ b/submissions/week-2/day-5/Stephen-Ngozi-Merkle-Tree/stephen_expences.txt @@ -0,0 +1,2 @@ +ID: 2, Name: Beans, Amount: 5000.00, Type: Credit +ID: 1, Name: Rice, Amount: 20000.00, Type: Credit