qismo 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835aca8c69a0b94f348930cefdc3454d2d90c131718bc1d825960e928ca43c3b
-  data.tar.gz: '0240594c5422307db61e8dc208cef8ac06513c76bde7fda0ba649920bf4a400c'
+  metadata.gz: be7d855a466237baededa8d61cbf42a88a52ff245c82b3a3ee2ecce2dd5ded47
+  data.tar.gz: 190f309eed38161f7718ce842e02a6e1e3d2c0e961096263b2ac003ca7216a29
 SHA512:
-  metadata.gz: 57b4ebebb1efea8ea65f47b53cab0d8057864afd45ee5df75a05e0fd9c36ad7d4ee68d591d8e5d5e30d869787d22eb93a90a2da4a973dde5f7f0613215aff99d
-  data.tar.gz: 305fa3917126e9abccdf3ed2c517e8a305675b6ad3aa46d3adb91a42fc0219d38da49bb57a2f391e6ba8b2393982a78d4d3a0022b1211dc46feb71c71e2d726d
+  metadata.gz: d9ac3a4baa95ae52792801be684cac5d6d9de3c6bc271e50d2788fab62f243dafe9c8e05721d04d1004a02de22f89406b67e1bed8414315506d331a900738e95
+  data.tar.gz: 7ec9a32d43b4025809ada7d61af3e7dedcb9439c5ef074961e31e7714d1122c1a854e45126b8171af9d45c2b77ca364b4cd1032cd71ed1bfd43fc323b1d764ac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qismo (0.1.0)
+    qismo (0.6.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)
@@ -131,12 +167,27 @@ module Qismo
     end
 
     def office_hours
-      get("/api/v1/admin/office_hours").data
+      data = get("/api/v1/admin/office_hours").data
+      data_hash = data.as_json
+      data_hash["is_in_office_hour"] = Util.in_office_hour?(data)
+
+      DataObject.new(data_hash)
     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,13 +28,13 @@ module Qismo
     end
 
     def get(path, **params)
-      request(:get, path, params)
+      request(:get, path, params: params)
     end
 
     def request(method, path, **opt)
       res = connection.request(method, @url + path, opt.compact)
       if res.status.success?
-        return JSON.parse(res.to_s, object_class: Data)
+        return DataObject.new(JSON.parse(res.to_s))
       end
 
       if res.status.server_error?
@@ -42,9 +42,10 @@ module Qismo
       end
 
       if res.status.client_error?
-        body = JSON.parse(res.to_s, object_class: Data)
+        body = DataObject.new(JSON.parse(res.to_s))
+
         error = body.errors
-        error = error.message if error.is_a?(Hash)
+        error = error.message if error.is_a?(DataObject)
 
         error_klass_map = {
           400 => BadRequestError,

data/lib/qismo/model.rb

@@ -1,48 +1,80 @@
 # frozen_string_literal: true
 
 module Qismo
-  module Model
-    class Data < OpenStruct # rubocop:disable Style/OpenStructUse
+  class DataObject
+    def initialize(opt = {})
+      opt.each do |key, value|
+        value = if value.is_a?(Array)
+          handle_array(value)
+          # instance_variable_set("@#{key}", handle_array(value))
+        elsif value.is_a?(Hash)
+          self.class.new(value)
+          # instance_variable_set("@#{key}", self.class.new(value))
+        else
+          value
+          # instance_variable_set("@#{key}", value)
+        end
+
+        self.class.attr_reader(key.to_sym)
+        instance_variable_set("@#{key}", value)
+      end
     end
 
-    class Collection < Array
-      def initialize(data, prev_page: nil, next_page: nil, prev_func: -> { nil }, next_func: -> { nil })
-        super(data)
+    def inspect
+      inspected_func ||= -> do
+        attributes = instance_variables.map do |iv|
+          "#{iv.to_s.delete_prefix("@")}=#{instance_variable_get(iv).inspect}"
+        end
 
-        @prev_page = prev_page
-        @next_page = next_page
-        @prev_func = prev_func
-        @next_func = next_func
+        "#<#{self.class.name} #{attributes.join(", ")}>"
       end
 
-      def has_next_page?
-        @next_page != nil
-      end
+      inspected_func.call
+    end
 
-      alias_method :next_page?, :has_next_page?
+    alias_method :to_s, :inspect
 
-      def has_prev_page?
-        @prev_page != nil
+    private
+
+    def handle_array(values)
+      values.map do |value|
+        if value.is_a?(Hash)
+          self.class.new(value)
+        else
+          value
+        end
       end
+    end
+  end
 
-      alias_method :prev_page?, :has_prev_page?
+  class Collection < Array
+    def initialize(data, prev_page: nil, next_page: nil, prev_func: -> { nil }, next_func: -> { nil })
+      super(data)
 
-      def next_page
-        @next_func.call
-      end
+      @prev_page = prev_page
+      @next_page = next_page
+      @prev_func = prev_func
+      @next_func = next_func
+    end
 
-      def prev_page
-        @prev_func.call
-      end
+    def has_next_page?
+      @next_page != nil
     end
 
-    class Response
-      attr_reader :data, :meta
+    alias_method :next_page?, :has_next_page?
 
-      def initialize(data, meta = {})
-        @data = data
-        @meta = meta
-      end
+    def has_prev_page?
+      @prev_page != nil
+    end
+
+    alias_method :prev_page?, :has_prev_page?
+
+    def next_page
+      @next_func.call if has_next_page?
+    end
+
+    def prev_page
+      @prev_func.call if has_prev_page?
     end
   end
 end

data/lib/qismo/util.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Qismo
+  class Util
+    class << self
+      def in_office_hour?(data)
+        return false if data.timezone.blank?
+
+        offset = Time.zone_offset(data.timezone)
+        tz_current = Time.current.getlocal(offset)
+
+        today_office_hour = data.office_hours.find { |oh| oh.day == tz_current.strftime("%u").to_i }
+        return false if today_office_hour.nil?
+
+        start_hour = today_office_hour.starttime
+        end_hour = today_office_hour.endtime
+
+        start_time = Time.parse("#{tz_current.year}-#{tz_current.month}-#{tz_current.day} #{start_hour} #{data.timezone}")
+        end_time = Time.parse("#{tz_current.year}-#{tz_current.month}-#{tz_current.day} #{end_hour} #{data.timezone}")
+
+        tz_current.between?(start_time, end_time)
+      end
+    end
+  end
+end

data/lib/qismo/version.rb

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

data/lib/qismo.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require "active_support/all"
 require "http"
 
+require "qismo/util"
 require "qismo/version"
 require "qismo/error"
 require "qismo/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qismo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Qiscus Integration
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,6 +127,7 @@ files:
 - lib/qismo/client.rb
 - lib/qismo/error.rb
 - lib/qismo/model.rb
+- lib/qismo/util.rb
 - lib/qismo/version.rb
 homepage: https://qiscus.com
 licenses: