Granularity

Author: wichtounet

src/api/retirement_api.cpp

@@ -20,18 +20,18 @@
 using namespace budget;
 
 void budget::retirement_countdown_api(const httplib::Request& req, httplib::Response& res) {
-    if (auto fi_expenses = budget::get_fi_expenses()){
+    if (auto fi_expenses = budget::get_fi_expenses()) {
         data_cache cache;
 
         const auto nw           = get_fi_net_worth(cache);
         const auto savings_rate = running_savings_rate(cache);
         const auto income       = running_income(cache);
 
-        const auto currency     = get_default_currency();
-        const auto wrate        = to_number<double>(internal_config_value("withdrawal_rate"));
-        const auto roi          = to_number<double>(internal_config_value("expected_roi"));
-        const auto years        = double(100.0 / wrate);
-        const auto fi_goal         = years * fi_expenses;
+        const auto currency = get_default_currency();
+        const auto wrate    = to_number<double>(internal_config_value("withdrawal_rate"));
+        const auto roi      = to_number<double>(internal_config_value("expected_roi"));
+        const auto years    = double(100.0 / wrate);
+        const auto fi_goal  = years * fi_expenses;
 
         date_type fi_base_months = 0;
         {
@@ -47,12 +47,30 @@ void budget::retirement_countdown_api(const httplib::Request& req, httplib::Resp
         if (nw > fi_goal) {
             api_success_content(req, res, "You are FI!");
         } else {
-            // TODO Add days granularity 
-
-            const auto missing_years = unsigned(fi_base_months / 12);
+            // Years and months, we get from the base months
+            const auto missing_years  = unsigned(fi_base_months / 12);
             const auto missing_months = unsigned(fi_base_months - (missing_years * 12));
 
-            auto result = std::format("{} years, {} months", missing_years, missing_months);
+            // Days until the end of the month
+            const auto missing_days = budget::local_day().end_of_month().day().value - budget::local_day().day().value;
+
+            // Hours/Minutes/Seconds until the end of the day
+            const auto                  now  = std::chrono::system_clock::now();
+            const auto                  zone = std::chrono::current_zone();
+            const auto                  time = zone->to_local(now);
+            const std::chrono::hh_mm_ss hms{time - std::chrono::floor<std::chrono::days>(time)};
+
+            const auto missing_hours   = 24 - hms.hours().count();
+            const auto missing_minutes = 60 - hms.minutes().count();
+            const auto missing_seconds = 60 - hms.seconds().count();
+
+            auto result = std::format("{} years, {} months, {} days, {} hours, {} minutes, {} seconds",
+                                      missing_years,
+                                      missing_months,
+                                      missing_days,
+                                      missing_hours,
+                                      missing_minutes,
+                                      missing_seconds);
 
             api_success_content(req, res, result);
         }