counter fixes

app/controllers/user_controller.rb

@@ -202,8 +202,7 @@ class UserController < ApplicationController
             render json: json_response(list_active: false)
             return
           else
-            list_obj = list.as_json.merge(list_active: list.active? ).merge(list.join_requests_as_json)
+            render json: json_response(list.serialized_with_status_join_requests_and_supplier_counters)
-            render json: json_response(list_obj)
           end
         else
           render json: json_response(not_present: true)

app/models/list.rb

@@ -326,9 +326,18 @@ class List
   def with_orders_and_join_requests_and_supplier_info_as_json
     with_orders_and_join_requests_as_json.merge(
       supplier_name: supplier.name,
-      supplier_orders_in_process_count: supplier.orders_in_process_count,
+    ).merge(supplier_counter_info)
-      supplier_orders_placed_count: supplier.orders_placed_count
+  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: Qwaiter::Counter.get(Supplier.orders_in_process_counter_key(supplier_id)),
+      supplier_orders_placed_count: Qwaiter::Counter.get(Supplier.orders_placed_counter_key(supplier_id))
+    }
   end
 
   def has_active_orders?

app/models/order.rb

@@ -92,19 +92,16 @@ class Order
   end
 
   def is_delivered!
-    decrement_placed = placed?
+    decrement_counter = placed? ? 'placed' : 'in_process'
     self.state = 'delivered'
     if save
-      orders_in_process_count = supplier.decrement_orders_in_process_count!
+      reduced_count = supplier.public_send "decrement_orders_#{decrement_counter}_count!"
-      orders_placed_count = supplier.decrement_orders_placed_count! if decrement_placed
       for user_id in list.user_ids
         broadcast_user user_id, 'order_being_delivered', id: id, list_id: list_id
-        broadcast_user user_id, 'orders_in_process_count', count: orders_in_process_count
+        broadcast_user user_id, "orders_#{decrement_counter}_count", count: reduced_count
-        broadcast_user user_id, 'orders_placed_count', count: orders_placed_count if decrement_placed
       end
       broadcast_supplier supplier_id, 'order_being_delivered', id: id, list_id: list_id
-      broadcast_supplier supplier_id, 'orders_in_process_count', count: orders_in_process_count
+      broadcast_supplier supplier_id, "orders_#{decrement_counter}_count", count: reduced_count
-      broadcast_supplier supplier_id, 'orders_placed_count', count: orders_placed_count if decrement_placed
     end
   end
 

app/models/supplier.rb

@@ -170,28 +170,37 @@ class Supplier
     true
   end
 
+  # COUNTER SECTION. Can be a concern in a future
   def increment_orders_in_process_count!
-    Qwaiter::Counter.incr "supplier_counter:#{id}:orders_in_process"
+    Qwaiter::Counter.incr self.class.orders_in_process_counter_key(id)
   end
 
   def increment_orders_placed_count!
-    Qwaiter::Counter.incr "supplier_counter:#{id}:orders_placed"
+    Qwaiter::Counter.incr self.class.orders_placed_counter_key(id)
   end
 
   def decrement_orders_in_process_count!
-    Qwaiter::Counter.decr "supplier_counter:#{id}:orders_in_process"
+    Qwaiter::Counter.decr self.class.orders_in_process_counter_key(id)
   end
 
   def decrement_orders_placed_count!
-    Qwaiter::Counter.decr "supplier_counter:#{id}:orders_placed"
+    Qwaiter::Counter.decr self.class.orders_placed_counter_key(id)
   end
 
   def orders_in_process_count
-    Qwaiter::Counter.get "supplier_counter:#{id}:orders_in_process"
+    Qwaiter::Counter.get self.class.orders_in_process_counter_key(id)
   end
 
   def orders_placed_count
-    Qwaiter::Counter.get "supplier_counter:#{id}:orders_placed"
+    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

spec/models/order_spec.rb

@@ -87,13 +87,13 @@ describe Order do
         end
 
         it 'decreases the orders_in_process count and communicates it to user' do
-          expect{ order.is_delivered! }.to broadcast_to_user(user.id).message( 'orders_in_process_count' ).with(count: 6)
+          expect{ order.is_delivered! }.to broadcast_to_user(user.id).message( 'orders_placed_count' ).with(count: 10)
-          supplier.orders_placed_count.should == 10
+          supplier.orders_in_process_count.should == 7 # should not be reduced
         end
 
         it 'decreases the orders_in_process count and communicates it to supplier' do
-          expect{ order.is_delivered! }.to broadcast_to_supplier(supplier.id).message( 'orders_in_process_count' ).with(count: 6)
+          expect{ order.is_delivered! }.to broadcast_to_supplier(supplier.id).message( 'orders_placed_count' ).with(count: 10)
-          supplier.orders_placed_count.should == 10
+          supplier.orders_in_process_count.should == 7 # should not be reduced
         end
 
         it 'does not decreases the placed orders count if the order is not placed' do