qismo 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835aca8c69a0b94f348930cefdc3454d2d90c131718bc1d825960e928ca43c3b
-  data.tar.gz: '0240594c5422307db61e8dc208cef8ac06513c76bde7fda0ba649920bf4a400c'
+  metadata.gz: 82fdfb3850c268372f3bb9a626923296a277365a2e418e39e77faee771a17f01
+  data.tar.gz: 5e8e7248607487caab854fc59b45a4db35140b8f48392c3a52ef46fcb7d3b02f
 SHA512:
-  metadata.gz: 57b4ebebb1efea8ea65f47b53cab0d8057864afd45ee5df75a05e0fd9c36ad7d4ee68d591d8e5d5e30d869787d22eb93a90a2da4a973dde5f7f0613215aff99d
-  data.tar.gz: 305fa3917126e9abccdf3ed2c517e8a305675b6ad3aa46d3adb91a42fc0219d38da49bb57a2f391e6ba8b2393982a78d4d3a0022b1211dc46feb71c71e2d726d
+  metadata.gz: 6f18f2d1e90c3892e8793f8e48af1643a8c91fa94307197cab6660df6130aa7e9e6d28d9e8942e51fb9c538d0531e9532275bb728c2ae3cb05c57f539e4f6d0c
+  data.tar.gz: 804e77fe38f0bb3e5da3859e2560bb74586960d8a7c96a9b723c0026ee2cfdf16ceca7531d05bc3ce7f9e3c748092daad112e458f66800b18776073e6711125e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qismo (0.1.0)
+    qismo (0.5.0)
       activesupport
       http
 

data/lib/qismo/api.rb

@@ -8,22 +8,10 @@ module Qismo
       body = post("/api/v2/customer_rooms", opt)
       Collection.new(
         body.data.customer_rooms,
-        prev_page: body.meta.cursor_before,
-        next_page: body.meta.cursor_after,
-        prev_func: -> do
-          if body.meta.cursor_before.nil? || body.meta.cursor_before.empty?
-            Collection.new([])
-          else
-            rooms(opt.merge(cursor_before: body.meta.cursor_before))
-          end
-        end,
-        next_func: -> do
-          if body.meta.cursor_after.nil? || body.meta.cursor_after.empty?
-            Collection.new([])
-          else
-            rooms(opt.merge(cursor_after: body.meta.cursor_after))
-          end
-        end,
+        prev_page: body.meta&.cursor_before,
+        next_page: body.meta&.cursor_after,
+        prev_func: -> { rooms(opt.merge(cursor_before: body.meta&.cursor_before)) },
+        next_func: -> { rooms(opt.merge(cursor_after: body.meta&.cursor_after)) },
       )
     end
 
@@ -50,7 +38,17 @@ module Qismo
 
     def room_broadcast_history(room_id, **opt)
       body = get("/api/v2/customer_rooms/#{room_id}/broadcast_history", opt)
-      Collection.new(body.data.broadcast_logs, body.data.meta)
+
+      next_page = body.meta.page < body.meta.total_page ? (body.meta.page + 1) : nil
+      prev_page = body.meta.page > 1 ? (body.meta.page - 1) : nil
+
+      Collection.new(
+        body.data.broadcast_logs,
+        next_page: next_page,
+        prev_page: prev_page,
+        next_func: -> { room_broadcast_history(opt.merge(page: next_page)) },
+        prev_func: -> { room_broadcast_history(opt.merge(page: prev_page)) },
+      )
     end
 
     def assign_agent(room_id, agent_id, **opt)
@@ -81,12 +79,24 @@ module Qismo
 
     def other_agents(room_id, **opt)
       body = get("/api/v2/admin/service/other_agents", opt.merge(room_id: room_id))
-      Collection.new(body.data.agents, body.meta)
+      Collection.new(
+        body.data.agents,
+        prev_page: body.meta&.cursor_before,
+        next_page: body.meta&.cursor_after,
+        prev_func: -> { other_agents(opt.merge(cursor_before: body.meta&.cursor_before)) },
+        next_func: -> { other_agents(opt.merge(cursor_after: body.meta&.cursor_after)) },
+      )
     end
 
     def available_agents(room_id, **opt)
       body = get("/api/v2/admin/service/available_agents", opt.merge(room_id: room_id))
-      Collection.new(body.data.agents, body.meta)
+      Collection.new(
+        body.data.agents,
+        prev_page: body.meta&.cursor_before,
+        next_page: body.meta&.cursor_after,
+        prev_func: -> { available_agents(opt.merge(cursor_before: body.meta&.cursor_before)) },
+        next_func: -> { available_agents(opt.merge(cursor_after: body.meta&.cursor_after)) },
+      )
     end
 
     def new_session_webhook
@@ -114,16 +124,42 @@ module Qismo
     end
 
     def agents(**opt)
+      if opt[:page].nil? || opt[:page].empty?
+        opt[:page] = 1
+      end
+
       body = get("/api/v2/admin/agents", opt)
-      [body.data.agents, body.meta]
+
+      total_page = (body.meta.total_count.to_f / body.meta.per_page.to_f).ceil
+      next_page = opt[:page] < total_page ? (opt[:page] + 1) : nil
+      prev_page = opt[:page] > 1 ? (opt[:page] - 1) : nil
+
+      Collection.new(
+        body.data.agents,
+        next_page: next_page,
+        prev_page: prev_page,
+        next_func: -> { agents(opt.merge(page: next_page)) },
+        prev_func: -> { agents(opt.merge(page: prev_page)) },
+      )
     end
 
     def agents_by_ids(*ids)
-      get("/api/v1/admin/agents/get_by_ids", ids: ids).data
+      get("/api/v1/admin/agents/get_by_ids", **{ "ids[]": ids }).data
     end
 
-    def agent_by_divisions(*division_ids, **opt)
-      get("/api/v2/admin/agents/by_division", opt.merge(division_ids: division_ids)).data
+    def agents_by_divisions(*division_ids, **opt)
+      body = get("/api/v2/admin/agents/by_division", opt.merge({ "division_ids[]": division_ids }))
+
+      next_page = body.meta.page < body.meta.total_page ? (body.meta.page + 1) : nil
+      prev_page = body.meta.page > 1 ? (body.meta.page - 1) : nil
+
+      Collection.new(
+        body.data,
+        next_page: next_page,
+        prev_page: prev_page,
+        next_func: -> { agents_by_divisions(opt.merge(page: next_page)) },
+        prev_func: -> { agents_by_divisions(opt.merge(page: prev_page)) },
+      )
     end
 
     def agent(agent_id)
@@ -135,8 +171,19 @@ module Qismo
     end
 
     def wa_broadcast_templates(**opt)
-      body = get("/api/v2/admin/hsm", opt)
-      [body.data.hsm_templates, body.meta]
+      body = get("/api/v3/admin/hsm", opt)
+
+      meta = body.meta
+      next_page = meta.page < meta.total_page ? (meta.page + 1) : nil
+      prev_page = meta.page > 1 ? (meta.page - 1) : nil
+
+      Collection.new(
+        body.data.hsm_templates,
+        next_page: next_page,
+        prev_page: prev_page,
+        next_func: -> { wa_broadcast_templates(opt.merge(page: next_page)) },
+        prev_func: -> { wa_broadcast_templates(opt.merge(page: prev_page)) },
+      )
     end
 
     def send_wa_outbound(**opt)

data/lib/qismo/client.rb

@@ -28,7 +28,7 @@ module Qismo
     end
 
     def get(path, **params)
-      request(:get, path, params)
+      request(:get, path, params: params)
     end
 
     def request(method, path, **opt)

data/lib/qismo/model.rb

@@ -28,11 +28,11 @@ module Qismo
       alias_method :prev_page?, :has_prev_page?
 
       def next_page
-        @next_func.call
+        @next_func.call if has_next_page?
       end
 
       def prev_page
-        @prev_func.call
+        @prev_func.call if has_prev_page?
       end
     end
 

data/lib/qismo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qismo
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qismo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Qiscus Integration