<%= render partial: "shared/total", locals: { total: total_annual_cost / 4 } %>
-
<%= humanized_money_with_symbol((income.quarterly_income) - total_annual_cost / 4) %>
Biannual
<%= render partial: "shared/total", locals: { total: total_annual_cost / 2 } %>
-
0
-
0
+
<%= humanized_money_with_symbol(investing_amount.biannual_saving) %>
+
<%= humanized_money_with_symbol(savings_amount.biannual_saving) %>
<%= humanized_money_with_symbol((income.biannual_income) - total_annual_cost / 2) %>
@@ -62,8 +67,8 @@
Annually
<%= render partial: "shared/total", locals: { total: total_annual_cost } %>
-
0
-
0
+
<%= humanized_money_with_symbol(investing_amount.annual_saving) %>
+
<%= humanized_money_with_symbol(savings_amount.annual_saving) %>
<%= humanized_money_with_symbol(income.total_net_income - total_annual_cost ) %>
diff --git a/config/routes.rb b/config/routes.rb
index d07e0e3..0fca9f2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
Rails.application.routes.draw do
+ resources :savings_rates
resources :federal_tax_brackets
resources :fixed_expenses
root "dashboard#index"
diff --git a/db/migrate/20231117231745_create_savings_rates.rb b/db/migrate/20231117231745_create_savings_rates.rb
new file mode 100644
index 0000000..f26953d
--- /dev/null
+++ b/db/migrate/20231117231745_create_savings_rates.rb
@@ -0,0 +1,10 @@
+class CreateSavingsRates < ActiveRecord::Migration[7.0]
+ def change
+ create_table :savings_rates do |t|
+ t.string :name
+ t.float :rate
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4c2a184..98d2dd2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2023_06_11_195916) do
+ActiveRecord::Schema[7.0].define(version: 2023_11_17_231745) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -50,4 +50,11 @@
t.datetime "updated_at", null: false
end
+ create_table "savings_rates", force: :cascade do |t|
+ t.string "name"
+ t.float "rate"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
end
diff --git a/spec/factories/savings_rates.rb b/spec/factories/savings_rates.rb
new file mode 100644
index 0000000..b1b36d7
--- /dev/null
+++ b/spec/factories/savings_rates.rb
@@ -0,0 +1,16 @@
+# == Schema Information
+#
+# Table name: savings_rates
+#
+# id :bigint not null, primary key
+# name :string
+# rate :float
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+FactoryBot.define do
+ factory :savings_rate do
+ name { "savings" }
+ rate { 1.5 }
+ end
+end
diff --git a/spec/features/dashboard/dashboard_spec.rb b/spec/features/dashboard/dashboard_spec.rb
index 6c1fdf1..7283ba2 100644
--- a/spec/features/dashboard/dashboard_spec.rb
+++ b/spec/features/dashboard/dashboard_spec.rb
@@ -7,6 +7,8 @@
let!(:fed2) { create(:federal_tax_bracket, :tier_2) }
let!(:fed3) { create(:federal_tax_bracket, :tier_3) }
let!(:fixed_expenses) { create_list(:fixed_expense, 2) }
+ let!(:saving_rate) { create(:savings_rate) }
+ let!(:investing_rate) { create(:savings_rate, name: "investing", rate: 0.02) }
describe "GET /index" do
it "routes to root path" do
diff --git a/spec/helpers/savings_rates_helper_spec.rb b/spec/helpers/savings_rates_helper_spec.rb
new file mode 100644
index 0000000..2f2bf94
--- /dev/null
+++ b/spec/helpers/savings_rates_helper_spec.rb
@@ -0,0 +1,15 @@
+require "rails_helper"
+
+# Specs in this file have access to a helper object that includes
+# the SavingsRatesHelper. For example:
+#
+# describe SavingsRatesHelper do
+# describe "string concat" do
+# it "concats two strings with spaces" do
+# expect(helper.concat_strings("this","that")).to eq("this that")
+# end
+# end
+# end
+RSpec.describe SavingsRatesHelper, type: :helper do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/savings_rate_spec.rb b/spec/models/savings_rate_spec.rb
new file mode 100644
index 0000000..7928deb
--- /dev/null
+++ b/spec/models/savings_rate_spec.rb
@@ -0,0 +1,15 @@
+# == Schema Information
+#
+# Table name: savings_rates
+#
+# id :bigint not null, primary key
+# name :string
+# rate :float
+# created_at :datetime not null
+# updated_at :datetime not null
+#
+require "rails_helper"
+
+RSpec.describe SavingsRate, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/requests/savings_rates_spec.rb b/spec/requests/savings_rates_spec.rb
new file mode 100644
index 0000000..442165b
--- /dev/null
+++ b/spec/requests/savings_rates_spec.rb
@@ -0,0 +1,130 @@
+require "rails_helper"
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to test the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator. If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails. There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+
+RSpec.describe "/savings_rates", type: :request do
+ # This should return the minimal set of attributes required to create a valid
+ # SavingsRate. As you add validations to SavingsRate, be sure to
+ # adjust the attributes here as well.
+ let(:valid_attributes) {
+ skip("Add a hash of attributes valid for your model")
+ }
+
+ let(:invalid_attributes) {
+ skip("Add a hash of attributes invalid for your model")
+ }
+
+ describe "GET /index" do
+ it "renders a successful response" do
+ SavingsRate.create! valid_attributes
+ get savings_rates_url
+ expect(response).to be_successful
+ end
+ end
+
+ describe "GET /show" do
+ it "renders a successful response" do
+ savings_rate = SavingsRate.create! valid_attributes
+ get savings_rate_url(savings_rate)
+ expect(response).to be_successful
+ end
+ end
+
+ describe "GET /new" do
+ it "renders a successful response" do
+ get new_savings_rate_url
+ expect(response).to be_successful
+ end
+ end
+
+ describe "GET /edit" do
+ it "renders a successful response" do
+ savings_rate = SavingsRate.create! valid_attributes
+ get edit_savings_rate_url(savings_rate)
+ expect(response).to be_successful
+ end
+ end
+
+ describe "POST /create" do
+ context "with valid parameters" do
+ it "creates a new SavingsRate" do
+ expect {
+ post savings_rates_url, params: {savings_rate: valid_attributes}
+ }.to change(SavingsRate, :count).by(1)
+ end
+
+ it "redirects to the created savings_rate" do
+ post savings_rates_url, params: {savings_rate: valid_attributes}
+ expect(response).to redirect_to(savings_rate_url(SavingsRate.last))
+ end
+ end
+
+ context "with invalid parameters" do
+ it "does not create a new SavingsRate" do
+ expect {
+ post savings_rates_url, params: {savings_rate: invalid_attributes}
+ }.to change(SavingsRate, :count).by(0)
+ end
+
+ it "renders a response with 422 status (i.e. to display the 'new' template)" do
+ post savings_rates_url, params: {savings_rate: invalid_attributes}
+ expect(response).to have_http_status(:unprocessable_entity)
+ end
+ end
+ end
+
+ describe "PATCH /update" do
+ context "with valid parameters" do
+ let(:new_attributes) {
+ skip("Add a hash of attributes valid for your model")
+ }
+
+ it "updates the requested savings_rate" do
+ savings_rate = SavingsRate.create! valid_attributes
+ patch savings_rate_url(savings_rate), params: {savings_rate: new_attributes}
+ savings_rate.reload
+ skip("Add assertions for updated state")
+ end
+
+ it "redirects to the savings_rate" do
+ savings_rate = SavingsRate.create! valid_attributes
+ patch savings_rate_url(savings_rate), params: {savings_rate: new_attributes}
+ savings_rate.reload
+ expect(response).to redirect_to(savings_rate_url(savings_rate))
+ end
+ end
+
+ context "with invalid parameters" do
+ it "renders a response with 422 status (i.e. to display the 'edit' template)" do
+ savings_rate = SavingsRate.create! valid_attributes
+ patch savings_rate_url(savings_rate), params: {savings_rate: invalid_attributes}
+ expect(response).to have_http_status(:unprocessable_entity)
+ end
+ end
+ end
+
+ describe "DELETE /destroy" do
+ it "destroys the requested savings_rate" do
+ savings_rate = SavingsRate.create! valid_attributes
+ expect {
+ delete savings_rate_url(savings_rate)
+ }.to change(SavingsRate, :count).by(-1)
+ end
+
+ it "redirects to the savings_rates list" do
+ savings_rate = SavingsRate.create! valid_attributes
+ delete savings_rate_url(savings_rate)
+ expect(response).to redirect_to(savings_rates_url)
+ end
+ end
+end
diff --git a/spec/routing/savings_rates_routing_spec.rb b/spec/routing/savings_rates_routing_spec.rb
new file mode 100644
index 0000000..d30e805
--- /dev/null
+++ b/spec/routing/savings_rates_routing_spec.rb
@@ -0,0 +1,37 @@
+require "rails_helper"
+
+RSpec.describe SavingsRatesController, type: :routing do
+ describe "routing" do
+ it "routes to #index" do
+ expect(get: "/savings_rates").to route_to("savings_rates#index")
+ end
+
+ it "routes to #new" do
+ expect(get: "/savings_rates/new").to route_to("savings_rates#new")
+ end
+
+ it "routes to #show" do
+ expect(get: "/savings_rates/1").to route_to("savings_rates#show", id: "1")
+ end
+
+ it "routes to #edit" do
+ expect(get: "/savings_rates/1/edit").to route_to("savings_rates#edit", id: "1")
+ end
+
+ it "routes to #create" do
+ expect(post: "/savings_rates").to route_to("savings_rates#create")
+ end
+
+ it "routes to #update via PUT" do
+ expect(put: "/savings_rates/1").to route_to("savings_rates#update", id: "1")
+ end
+
+ it "routes to #update via PATCH" do
+ expect(patch: "/savings_rates/1").to route_to("savings_rates#update", id: "1")
+ end
+
+ it "routes to #destroy" do
+ expect(delete: "/savings_rates/1").to route_to("savings_rates#destroy", id: "1")
+ end
+ end
+end
diff --git a/spec/views/savings_rates/edit.html.tailwindcss_spec.rb b/spec/views/savings_rates/edit.html.tailwindcss_spec.rb
new file mode 100644
index 0000000..430e9ff
--- /dev/null
+++ b/spec/views/savings_rates/edit.html.tailwindcss_spec.rb
@@ -0,0 +1,19 @@
+require "rails_helper"
+
+RSpec.describe "savings_rates/edit", type: :view do
+ let(:savings_rate) { create(:savings_rate) }
+
+ before(:each) do
+ assign(:savings_rate, savings_rate)
+ end
+
+ it "renders the edit savings_rate form" do
+ render
+
+ assert_select "form[action=?][method=?]", savings_rate_path(savings_rate), "post" do
+ assert_select "input[name=?]", "savings_rate[name]"
+
+ assert_select "input[name=?]", "savings_rate[rate]"
+ end
+ end
+end
diff --git a/spec/views/savings_rates/index.html.tailwindcss_spec.rb b/spec/views/savings_rates/index.html.tailwindcss_spec.rb
new file mode 100644
index 0000000..873e010
--- /dev/null
+++ b/spec/views/savings_rates/index.html.tailwindcss_spec.rb
@@ -0,0 +1,23 @@
+require "rails_helper"
+
+RSpec.describe "savings_rates/index", type: :view do
+ before(:each) do
+ assign(:savings_rates, [
+ SavingsRate.create!(
+ name: "savings",
+ rate: 2.5
+ ),
+ SavingsRate.create!(
+ name: "investing",
+ rate: 2.5
+ )
+ ])
+ end
+
+ it "renders a list of savings_rates" do
+ render
+ cell_selector = (Rails::VERSION::STRING >= "7") ? "div>p" : "tr>td"
+ assert_select cell_selector, text: Regexp.new("Name".to_s), count: 2
+ assert_select cell_selector, text: Regexp.new(2.5.to_s), count: 2
+ end
+end
diff --git a/spec/views/savings_rates/new.html.tailwindcss_spec.rb b/spec/views/savings_rates/new.html.tailwindcss_spec.rb
new file mode 100644
index 0000000..16f6ed9
--- /dev/null
+++ b/spec/views/savings_rates/new.html.tailwindcss_spec.rb
@@ -0,0 +1,20 @@
+require "rails_helper"
+
+RSpec.describe "savings_rates/new", type: :view do
+ before(:each) do
+ assign(:savings_rate, SavingsRate.new(
+ name: "investing",
+ rate: 1.5
+ ))
+ end
+
+ it "renders new savings_rate form" do
+ render
+
+ assert_select "form[action=?][method=?]", savings_rates_path, "post" do
+ assert_select "input[name=?]", "savings_rate[name]"
+
+ assert_select "input[name=?]", "savings_rate[rate]"
+ end
+ end
+end
diff --git a/spec/views/savings_rates/show.html.tailwindcss_spec.rb b/spec/views/savings_rates/show.html.tailwindcss_spec.rb
new file mode 100644
index 0000000..cf3ae3b
--- /dev/null
+++ b/spec/views/savings_rates/show.html.tailwindcss_spec.rb
@@ -0,0 +1,16 @@
+require "rails_helper"
+
+RSpec.describe "savings_rates/show", type: :view do
+ before(:each) do
+ assign(:savings_rate, SavingsRate.create!(
+ name: "savings",
+ rate: 2.5
+ ))
+ end
+
+ it "renders attributes in
" do
+ render
+ expect(rendered).to match(/Name/)
+ expect(rendered).to match(/2.5/)
+ end
+end