Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

US-14 Merchant Invoices Index #43

Merged
merged 14 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/controllers/merchant_invoices_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class MerchantInvoicesController < ApplicationController
def index
@merchant = Merchant.find(params[:merchant_id])
@invoices = Invoice.invoices_for_merchant(@merchant.id)
end

def show

end
end
4 changes: 4 additions & 0 deletions app/models/invoice.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ class Invoice < ApplicationRecord
enum status: ["completed", "cancelled", "in progress"]

validates :status, presence: true

def self.invoices_for_merchant(merchant_id)
select("invoices.*").joins(invoice_items: :item).where("merchant_id = ?", merchant_id)
end
end
6 changes: 6 additions & 0 deletions app/views/merchant_invoices/index.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<%= @merchant.name %>
<p>My Invoices</p>

<% @invoices.each do |invoice| %>
<%= link_to "Invoice ##{invoice.id}", merchant_invoice_path(@merchant, invoice) %>
<% end %>
Empty file.
6 changes: 3 additions & 3 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
get "/", to: "dashboards#welcome"
end

resources :merchants, param: :merchant_id do
resources :items, only: [:index]
resources :invoices, only: [:index]
resources :merchants, param: :id do
resources :items, controller: "merchant_items", only: [:index]
resources :invoices, controller: "merchant_invoices", only: [:index, :show]
get "dashboard", on: :member, action: :show
end
end
2 changes: 1 addition & 1 deletion spec/factories/customers.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'faker'
require "faker"

FactoryBot.define do
factory :customer do
Expand Down
6 changes: 5 additions & 1 deletion spec/factories/invoice_items.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
FactoryBot.define do
factory :invoice_item do
quantity { rand(1..10) }
status { rand(0..2)}
unit_price {item.unit_price }
status { rand(0..2) }

association :item, factory: :item
association :invoice, factory: :invoice
end
end
2 changes: 2 additions & 0 deletions spec/factories/invoices.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FactoryBot.define do
factory :invoice do
status { rand(0..2) }

association :customer, factory: :customer
end
end
6 changes: 4 additions & 2 deletions spec/factories/items.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
require 'faker'
require "faker"

FactoryBot.define do
factory :item do
name { Faker::Commerce.product_name }
description { Faker::Commerce.material }
unit_price { Faker::Commerce.price }
status { rand(0..1)}
status { rand(0..1) }

association :merchant, factory: :merchant
end
end
2 changes: 1 addition & 1 deletion spec/factories/merchants.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'faker'
require "faker"

FactoryBot.define do
factory :merchant do
Expand Down
10 changes: 6 additions & 4 deletions spec/factories/transactions.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
require 'faker'
require "faker"

FactoryBot.define do
factory :transaction do
credit_card_number { Faker::Business.credit_card_number.delete('-') }
credit_card_expiration_date { "0#{rand(1..9)}/#{25..28}" }
result { rand(0..1)}
credit_card_number { Faker::Business.credit_card_number.delete("-") }
credit_card_expiration_date { "0#{rand(1..9)}/#{rand(25..28)}" }
result { rand(0..1) }

association :invoice, factory: :invoice
end
end
16 changes: 0 additions & 16 deletions spec/features/invoices/index_spec.rb

This file was deleted.

51 changes: 51 additions & 0 deletions spec/features/merchants/invoices/index_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
require "rails_helper"

RSpec.describe "Merchant Invoices Index", type: :feature do
describe "When a user visits merchant's invoices index, there is information" do
before(:each) do
@merchant_1 = create(:merchant)
@item_1 = create(:item, merchant: @merchant_1)

@invoices_with_item = []
@invoices_without_item = []

3.times do
customer = create(:customer)

invoice_with = create(:invoice, customer: customer)
create(:invoice_item, item: @item_1, invoice: invoice_with)
@invoices_with_item << invoice_with

invoice_without = create(:invoice, customer: customer)
create(:invoice_item, invoice: invoice_with)
@invoices_without_item << invoice_without
end
end

it "They see all invoices with at least one of merchant's items" do
visit merchant_invoices_path(@merchant_1)

expect(page).to have_content(@merchant_1.name)
expect(page).to have_content("My Invoices", count: 1)

@invoices_with_item.each do |invoice|
expect(page).to have_content("Invoice ##{invoice.id}")
end

@invoices_without_item.each do |invoice|
expect(page).to_not have_content("Invoice ##{invoice.id}")
end
end

it "They see each invoice links to the merchant invoice show page" do
visit merchant_invoices_path(@merchant_1)

@invoices_with_item.each do |invoice|
click_link("Invoice ##{invoice.id}")
expect(current_path).to eq(merchant_invoice_path(@merchant_1, invoice))
visit merchant_invoices_path(@merchant_1)
end
end
end

end
22 changes: 22 additions & 0 deletions spec/models/invoice_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,26 @@
)
}
end

describe 'class methods' do
before(:each) do
@merchant_1 = create(:merchant)
@item_1 = create(:item, merchant: @merchant_1)
@customer_1 = create(:customer)

@invoice_1 = create(:invoice, customer: @customer_1)
create(:invoice_item, item: @item_1, invoice: @invoice_1)
@invoice_2 = create(:invoice, customer: @customer_1)
create(:invoice_item, item: @item_1, invoice: @invoice_2)
@invoice_3 = create(:invoice, customer: @customer_1)
create(:invoice_item, invoice: @invoice_3)
end

describe '.invoices_for_merchant' do
it 'returns list of invoices for a specific merchant id' do
expect(Invoice.invoices_for_merchant(@merchant_1.id)).to eq([@invoice_1, @invoice_2])
end
end
end

end