counter fixes

2014-03-10 10:10:54 +01:00
parent a2ce77e9e1
commit c4e002104c
6 changed files with 89 additions and 36 deletions
@@ -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,
-      supplier_orders_placed_count: supplier.orders_placed_count
-    )
+    ).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: 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?