Replace couchbase counters with drb version
This commit is contained in:
+6
-104
@@ -1,13 +1,13 @@
|
||||
class List
|
||||
include SimplyStored::Couch
|
||||
include ActiveModel::SerializerSupport
|
||||
include List::JoinRequests
|
||||
per_page_method :limit_value #kaminari
|
||||
|
||||
property :state, default: 'active' # active, #closed
|
||||
property :needs_help, type: :boolean, default: false
|
||||
property :needs_payment, type: :boolean, default: false
|
||||
property :closed_at, type: Time
|
||||
property :join_request_user_ids, type: Array, default: []
|
||||
property :price, type: Float
|
||||
property :is_paid, type: :boolean, default: false
|
||||
property :paid_at, type: Time
|
||||
@@ -139,9 +139,10 @@ class List
|
||||
|
||||
def close!
|
||||
orders.include_relation(:product_orders)
|
||||
set_price
|
||||
orders.map(&:close!)
|
||||
set_price # should not be needed, but extra secure
|
||||
orders.map(&:close!) # close the connected orders
|
||||
self.state = 'closed'
|
||||
self.user_requests_closing = false # if a user requested closing, not needed anymore
|
||||
self.closed_at = Time.now
|
||||
if save
|
||||
for user in users
|
||||
@@ -187,6 +188,8 @@ class List
|
||||
end
|
||||
end
|
||||
|
||||
# This method is called when a user of the list wants the list
|
||||
# actively to be closed
|
||||
def user_requests_closing!
|
||||
return if user_requests_closing?
|
||||
self.user_requests_closing = true
|
||||
@@ -216,18 +219,6 @@ class List
|
||||
end
|
||||
end
|
||||
|
||||
def approve_join_request_for_user!(user)
|
||||
if join_request_user_ids.include?(user.id)
|
||||
join_request_user_ids.delete(user.id)
|
||||
user.active_list_id = self.id
|
||||
add_user(user)
|
||||
user.save
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_user user.id, 'join_request_approved', UserUserSerializer.new(user).as_json
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def unlink_user(user)
|
||||
changed = join_request_user_ids.delete(user.id)
|
||||
@@ -239,36 +230,6 @@ class List
|
||||
save if changed
|
||||
end
|
||||
|
||||
def send_table_join_request_for_user!(requester)
|
||||
unless join_request_user_ids.include?(requester.id) or user_ids.include?(requester.id)
|
||||
@join_requests = nil # bust cache
|
||||
self.join_request_user_ids << requester.id
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_users 'user_join_request', JoinRequestSerializer.new(join_request_for_user(requester)).as_json
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def join_request_for_user(user)
|
||||
JoinRequest.new(user: user, list: self)
|
||||
end
|
||||
|
||||
|
||||
def join_requests
|
||||
@join_requests ||= join_request_user_ids.any? ? self.class.database.load_document(join_request_user_ids).map{|user| join_request_for_user(user) } : []
|
||||
end
|
||||
|
||||
def reject_join_request_for_user!(user_id)
|
||||
if join_request_user_ids.include?(user_id)
|
||||
join_request_user_ids.delete(user_id)
|
||||
self.is_dirty
|
||||
if save
|
||||
broadcast_user user_id, 'join_request_rejected', id: "jr-#{user_id}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def relevant_orders
|
||||
orders.reject(&:cancelled?)
|
||||
end
|
||||
@@ -319,50 +280,6 @@ class List
|
||||
order
|
||||
end
|
||||
|
||||
def as_json(*args)
|
||||
super.merge(id: id, table_number: table_number, has_active_orders: has_active_orders? )
|
||||
end
|
||||
|
||||
def with_orders_as_json
|
||||
return @with_orders_as_json if @with_orders_as_json.present?
|
||||
orders.include_relations(product_orders: :product)
|
||||
h = as_json
|
||||
h[:orders] = []
|
||||
h[:list_active] = active?
|
||||
list_total = 0.0
|
||||
for order in orders
|
||||
ho = {products: []}
|
||||
ho[:id] = order.id
|
||||
ho[:state] = order.state
|
||||
order_total = 0.0
|
||||
for product_order in order.product_orders
|
||||
order_total += (product_order.quantity * product_order.price).round(2)
|
||||
ho[:products] << {name: product_order.product_name, id: product_order.product_id, number: product_order.quantity, price: product_order.price}
|
||||
end
|
||||
ho[:total_amount] = order_total.round(2)
|
||||
ho[:state] = order.state
|
||||
list_total += ho[:total_amount]
|
||||
h[:orders] << ho
|
||||
end
|
||||
h[:total_amount] = list_total.round(2)
|
||||
@with_orders_as_json = h
|
||||
end
|
||||
|
||||
def with_orders_and_join_requests_as_json
|
||||
return @with_orders_and_join_requests_as_json if @with_orders_and_join_requests_as_json.present?
|
||||
@with_orders_and_join_requests_as_json = with_orders_as_json.merge(join_requests_as_json)
|
||||
end
|
||||
|
||||
def with_orders_and_join_requests_and_supplier_info_as_json
|
||||
with_orders_and_join_requests_as_json.merge(
|
||||
supplier_name: supplier.name,
|
||||
).merge(supplier_counter_info)
|
||||
end
|
||||
|
||||
def serialized_with_status_join_requests_and_supplier_counters
|
||||
as_json.merge(list_active: active? ).merge(join_requests_as_json).merge(supplier_counter_info)
|
||||
end
|
||||
|
||||
def supplier_counter_info
|
||||
{
|
||||
supplier_orders_in_process_count: supplier_orders_in_process_count,
|
||||
@@ -386,21 +303,6 @@ class List
|
||||
Order.active_for_supplier_and_list(supplier_id, id)
|
||||
end
|
||||
|
||||
# Return a join requests object in the form of:
|
||||
# {join_request: [{user_id: '1saf3...', user_email: 'info@qwaiter.com'}, [....]]}
|
||||
# DEPRICATED IN EMBER
|
||||
def join_requests_as_json
|
||||
return @join_requests_as_json if @join_requests_as_json.present?
|
||||
h = {join_requests: []}
|
||||
# Handle join requests
|
||||
if join_request_user_ids.any?
|
||||
for user in self.class.database.load_document(join_request_user_ids)
|
||||
h[:join_requests] << {user_id: user.id, user_email: user.email}
|
||||
end
|
||||
end
|
||||
@join_requests_as_json = h
|
||||
end
|
||||
|
||||
def product_categories
|
||||
supplier.product_categories
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user