bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace couchbase counters with drb version

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-08-05 17:49:16 +02:00
parent c0c25673bf
commit 99a9536c68
20 changed files with 400 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/list.rb
+6 -104
View File
@@ -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
app/models/list/depricated_serialization.rb
+49
View File
@@ -0,0 +1,49 @@
class List
module DepricatedSerialization
extend ActiveSupport::Concern
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
end
end
app/models/list/join_requests.rb
+51
View File
@@ -0,0 +1,51 @@
class List
module JoinRequests
extend ActiveSupport::Concern
included do
property :join_request_user_ids, type: Array, default: []
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 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 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
save and broadcast_users 'join_request_approved', UserUserSerializer.new(user).as_json
end
end
def reject_join_request_for_user!(user_id)
user_id = user_id.id if user_id.is_a?(User) # allow model to be passed as argument
if join_request_user_ids.include?(user_id)
join_request_user_ids.delete(user_id)
self.is_dirty
if save
# user_id is not part of the list, so should be broadcasted separately
broadcast_user user_id, 'join_request_rejected', id: "jr-#{user_id}"
broadcast_users 'join_request_rejected', id: "jr-#{user_id}"
end
end
end
end
end
app/models/supplier.rb
+2 -70
View File
@@ -1,6 +1,7 @@
class Supplier
include SimplyStored::Couch
include ActiveModel::SerializerSupport
include Supplier::Counters
view :by_confirmation_token, key: :confirmation_token # devise confirmable
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :confirmable
@@ -96,7 +97,7 @@ class Supplier
self.open = true
save
end
def mark_as_closed!
self.open = false
save
@@ -128,38 +129,6 @@ class Supplier
confirmable
end
def self.reset_counters!
# Set all known counters to zero
Qwaiter::Couchbase.design_doc('supplier').counters(reduce: false).each{|counter| Qwaiter::Counter.set counter.key, 0}
spec = Order.by_supplier_id_and_state(reduce: true, group_level: 2)
reset_order_counters_with_spec spec
end
def reset_counters!
spec = Order.by_supplier_id_and_state(startkey: [id], endkey: [id, {}], reduce: true, group_level: 2)
self.class.reset_order_counters_with_spec spec
end
def self.reset_order_counters_with_spec(spec)
# taken from the couch_potato source since we want a model/custom mix here (hmmmm, something that should be fixed in the couchbase version)
results = CouchPotato::View::ViewQuery.new(
database.couchrest_database,
spec.design_document,
{spec.view_name => { map: spec.map_function, reduce: spec.reduce_function} },
({spec.list_name => spec.list_function} unless spec.list_name.nil?),
spec.language
).query_view!(spec.view_parameters)
Array.wrap(results['rows']).each do |result|
supplier_id, state = result['key']
case state
when 'placed' then Qwaiter::Counter.set "supplier_counter:#{supplier_id}:orders_placed", result['value']
when 'active' then Qwaiter::Counter.set "supplier_counter:#{supplier_id}:orders_in_process", result['value']
end
end
end
# Send confirmation instructions by email
def send_confirmation_instructions(*args)
self.confirmation_token = nil if reconfirmation_required?
@@ -183,43 +152,6 @@ class Supplier
true
end
# COUNTER SECTION. Can be a concern in a future
def increment_orders_in_process_count!
Qwaiter::Counter.incr self.class.orders_in_process_counter_key(id)
end
def increment_orders_placed_count!
Qwaiter::Counter.incr self.class.orders_placed_counter_key(id)
end
def decrement_orders_in_process_count!
Qwaiter::Counter.decr self.class.orders_in_process_counter_key(id)
end
def decrement_orders_placed_count!
Qwaiter::Counter.decr self.class.orders_placed_counter_key(id)
end
def orders_in_process_count
Qwaiter::Counter.get self.class.orders_in_process_counter_key(id)
end
def orders_placed_count
Qwaiter::Counter.get self.class.orders_placed_counter_key(id)
end
def self.orders_in_process_counter_key(id)
"supplier_counter:#{id}:orders_in_process"
end
def self.orders_placed_counter_key(id)
"supplier_counter:#{id}:orders_placed"
end
def active_order_count
orders_in_process_count + orders_placed_count
end
private
def add_section_on_create
app/models/supplier/counters.rb
+84
View File
@@ -0,0 +1,84 @@
class Supplier
module Counters
extend ActiveSupport::Concern
def reset_counters!
spec = Order.by_supplier_id_and_state(startkey: [id], endkey: [id, {}], reduce: true, group_level: 2)
self.class.reset_order_counters_with_spec spec
end
def increment_orders_in_process_count!
Qwaiter::Counter.incr orders_in_process_counter_key
end
def increment_orders_placed_count!
Qwaiter::Counter.incr orders_placed_counter_key
end
def decrement_orders_in_process_count!
Qwaiter::Counter.decr orders_in_process_counter_key
end
def decrement_orders_placed_count!
Qwaiter::Counter.decr orders_placed_counter_key
end
def orders_in_process_count
Qwaiter::Counter.get orders_in_process_counter_key
end
def orders_placed_count
Qwaiter::Counter.get orders_placed_counter_key
end
def active_order_count
orders_in_process_count + orders_placed_count
end
def orders_in_process_counter_key
self.class.orders_in_process_counter_key(id)
end
def orders_placed_counter_key
self.class.orders_placed_counter_key(id)
end
module ClassMethods
def orders_in_process_counter_key(id)
"supplier_counter:#{id}:orders_in_process"
end
def orders_placed_counter_key(id)
"supplier_counter:#{id}:orders_placed"
end
def reset_counters!
# Set all known counters to zero
Qwaiter::Couchbase.flush_counters!
spec = Order.by_supplier_id_and_state(reduce: true, group_level: 2)
reset_order_counters_with_spec spec
end
def reset_order_counters_with_spec(spec)
# taken from the couch_potato source since we want a model/custom mix here (hmmmm, something that should be fixed in the couchbase version)
results = CouchPotato::View::ViewQuery.new(
database.couchrest_database,
spec.design_document,
{spec.view_name => { map: spec.map_function, reduce: spec.reduce_function} },
({spec.list_name => spec.list_function} unless spec.list_name.nil?),
spec.language
).query_view!(spec.view_parameters)
Array.wrap(results['rows']).each do |result|
supplier_id, state = result['key']
case state
when 'placed' then Qwaiter::Counter.set orders_placed_counter_key(supplier_id), result['value']
when 'active' then Qwaiter::Counter.set orders_in_process_counter_key(supplier_id), result['value']
end
end
end
end
end
end