Merge pull request #4 from vatsu/master

testing count messages
nathmisaki · Jun 9, 2016 · dc7afaa · dc7afaa
2 parents 494edb4 + afcd07a
commit dc7afaa
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/qblox/api/message.rb b/lib/qblox/api/message.rb
@@ -23,21 +23,13 @@ def index(chat_dialog_id, options = {})
 
         response = query(:get) do |req|
           req.headers = headers.merge('Content-Type' => 'application/json')
-          req.body = JSON.dump(options)
+          #req.body = JSON.dump(options)
           req.params = { chat_dialog_id: chat_dialog_id }
         end
         data = json_parse(response.body)
         return data unless all
 
-        unless count
-          response = query(:get) do |req|
-            req.headers = headers.merge('Content-Type' => 'application/json')
-            req.body = JSON.dump(options)
-            req.params = { chat_dialog_id: chat_dialog_id, count: 1 }
-          end
-          count = json_parse(response.body)
-          count = count['items']['count'].to_i
-        end
+        count ||= count_messages(chat_dialog_id)
 
         if result
           result['items'].concat(data['items'])
@@ -70,6 +62,16 @@ def destroy(message_id, options = {})
         return true
       end
 
+      def count_messages(chat_dialog_id)
+        response = query(:get) do |req|
+          req.headers = headers.merge('Content-Type' => 'application/json')
+          #req.body = JSON.dump(options)
+          req.params = { chat_dialog_id: chat_dialog_id, count: 1 }
+        end
+        count = json_parse(response.body)
+        count['items']['count'].to_i
+      end
+
       private
 
       def validate_params(data)