fixed problem with multiple carts and a whole load of problems with crazy delivery destination logic / if I didn't write it i would have thought it was written by a drug abuser during high

This commit is contained in:
Senad Uka
2015-03-14 08:17:06 +01:00
parent e7793f0884
commit 8815267a79
12 changed files with 195 additions and 25 deletions

View File

@@ -11,19 +11,26 @@ helpers do
end
end
get '/cart' do
create_the_cart = -> () {
# -1 is a placeholder for user id when we implement users
# auid will still be used in case user is not logged in
Cart.find_or_create(anonymous_id, -1).to_json
}
post '/cart', &create_the_cart
put '/cart', &create_the_cart
get '/cart' do
Cart.just_find(anonymous_id, -1).to_json
end
# gets number of items in cart for every item
get '/cart/item' do
Cart.find_or_create(anonymous_id, -1).item_in_carts.to_json
Cart.just_find(anonymous_id, -1).item_in_carts.to_json
end
update_cart_item = ->() {
cart_id = Cart.find_or_create(anonymous_id, -1).id
cart_id = Cart.just_find(anonymous_id, -1).id
item_id = @json_params["item_id"].to_i
count = @json_params["count"].to_i
ItemInCart.update_state(cart_id, item_id, count).to_json
@@ -34,7 +41,7 @@ post '/cart/item', &update_cart_item
# gets list of items in cart without count
get '/cart/item/display' do
cart = Cart.find_or_create(anonymous_id, -1)
cart = Cart.just_find(anonymous_id, -1)
item_ids = cart.item_in_carts.map do |x|
x.item_id
end
@@ -44,12 +51,12 @@ get '/cart/item/display' do
end
get '/cart/delivery_destination' do
cart = Cart.find_or_create(anonymous_id, -1)
cart = Cart.just_find(anonymous_id, -1)
cart.delivery_destination.to_json(:except => [:created_at, :email_verification_code, :phone_verification_code])
end
update_delivery_destination = ->() {
cart = Cart.find_or_create(anonymous_id, -1)
cart = Cart.just_find(anonymous_id, -1)
allowed_keys = ["name", "address", "place", "postal_code", "phone", "email", "note"]
params = @json_params.reject { |key,_| !allowed_keys.include?(key) }
cart.delivery_destination.update_attributes(params)
@@ -61,10 +68,14 @@ post '/cart/delivery_destination', &update_delivery_destination
post '/cart/confirmation' do
cart = Cart.find_or_create(anonymous_id, -1)
anonymous = anonymous_id
cart = Cart.just_find(anonymous, -1)
if cart.item_in_carts.length > 0
cart.ordered = true
cart.save!
end
# since there is no more ordered cart this needs to be done
# in order for next call of Cart#just_find to be ready
Cart.find_or_create(anonymous, -1)
"OK".to_json
end

View File

@@ -7,7 +7,14 @@ class Cart < ActiveRecord::Base
cart ||= Cart.where(anonymous_id_string: anonymous_id).where(ordered: false).first
safe_user_id = (user_id > 0) ? user_id : nil
cart ||= Cart.create!(anonymous_id_string: anonymous_id, user_id: safe_user_id, ordered: false )
cart.delivery_destination ||= DeliveryDestination.find_or_create(anonymous_id, user_id);
cart.delivery_destination ||= DeliveryDestination.create_from_last(anonymous_id, safe_user_id);
cart.save!
return cart
end
def self.just_find(anonymous_id,user_id)
cart = Cart.where(user_id: user_id).where(ordered: false).first
cart ||= Cart.where(anonymous_id_string: anonymous_id).where(ordered: false).first
return cart
end
end

View File

@@ -2,10 +2,13 @@ class DeliveryDestination < ActiveRecord::Base
has_one :cart
belongs_to :user
def self.find_or_create(anonymous_id, user_id)
def self.create_from_last(anonymous_id, user_id)
dd = DeliveryDestination.where(user_id: user_id).order("id desc").first
dd ||= DeliveryDestination.where(anonymous_id_string: anonymous_id).order("id desc").first
dd ||= DeliveryDestination.create!({user_id: user_id, anonymous_id_string: anonymous_id })
return dd
dd ||= DeliveryDestination.new({user_id: user_id, anonymous_id_string: anonymous_id })
attributes = dd.as_json
attributes.delete("id")
result = DeliveryDestination.create!(attributes)
return result
end
end