refactor payment#purchase method, improve environment variable names
This commit is contained in:
parent
c4d934d711
commit
f00e051eff
8 changed files with 64 additions and 39 deletions
|
|
@ -16,7 +16,7 @@ class PaymentsController < ApplicationController
|
||||||
@payment = Payment.new(payment_params)
|
@payment = Payment.new(payment_params)
|
||||||
@total_amount_to_pay = Ticket.total_price(@conference, current_user, paid: false)
|
@total_amount_to_pay = Ticket.total_price(@conference, current_user, paid: false)
|
||||||
|
|
||||||
if @payment.purchase(current_user, @conference, price_in_cents) && @payment.save
|
if @payment.purchase && @payment.save
|
||||||
update_purchased_ticket_purchases
|
update_purchased_ticket_purchases
|
||||||
redirect_to conference_conference_registration_path(@conference.short_title), flash: { success: 'Thanks! You have purchased your tickets successfully.' }
|
redirect_to conference_conference_registration_path(@conference.short_title), flash: { success: 'Thanks! You have purchased your tickets successfully.' }
|
||||||
else
|
else
|
||||||
|
|
@ -26,10 +26,6 @@ class PaymentsController < ApplicationController
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def price_in_cents
|
|
||||||
(@payment.amount * 100).round
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_purchased_ticket_purchases
|
def update_purchased_ticket_purchases
|
||||||
paid_ticket_purchases = current_user.ticket_purchases.by_conference(@conference).unpaid
|
paid_ticket_purchases = current_user.ticket_purchases.by_conference(@conference).unpaid
|
||||||
paid_ticket_purchases.each do |ticket|
|
paid_ticket_purchases.each do |ticket|
|
||||||
|
|
@ -40,6 +36,8 @@ class PaymentsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def payment_params
|
def payment_params
|
||||||
params.require(:payment).permit(:first_name, :last_name, :credit_card_number, :expiration_month, :expiration_year, :card_verification_value, :amount)
|
params.require(:payment)
|
||||||
|
.permit(:first_name, :last_name, :credit_card_number, :expiration_month, :expiration_year, :card_verification_value, :amount)
|
||||||
|
.merge(user: current_user, conference: @conference)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ class TicketPurchasesController < ApplicationController
|
||||||
authorize_resource :conference_registrations, class: Registration
|
authorize_resource :conference_registrations, class: Registration
|
||||||
|
|
||||||
def create
|
def create
|
||||||
TicketPurchase.destroy_all(user_id: current_user.id, conference_id: @conference.id, paid: false)
|
TicketPurchase.by_conference(@conference).unpaid.by_user(current_user).destroy_all
|
||||||
message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0])
|
message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0])
|
||||||
if message.blank?
|
if message.blank?
|
||||||
if current_user.ticket_purchases.by_conference(@conference).unpaid.any?
|
if current_user.ticket_purchases.by_conference(@conference).unpaid.any?
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@ class Payment < ActiveRecord::Base
|
||||||
validates :expiration_month, presence: true, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 12 }
|
validates :expiration_month, presence: true, numericality: { greater_than_or_equal_to: 1, less_than_or_equal_to: 12 }
|
||||||
validates :expiration_year, presence: true
|
validates :expiration_year, presence: true
|
||||||
validates :amount, presence: true, numericality: { greater_than: 0 }
|
validates :amount, presence: true, numericality: { greater_than: 0 }
|
||||||
|
validates :user_id, presence: true
|
||||||
|
validates :conference_id, presence: true
|
||||||
|
|
||||||
enum status: {
|
enum status: {
|
||||||
unpaid: 0,
|
unpaid: 0,
|
||||||
|
|
@ -34,17 +36,18 @@ class Payment < ActiveRecord::Base
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
def purchase(user, conference, price_in_cents)
|
def amount_to_pay
|
||||||
|
Ticket.total_price(conference, user, paid: false).cents
|
||||||
|
end
|
||||||
|
|
||||||
|
def purchase
|
||||||
gateway_response = begin
|
gateway_response = begin
|
||||||
GATEWAY.purchase(price_in_cents, credit_card, currency: conference.tickets.first.price_currency)
|
GATEWAY.purchase(amount_to_pay, credit_card, currency: conference.tickets.first.price_currency)
|
||||||
rescue
|
rescue
|
||||||
ActiveMerchant::Billing::Response.new(false, 'Unable to receive any response from the payment gateway.')
|
ActiveMerchant::Billing::Response.new(false, 'Unable to receive any response from the payment gateway.')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
if gateway_response.success?
|
if gateway_response.success?
|
||||||
self.user_id = user.id
|
|
||||||
self.conference_id = conference.id
|
|
||||||
self.last4 = credit_card.display_number
|
self.last4 = credit_card.display_number
|
||||||
self.authorization_code = gateway_response.authorization
|
self.authorization_code = gateway_response.authorization
|
||||||
self.status = 'success'
|
self.status = 'success'
|
||||||
|
|
@ -56,4 +59,3 @@ class Payment < ActiveRecord::Base
|
||||||
success?
|
success?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ Osem::Application.configure do
|
||||||
|
|
||||||
#Initialize Payment Gateway with valid credentials
|
#Initialize Payment Gateway with valid credentials
|
||||||
ActiveMerchant::Billing::Base.mode = :test
|
ActiveMerchant::Billing::Base.mode = :test
|
||||||
::GATEWAY = ActiveMerchant::Billing::StripeGateway.new(:login => ENV['SECRET_KEY'])
|
::GATEWAY = ActiveMerchant::Billing::StripeGateway.new(:login => ENV['OSEM_GATEWAY_TEST_SECRET_KEY'])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,5 +86,5 @@ Osem::Application.configure do
|
||||||
|
|
||||||
# Initialize Payment Gateway with valid credentials
|
# Initialize Payment Gateway with valid credentials
|
||||||
ActiveMerchant::Billing::Base.mode = :test
|
ActiveMerchant::Billing::Base.mode = :test
|
||||||
::GATEWAY = ActiveMerchant::Billing::StripeGateway.new(:login => ENV['SECRET_KEY'])
|
::GATEWAY = ActiveMerchant::Billing::StripeGateway.new(:login => ENV['OSEM_GATEWAY_LIVE_SECRET_KEY'])
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ class CreatePayments < ActiveRecord::Migration
|
||||||
t.decimal :amount, precision: 12, scale: 3
|
t.decimal :amount, precision: 12, scale: 3
|
||||||
t.string :authorization_code
|
t.string :authorization_code
|
||||||
t.integer :status, default: 0
|
t.integer :status, default: 0
|
||||||
t.integer :user_id
|
t.integer :user_id, null: false
|
||||||
t.integer :conference_id
|
t.integer :conference_id, null: false
|
||||||
t.datetime :created_at
|
t.datetime :created_at
|
||||||
t.datetime :updated_at
|
t.datetime :updated_at
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
FactoryGirl.define do
|
FactoryGirl.define do
|
||||||
factory :payment do
|
factory :payment do
|
||||||
|
user
|
||||||
|
conference
|
||||||
first_name { "#{Faker::Hipster.word} abc" }
|
first_name { "#{Faker::Hipster.word} abc" }
|
||||||
last_name { "#{Faker::Hipster.word} xyz" }
|
last_name { "#{Faker::Hipster.word} xyz" }
|
||||||
credit_card_number '4242424242424111'
|
credit_card_number '4242424242424111'
|
||||||
|
|
@ -17,4 +19,3 @@ FactoryGirl.define do
|
||||||
credit_card_number '4242424242424333'
|
credit_card_number '4242424242424333'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,10 @@ describe Payment do
|
||||||
|
|
||||||
it { is_expected.to validate_presence_of(:amount) }
|
it { is_expected.to validate_presence_of(:amount) }
|
||||||
|
|
||||||
|
it { is_expected.to validate_presence_of(:user_id) }
|
||||||
|
|
||||||
|
it { is_expected.to validate_presence_of(:conference_id) }
|
||||||
|
|
||||||
it 'is not valid with a amount equals zero' do
|
it 'is not valid with a amount equals zero' do
|
||||||
should_not allow_value(0).for(:amount)
|
should_not allow_value(0).for(:amount)
|
||||||
end
|
end
|
||||||
|
|
@ -42,24 +46,53 @@ describe Payment do
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe '#credit_card' do
|
||||||
|
let(:payment) { create(:payment) }
|
||||||
|
|
||||||
|
it 'assigns correct "month"' do
|
||||||
|
expect(payment.credit_card.month).to eq(6)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'assigns correct "year"' do
|
||||||
|
expect(payment.credit_card.year).to eq(Date.current.year + 2)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'assigns correct "verification_value"' do
|
||||||
|
expect(payment.credit_card.verification_value).to eq('123')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'assigns correct "card_number"' do
|
||||||
|
expect(payment.credit_card.display_number).to eq('XXXX-XXXX-XXXX-4111')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#amount_to_pay' do
|
||||||
|
let!(:user) { create(:user) }
|
||||||
|
let!(:conference) { create(:conference) }
|
||||||
|
let(:ticket_1) { create(:ticket, price: 10, price_currency: 'USD', conference: conference) }
|
||||||
|
let(:payment) { create(:payment, user: user, conference: conference) }
|
||||||
|
|
||||||
|
it ' returns correct unpaid amount' do
|
||||||
|
create(:ticket_purchase, ticket: ticket_1, user: user, quantity: 8)
|
||||||
|
expect(payment.amount_to_pay).to eq(8000)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe '#purchase' do
|
describe '#purchase' do
|
||||||
let!(:user) { create(:user) }
|
let!(:user) { create(:user) }
|
||||||
let!(:ticket_1) { create(:ticket) }
|
let!(:ticket_1) { create(:ticket) }
|
||||||
let!(:conference) { create(:conference, tickets: [ticket_1]) }
|
let!(:conference) { create(:conference, tickets: [ticket_1]) }
|
||||||
let(:payment) { create(:payment) }
|
let!(:payment) { create(:payment, user: user, conference: conference) }
|
||||||
|
|
||||||
it 'calls the payment gateway with the correct parameters' do
|
let!(:tickets) { {ticket_1.id.to_s => '1'} }
|
||||||
expect(GATEWAY).to receive(:purchase).with(1000, payment.credit_card, currency: 'USD')
|
|
||||||
.and_return(ActiveMerchant::Billing::Response.new(true, 'Success.'))
|
|
||||||
|
|
||||||
payment.purchase(user, conference, 1000)
|
before { TicketPurchase.purchase(conference, user, tickets) }
|
||||||
end
|
|
||||||
|
|
||||||
context 'when the payment is successful' do
|
context 'when the payment is successful' do
|
||||||
before { payment.purchase(user, conference, 1000) }
|
before { payment.purchase }
|
||||||
|
|
||||||
it 'returns true' do
|
it 'returns true' do
|
||||||
payment_result = payment.purchase(user, conference, 1000)
|
payment_result = payment.purchase
|
||||||
expect(payment_result).to eq true
|
expect(payment_result).to eq true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -67,31 +100,23 @@ describe Payment do
|
||||||
expect(payment.status).to eq('success')
|
expect(payment.status).to eq('success')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'assigns user_id' do
|
|
||||||
expect(payment.user_id).to eq(user.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'assigns conference_id' do
|
|
||||||
expect(payment.conference_id).to eq(conference.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'assigns last4' do
|
it 'assigns last4' do
|
||||||
expect(payment.last4).to eq('XXXX-XXXX-XXXX-4111')
|
expect(payment.last4).to eq('XXXX-XXXX-XXXX-4111')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'assigns authorization_code' do
|
it 'assigns authorization_code' do
|
||||||
expect(payment.authorization_code).to eq("53433")
|
expect(payment.authorization_code).to eq('53433')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'if the payment is not successful' do
|
context 'if the payment is not successful' do
|
||||||
before { payment.purchase(user, conference, 1000) }
|
before { payment.purchase }
|
||||||
|
|
||||||
let(:payment) { create(:payment, :invalid_credit_card) }
|
let(:payment) { create(:payment, :invalid_credit_card) }
|
||||||
|
|
||||||
context 'when the card is invalid' do
|
context 'when the card is invalid' do
|
||||||
it 'returns false' do
|
it 'returns false' do
|
||||||
payment_result = payment.purchase(user, conference, 1000)
|
payment_result = payment.purchase
|
||||||
expect(payment_result).to eq false
|
expect(payment_result).to eq false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -108,7 +133,7 @@ describe Payment do
|
||||||
let(:payment) { create(:payment, :exception_credit_card) }
|
let(:payment) { create(:payment, :exception_credit_card) }
|
||||||
|
|
||||||
it 'returns false' do
|
it 'returns false' do
|
||||||
payment_result = payment.purchase(user, conference, 1000)
|
payment_result = payment.purchase
|
||||||
expect(payment_result).to eq false
|
expect(payment_result).to eq false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -123,4 +148,3 @@ describe Payment do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue