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.

Sign up for GitHub

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

Jump to bottom

CSGN-191: Set created by from offer params #645

Merged
merged 16 commits into from
May 14, 2020
Merged

CSGN-191: Set created by from offer params #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7c81e45
Forgot one
jonallured May 13, 2020
340e37d
Extract local
jonallured May 13, 2020
605eb73
Push fabrication down
jonallured May 13, 2020
1bd026c
Use more generic name
jonallured May 13, 2020
0875eaa
Promote submission fabrication, leave state
jonallured May 13, 2020
a66e684
Move to using consts instead of strings
jonallured May 13, 2020
94a5d20
Use lazy load unless you can't
jonallured May 13, 2020
ec4fa9b
Use consts for offer states
jonallured May 13, 2020
756311f
Run prettier
jonallured May 13, 2020
a10a54e
Only use reload when you have to
jonallured May 13, 2020
d793c44
Simplify error assertions
jonallured May 13, 2020
91eba9c
Use the rspec change matcher when possible
jonallured May 13, 2020
4316914
Simplify specs when there is a PS
jonallured May 13, 2020
d2b7831
Do some reorganization of spec file
jonallured May 13, 2020
b52c5d8
Extract locals around creating an offer
jonallured May 13, 2020
1d9afdf
Offer params should override defaults
jonallured May 13, 2020
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
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ DEPENDENCIES
yarjuf

RUBY VERSION
ruby 2.7.0p0
ruby 2.7.1p83

BUNDLED WITH
2.1.4
3 changes: 2 additions & 1 deletion app/graphql/resolvers/create_offer_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ def submission_id

def partner_id
gravity_partner_id = @arguments[:gravity_partner_id]
Partner.find_by(gravity_partner_id: gravity_partner_id).id
partner = Partner.find_by(gravity_partner_id: gravity_partner_id)
partner.id
end

def offer_attributes
Expand Down
10 changes: 9 additions & 1 deletion app/models/offer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ class Offer < ApplicationRecord
].freeze

# FIXME: deprecate 'accepted' state
STATES = %w[draft sent accepted rejected lapsed review consigned].freeze
STATES = [
DRAFT = 'draft',
SENT = 'sent',
ACCEPTED = 'accepted',
REJECTED = 'rejected',
LAPSED = 'lapsed',
REVIEW = 'review',
CONSIGNED = 'consigned'
].freeze

REJECTION_REASONS = [
'Low estimate',
Expand Down
8 changes: 4 additions & 4 deletions app/services/offer_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ def create_offer(
if partner_submission.notified_at.blank?
partner_submission.update!(notified_at: Time.now.utc)
end
offer =
partner_submission.offers.new(
offer_params.merge(state: 'draft', created_by_id: current_user)
)

default_offer_attrs = { state: 'draft', created_by_id: current_user }
offer_attrs = default_offer_attrs.merge(offer_params)
offer = partner_submission.offers.new(offer_attrs)
offer.save!
offer
rescue ActiveRecord::RecordNotFound => e
Expand Down
Loading