Add extra bills tracking

app/controllers/extra_bills_controller.rb

@@ -0,0 +1,70 @@
+class ExtraBillsController < ApplicationController
+  before_action :set_extra_bill, only: %i[ show edit update destroy ]
+
+  # GET /extra_bills or /extra_bills.json
+  def index
+    @extra_bills = ExtraBill.all
+  end
+
+  # GET /extra_bills/1 or /extra_bills/1.json
+  def show
+  end
+
+  # GET /extra_bills/new
+  def new
+    @extra_bill = ExtraBill.new
+  end
+
+  # GET /extra_bills/1/edit
+  def edit
+  end
+
+  # POST /extra_bills or /extra_bills.json
+  def create
+    @extra_bill = ExtraBill.new(extra_bill_params)
+
+    respond_to do |format|
+      if @extra_bill.save
+        format.html { redirect_to extra_bill_url(@extra_bill), notice: "Extra bill was successfully created." }
+        format.json { render :show, status: :created, location: @extra_bill }
+      else
+        format.html { render :new, status: :unprocessable_entity }
+        format.json { render json: @extra_bill.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /extra_bills/1 or /extra_bills/1.json
+  def update
+    respond_to do |format|
+      if @extra_bill.update(extra_bill_params)
+        format.html { redirect_to extra_bill_url(@extra_bill), notice: "Extra bill was successfully updated." }
+        format.json { render :show, status: :ok, location: @extra_bill }
+      else
+        format.html { render :edit, status: :unprocessable_entity }
+        format.json { render json: @extra_bill.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /extra_bills/1 or /extra_bills/1.json
+  def destroy
+    @extra_bill.destroy
+
+    respond_to do |format|
+      format.html { redirect_to extra_bills_url, notice: "Extra bill was successfully destroyed." }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_extra_bill
+      @extra_bill = ExtraBill.find(params[:id])
+    end
+
+    # Only allow a list of trusted parameters through.
+    def extra_bill_params
+      params.require(:extra_bill).permit(:description, :amount, :deduct_autopaid)
+    end
+end

app/helpers/extra_bills_helper.rb

@@ -0,0 +1,2 @@
+module ExtraBillsHelper
+end

app/models/expense.rb

@@ -14,4 +14,12 @@ class Expense < ApplicationRecord
   def self.total
     Expense.sum(&:payment)
   end
+
+  def self.monthly_total
+    Expense.all.map(&:monthly).sum.round(2)
+  end
+
+  def self.autopaid_total
+    Expense.where(autopaid: true).map(&:monthly).sum.round(2)
+  end
 end

app/models/extra_bill.rb

@@ -0,0 +1,5 @@
+class ExtraBill < ApplicationRecord
+  def adjusted_amount
+    deduct_autopaid? ? amount - Expense.autopaid_total : amount
+  end
+end

app/models/member.rb

@@ -17,7 +17,7 @@ class Member < ApplicationRecord
     ((Income.total - others_included_income) / Income.total).round(2)
   end
 
-  def burden_amount
+  def burden_amount(total_amount: Expense.monthly_total)
-    burden_percent * Expense.all.map(&:monthly).sum.round(2)
+    burden_percent * total_amount
   end
 end

app/views/extra_bills/_extra_bill.html.erb

@@ -0,0 +1,53 @@
+<div id="<%= dom_id extra_bill %>">
+  <p class="my-5">
+    <strong class="block font-medium mb-1">Description:</strong>
+    <%= extra_bill.description %>
+  </p>
+
+  <p class="my-5">
+    <strong class="block font-medium mb-1">Amount:</strong>
+    <%= extra_bill.amount %>
+  </p>
+
+  <p class="my-5">
+    <strong class="block font-medium mb-1">Adjusted Amount:</strong>
+    <%= extra_bill.adjusted_amount %>
+  </p>
+
+  <p class="my-5">
+    <strong class="block font-medium mb-1">Accounted For:</strong>
+    <%= Expense.autopaid_total %>
+  </p>
+
+  <p class="my-5">
+    <strong class="block font-medium mb-1">Deduct autopaid:</strong>
+    <%= extra_bill.deduct_autopaid %>
+  </p>
+
+  <p class="my-5">
+    <table class="min-w-full mb-8">
+      <thead class="border-b">
+        <tr>
+          <th scope="col" class="text-sm font-medium text-gray-900 px-6 py-4 text-left">Member</th>
+          <th scope="col" class="text-sm font-medium text-gray-900 px-6 py-4 text-left">Burden Percent</th>
+          <th scope="col" class="text-sm font-medium text-gray-900 px-6 py-4 text-left">Burden Amount</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% Member.all.each do |member| %>
+          <tr class="even:bg-gray-50 border-b">
+            <td class="text-sm text-gray-900 font-light px-6 py-4 whitespace-nowrap"><%= member.name %></td>
+            <td class="text-sm text-gray-900 font-light px-6 py-4 whitespace-nowrap"><%= member.burden_percent * 100 %>%</td>
+            <td class="text-sm text-gray-900 font-light px-6 py-4 whitespace-nowrap"><%= number_to_currency(member.burden_amount(total_amount: extra_bill.adjusted_amount)) %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </p>
+
+  <% if action_name != "show" %>
+    <%= link_to "Show this extra bill", extra_bill, class: "rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+    <%= link_to 'Edit this extra bill', edit_extra_bill_path(extra_bill), class: "rounded-lg py-3 ml-2 px-5 bg-gray-100 inline-block font-medium" %>
+    <hr class="mt-6">
+  <% end %>
+</div>

app/views/extra_bills/_extra_bill.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! extra_bill, :id, :description, :amount, :deduct_autopaid, :created_at, :updated_at
+json.url extra_bill_url(extra_bill, format: :json)

app/views/extra_bills/_form.html.erb

@@ -0,0 +1,32 @@
+<%= form_with(model: extra_bill, class: "contents") do |form| %>
+  <% if extra_bill.errors.any? %>
+    <div id="error_explanation" class="bg-red-50 text-red-500 px-3 py-2 font-medium rounded-lg mt-3">
+      <h2><%= pluralize(extra_bill.errors.count, "error") %> prohibited this extra_bill from being saved:</h2>
+
+      <ul>
+        <% extra_bill.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="my-5">
+    <%= form.label :description %>
+    <%= form.text_field :description, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+  </div>
+
+  <div class="my-5">
+    <%= form.label :amount %>
+    <%= form.text_field :amount, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %>
+  </div>
+
+  <div class="my-5">
+    <%= form.label :deduct_autopaid %>
+    <%= form.check_box :deduct_autopaid, class: "block mt-2 h-5 w-5" %>
+  </div>
+
+  <div class="inline">
+    <%= form.submit class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
+  </div>
+<% end %>

app/views/extra_bills/edit.html.erb

@@ -0,0 +1,8 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <h1 class="font-bold text-4xl">Editing extra bill</h1>
+
+  <%= render "form", extra_bill: @extra_bill %>
+
+  <%= link_to "Show this extra bill", @extra_bill, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+  <%= link_to "Back to extra bills", extra_bills_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+</div>

app/views/extra_bills/index.html.erb

@@ -0,0 +1,14 @@
+<div class="w-full">
+  <% if notice.present? %>
+    <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%= notice %></p>
+  <% end %>
+
+  <div class="flex justify-between items-center">
+    <h1 class="font-bold text-4xl">Extra bills</h1>
+    <%= link_to 'New extra bill', new_extra_bill_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium" %>
+  </div>
+
+  <div id="extra_bills" class="min-w-full">
+    <%= render @extra_bills %>
+  </div>
+</div>

app/views/extra_bills/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @extra_bills, partial: "extra_bills/extra_bill", as: :extra_bill

app/views/extra_bills/new.html.erb

@@ -0,0 +1,7 @@
+<div class="mx-auto md:w-2/3 w-full">
+  <h1 class="font-bold text-4xl">New extra bill</h1>
+
+  <%= render "form", extra_bill: @extra_bill %>
+
+  <%= link_to 'Back to extra bills', extra_bills_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+</div>

app/views/extra_bills/show.html.erb

@@ -0,0 +1,15 @@
+<div class="mx-auto md:w-2/3 w-full flex">
+  <div class="mx-auto">
+    <% if notice.present? %>
+      <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%= notice %></p>
+    <% end %>
+
+    <%= render @extra_bill %>
+
+    <%= link_to 'Edit this extra_bill', edit_extra_bill_path(@extra_bill), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+    <div class="inline-block ml-2">
+      <%= button_to 'Destroy this extra_bill', extra_bill_path(@extra_bill), method: :delete, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %>
+    </div>
+    <%= link_to 'Back to extra_bills', extra_bills_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+  </div>
+</div>

app/views/extra_bills/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "extra_bills/extra_bill", extra_bill: @extra_bill

app/views/layouts/application.html.erb

@@ -16,6 +16,7 @@
       <ul class="flex">
         <li class="mr-6"><%= link_to "Dashboard", root_path, class: "text-white" %></li>
         <li class="mr-6"><%= link_to "Expenses", expenses_path, class: "text-white" %></li>
+        <li class="mr-6"><%= link_to "Extra Bills", extra_bills_path, class: "text-white" %></li>
         <li class="mr-6"><%= link_to "Incomes", incomes_path, class: "text-white" %></li>
         <li class="mr-6"><%= link_to "Members", members_path, class: "text-white" %></li>
       </ul>

config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  resources :extra_bills
   resource :dashboard, only: :show
   resources :incomes
   resources :members

db/migrate/20230224232804_create_extra_bills.rb

@@ -0,0 +1,11 @@
+class CreateExtraBills < ActiveRecord::Migration[7.0]
+  def change
+    create_table :extra_bills do |t|
+      t.string :description
+      t.decimal :amount
+      t.boolean :deduct_autopaid
+
+      t.timestamps
+    end
+  end
+end

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: 2022_11_20_205511) do
+ActiveRecord::Schema[7.0].define(version: 2023_02_24_232804) do
   create_table "expenses", force: :cascade do |t|
     t.string "description", default: "", null: false
     t.decimal "payment", precision: 8, scale: 2, default: "0.0", null: false
@@ -21,6 +21,14 @@ ActiveRecord::Schema[7.0].define(version: 2022_11_20_205511) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "extra_bills", force: :cascade do |t|
+    t.string "description"
+    t.decimal "amount"
+    t.boolean "deduct_autopaid"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "incomes", force: :cascade do |t|
     t.string "description", default: "", null: false
     t.boolean "included", default: true, null: false

test/controllers/extra_bills_controller_test.rb

@@ -0,0 +1,48 @@
+require "test_helper"
+
+class ExtraBillsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @extra_bill = extra_bills(:one)
+  end
+
+  test "should get index" do
+    get extra_bills_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_extra_bill_url
+    assert_response :success
+  end
+
+  test "should create extra_bill" do
+    assert_difference("ExtraBill.count") do
+      post extra_bills_url, params: { extra_bill: { amount: @extra_bill.amount, deduct_autopaid: @extra_bill.deduct_autopaid, description: @extra_bill.description } }
+    end
+
+    assert_redirected_to extra_bill_url(ExtraBill.last)
+  end
+
+  test "should show extra_bill" do
+    get extra_bill_url(@extra_bill)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_extra_bill_url(@extra_bill)
+    assert_response :success
+  end
+
+  test "should update extra_bill" do
+    patch extra_bill_url(@extra_bill), params: { extra_bill: { amount: @extra_bill.amount, deduct_autopaid: @extra_bill.deduct_autopaid, description: @extra_bill.description } }
+    assert_redirected_to extra_bill_url(@extra_bill)
+  end
+
+  test "should destroy extra_bill" do
+    assert_difference("ExtraBill.count", -1) do
+      delete extra_bill_url(@extra_bill)
+    end
+
+    assert_redirected_to extra_bills_url
+  end
+end

test/fixtures/extra_bills.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  description: MyString
+  amount: 9.99
+  deduct_autopaid: false
+
+two:
+  description: MyString
+  amount: 9.99
+  deduct_autopaid: false

test/models/extra_bill_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+class ExtraBillTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

test/system/extra_bills_test.rb

@@ -0,0 +1,45 @@
+require "application_system_test_case"
+
+class ExtraBillsTest < ApplicationSystemTestCase
+  setup do
+    @extra_bill = extra_bills(:one)
+  end
+
+  test "visiting the index" do
+    visit extra_bills_url
+    assert_selector "h1", text: "Extra bills"
+  end
+
+  test "should create extra bill" do
+    visit extra_bills_url
+    click_on "New extra bill"
+
+    fill_in "Amount", with: @extra_bill.amount
+    check "Deduct autopaid" if @extra_bill.deduct_autopaid
+    fill_in "Description", with: @extra_bill.description
+    click_on "Create Extra bill"
+
+    assert_text "Extra bill was successfully created"
+    click_on "Back"
+  end
+
+  test "should update Extra bill" do
+    visit extra_bill_url(@extra_bill)
+    click_on "Edit this extra bill", match: :first
+
+    fill_in "Amount", with: @extra_bill.amount
+    check "Deduct autopaid" if @extra_bill.deduct_autopaid
+    fill_in "Description", with: @extra_bill.description
+    click_on "Update Extra bill"
+
+    assert_text "Extra bill was successfully updated"
+    click_on "Back"
+  end
+
+  test "should destroy Extra bill" do
+    visit extra_bill_url(@extra_bill)
+    click_on "Destroy this extra bill", match: :first
+
+    assert_text "Extra bill was successfully destroyed"
+  end
+end