supersaas-api-client 1.1.1 → 2.0.0

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "supersaas-api-client"
+require 'bundler/setup'
+require 'supersaas-api-client'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "supersaas-api-client"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/examples/appointments.rb

@@ -1,19 +1,19 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "date"
-require "pp"
-require "supersaas-api-client"
+require 'date'
+require 'supersaas-api-client'
 
-puts "\n\r# SuperSaaS Appointments Example\n\r"
+puts "# SuperSaaS Appointments Example"
 
 unless Supersaas::Client.instance.account_name && Supersaas::Client.instance.api_key
-  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g.\n\r"
-  puts "    SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<api_key> ./examples/appointments.rb\n\r"
+  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g."
+  puts "SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<api_key> ./examples/appointments.rb"
   return
 end
 
 puts "## Account:  #{Supersaas::Client.instance.account_name}"
-puts "## API Key: #{'*' * Supersaas::Client.instance.api_key.size}\n\r"
+puts "## API Key: #{'*' * Supersaas::Client.instance.api_key.size}"
 
 Supersaas::Client.instance.verbose = true
 
@@ -21,64 +21,92 @@ if ENV['SSS_API_SCHEDULE']
   schedule_id = ENV['SSS_API_SCHEDULE']
   show_slot = ENV['SSS_API_SLOT'] ? true : false
 else
-  puts "ERROR! Missing schedule id. Rerun the script with your schedule id, e.g.\n\r"
-  puts "    SSS_API_SCHEDULE=<scheduleid> ./examples/appointments.rb\n\r"
+  puts "ERROR! Missing schedule id. Rerun the script with your schedule id, e.g."
+  puts "    SSS_API_SCHEDULE=<scheduleid> ./examples/appointments.rb"
   return
 end
 
+# give
+user_id = ENV.fetch('SSS_API_USER', nil)
+
+unless user_id
+  puts "User is created and then deleted at the end"
+  params = { full_name: 'Example', name: 'example@example.com', email: 'example@example.com', api_key: 'example' }
+  user = Supersaas::Client.instance.users.create(params)
+  user_id = user.match(/users\/(\d+)\.json/)[1]
+  puts "#New user created #{user_id}"
+end
+
+
 description = nil
-new_appointment_id = nil
-user = ENV['SSS_API_USER']
-if user
+if user_id
   description = '1234567890.'
-  params = {full_name: 'Example', description: description, name: 'example@example.com', email: 'example@example.com', mobile: '555-5555', phone: '555-5555', address: 'addr'}
+  params = { full_name: 'Example', description: description, name: 'example@example.com', email: 'example@example.com',
+             mobile: '555-5555', phone: '555-5555', address: 'addr' }
   if show_slot
-    params[:slot_id] = ENV['SSS_API_SLOT']
+    params[:slot_id] = ENV.fetch('SSS_API_SLOT', nil)
   else
-    days = 1 + rand(30)
+    days = rand(1..30)
     params[:start] = Time.now + (days * 24 * 60 * 60)
     params[:finish] = params[:start] + (60 * 60)
   end
-  puts "\n\rcreating new appointment..."
-  puts "\n\r#### Supersaas::Client.instance.appointments.create(#{schedule_id}, #{user}, {...})\n\r"
-  Supersaas::Client.instance.appointments.create(schedule_id, user, params)
+  puts "creating new appointment..."
+  puts "#### Supersaas::Client.instance.appointments.create(#{schedule_id}, #{user_id}, {...})"
+  Supersaas::Client.instance.appointments.create(schedule_id, user_id, params)
 else
-  puts "\n\rskipping create/update/delete (NO DESTRUCTIVE ACTIONS FOR SCHEDULE DATA)...\n\r"
+  puts "skipping create/update/delete (NO DESTRUCTIVE ACTIONS FOR SCHEDULE DATA)..."
 end
 
-puts "\n\rlisting appointments..."
-puts "\n\r#### Supersaas::Client.instance.appointments.list(#{schedule_id}, nil, nil, 25)\n\r"
+puts "listing appointments..."
+puts "#### Supersaas::Client.instance.appointments.list(#{schedule_id}, nil, nil, 25)"
 
 appointments = Supersaas::Client.instance.appointments.list(schedule_id, nil, nil, 25)
-appointments.each do |appointment|
-  puts "#{description} == #{appointment.description}"
-  if description == appointment.description
-    puts "\n\rupdating appointment..."
-    puts "\n\r#### Supersaas::Client.instance.appointments.update(#{schedule_id}, #{new_appointment_id}, {...})\n\r"
-    Supersaas::Client.instance.appointments.update(schedule_id, new_appointment_id, {country: 'FR', address: 'Rue 1'})
-
-    puts "\n\rdeleting appointment..."
-    puts "\n\r#### Supersaas::Client.instance.appointments.delete(#{schedule_id}. #{new_appointment_id})\n\r"
-    Supersaas::Client.instance.appointments.delete(schedule_id, new_appointment_id)
-    break
-  end
-end
 
-if appointments.size > 0
+if appointments.size.positive?
   appointment_id = appointments.sample.id
-  puts "\n\rgetting appointment..."
-  puts "\n\r#### Supersaas::Client.instance.appointments.get(#{appointment_id})\n\r"
+  puts "getting appointment..."
+  puts "#### Supersaas::Client.instance.appointments.get(#{appointment_id})"
   Supersaas::Client.instance.appointments.get(schedule_id, appointment_id)
 end
 
-puts "\n\rlisting changes..."
+puts "listing changes..."
 from = DateTime.now - 120
-puts "\n\r#### Supersaas::Client.instance.appointments.changes(#{schedule_id}, '#{from.strftime("%Y-%m-%d %H:%M:%S")}', '#{to.strftime("%Y-%m-%d %H:%M:%S")}',  #{show_slot || 'false'})\n\r"
+to = DateTime.now + 360_000
+puts "#### Supersaas::Client.instance.appointments.changes(#{schedule_id},
+  '#{from.strftime('%Y-%m-%d %H:%M:%S')}', '#{to.strftime('%Y-%m-%d %H:%M:%S')}', #{show_slot || 'false'})"
 
 Supersaas::Client.instance.appointments.changes(schedule_id, from, show_slot)
 
-puts "\n\rlisting available..."
+puts "listing available..."
 from = DateTime.now
-puts "\n\r#### Supersaas::Client.instance.appointments.available(#{schedule_id}, '#{from.strftime("%Y-%m-%d %H:%M:%S")}')\n\r"
+puts "#### Supersaas::Client.instance.appointments.available(#{schedule_id},
+  '#{from.strftime('%Y-%m-%d %H:%M:%S')}')"
+
+Supersaas::Client.instance.appointments.available(schedule_id, from)
+
+puts "Appointments for a single user..."
+user = Supersaas::Client.instance.users.list(nil, 1).first
+from = DateTime.now
+puts "#### Supersaas::Client.instance.appointments.agenda(#{schedule_id}, user.id,
+  '#{from.strftime('%Y-%m-%d %H:%M:%S')}')"
+Supersaas::Client.instance.appointments.agenda(schedule_id, user.id, from.strftime('%Y-%m-%d %H:%M:%S'))
+
+# Update and delete appointments
+appointments.each do |appointment|
+  puts "#{description} == #{appointment.description}"
+  next unless description == appointment.description
+
+  puts "updating appointment..."
+  puts "#### Supersaas::Client.instance.appointments.update(#{schedule_id}, #{appointment.id}, {...})"
+  Supersaas::Client.instance.appointments.update(schedule_id, appointment.id, { country: 'FR', address: 'Rue 1' })
+
+  puts "deleting appointment..."
+  puts "#### Supersaas::Client.instance.appointments.delete(#{schedule_id}. #{appointment.id})"
+  Supersaas::Client.instance.appointments.delete(schedule_id, appointment.id)
+  break
+end
 
-Supersaas::Client.instance.appointments.available(schedule_id, from)
+# Puts delete user
+unless ENV.fetch('SSS_API_USER', nil)
+  Supersaas::Client.instance.users.delete(user_id)
+end

data/examples/forms.rb

@@ -1,39 +1,37 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "pp"
-require "supersaas-api-client"
+require 'supersaas-api-client'
 
-puts "\n\r# SuperSaaS Forms Example\n\r"
+puts "# SuperSaaS Forms Example"
 
 unless Supersaas::Client.instance.account_name && Supersaas::Client.instance.api_key
-  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g.\n\r"
-  puts "    SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/appointments.rb\n\r"
+  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g."
+  puts "    SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/appointments.rb"
   return
 end
 
 puts "## Account:  #{Supersaas::Client.instance.account_name}"
-puts "## API Key: #{'*' * Supersaas::Client.instance.api_key.size}\n\r"
+puts "## API Key: #{'*' * Supersaas::Client.instance.api_key.size}"
 
 Supersaas::Client.instance.verbose = true
 
-if ENV['SSS_API_FORM']
-  form_id = ENV['SSS_API_FORM']
-else
-  puts "ERROR! Missing form id. Rerun the script with your form id, e.g.\n\r"
-  puts "    SSS_API_FORM=<formid> ./examples/forms.rb\n\r"
-  return
-end
+puts "You will need to create a form, and also attach the form to a booking, see documentation on how to do that"
+puts "The below example will take a form in random, and if it is not attached to something then 404 error will be raised"
+
+puts "listing forms..."
+puts "#### Supersaas::Client.instance.forms.forms"
 
-puts "\n\rlisting forms..."
-puts "\n\r#### Supersaas::Client.instance.forms.list(#{form_id})\n\r"
+template_forms = Supersaas::Client.instance.forms.forms
 
-forms = Supersaas::Client.instance.forms.list(form_id)
+if template_forms.size.positive?
+  template_form_id = template_forms.sample.id
 
-if forms.size > 0
-  form_id = forms.sample.id
-  puts "\n\rgetting form..."
-  puts "\n\r#### Supersaas::Client.instance.forms.get(#{form_id})\n\r"
-  form = Supersaas::Client.instance.forms.get(form_id)
+  puts "listing forms from account"
+  puts "#### Supersaas::Client.instance.forms.list"
+  form_id = Supersaas::Client.instance.forms.list(template_form_id).sample.id
 end
 
-puts
+puts "getting form..."
+puts "#### Supersaas::Client.instance.forms.get(#{form_id})"
+Supersaas::Client.instance.forms.get(form_id)

data/examples/groups.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'supersaas-api-client'
+
+puts "# SuperSaaS Groups Example"
+
+unless Supersaas::Client.instance.account_name && Supersaas::Client.instance.api_key
+  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g."
+  puts "SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/users.rb"
+  return
+end
+
+puts "## Account:  #{Supersaas::Client.instance.account_name}"
+puts "## API KEY: #{'*' * Supersaas::Client.instance.api_key.size}"
+
+Supersaas::Client.instance.verbose = true
+
+puts "listing groups..."
+puts "#### Supersaas::Client.instance.groups.list"
+Supersaas::Client.instance.groups.list

data/examples/promotions.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'supersaas-api-client'
+
+puts "# SuperSaaS Promotions Example"
+
+unless Supersaas::Client.instance.account_name && Supersaas::Client.instance.api_key
+  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g."
+  puts "SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/users.rb"
+  return
+end
+
+puts "## Account:  #{Supersaas::Client.instance.account_name}"
+puts "## API KEY: #{'*' * Supersaas::Client.instance.api_key.size}"
+
+Supersaas::Client.instance.verbose = true
+
+puts "listing promotions..."
+puts "#### Supersaas::Client.instance.promotions.list"
+promotions = Supersaas::Client.instance.promotions.list
+
+[10, promotions.size].min&.times do |i|
+  puts "A promotion"
+  puts "#### Supersaas::Client.instance.promotion(#{promotions[i].id})"
+  Supersaas::Client.instance.promotions.promotion(promotions[i].code)
+end
+
+# Uncomment to try out duplicating a promotional code
+# puts "duplicate promotional code"
+# puts "#### Supersaas::Client.instance.promotions.duplicate_promotion_code('new_id', 'id_to_duplicate')"
+# Supersaas::Client.instance.promotions.duplicate_promotion_code("pcode#{SecureRandom.hex(4)}", promotions.first.code)
+# puts

data/examples/schedules.rb

@@ -1,27 +1,39 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "supersaas-api-client"
+require 'supersaas-api-client'
 
-puts "\n\r# SuperSaaS Schedules Example\n\r"
+puts "# SuperSaaS Schedules Example"
 
 unless Supersaas::Client.instance.account_name && Supersaas::Client.instance.api_key
-  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g.\n\r"
-  puts "    SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/users.rb\n\r"
+  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g."
+  puts "SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/users.rb"
   return
 end
 
 puts "## Account:  #{Supersaas::Client.instance.account_name}"
-puts "## API KEY: #{'*' * Supersaas::Client.instance.api_key.size}\n\r"
+puts "## API KEY: #{'*' * Supersaas::Client.instance.api_key.size}"
 
 Supersaas::Client.instance.verbose = true
 
-puts "\n\rlisting schedules..."
-puts "\n\r#### Supersaas::Client.instance.schedules.list\n\r"
+puts "listing schedules..."
+puts "#### Supersaas::Client.instance.schedules.list"
 schedules = Supersaas::Client.instance.schedules.list
 
-puts "\n\rlisting schedule resources..."
-[10, schedules.size].min.times do |i|
-  puts "\n\r#### Supersaas::Client.instance.schedules.resources(#{schedules[i].id})\n\r"
+puts "listing schedule resources..."
+[10, schedules.size].min&.times do |i|
+  puts "#### Supersaas::Client.instance.schedules.resources(#{schedules[i].id})"
+  # Capacity schedules bomb
+  begin
   Supersaas::Client.instance.schedules.resources(schedules[i].id)
+  rescue
+    next
+  end
 end
-puts
+
+puts "puts listing fields..."
+[10, schedules.size].min&.times do |i|
+  puts "#### Supersaas::Client.instance.schedules.field_list(#{schedules[i].id})"
+  Supersaas::Client.instance.schedules.field_list(schedules[i].id)
+end
+puts

data/examples/users.rb

@@ -1,51 +1,59 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "supersaas-api-client"
+require 'supersaas-api-client'
 
-puts "\n\r# SuperSaaS Users Example\n\r"
+puts "# SuperSaaS Users Example"
 
 unless Supersaas::Client.instance.account_name && Supersaas::Client.instance.api_key
-  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g.\n\r"
-  puts "    SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/users.rb\n\r"
+  puts "ERROR! Missing account credentials. Rerun the script with your credentials, e.g."
+  puts "SSS_API_ACCOUNT_NAME=<myaccountname> SSS_API_KEY=<xxxxxxxxxxxxxxxxxxxxxx> ./examples/users.rb"
   return
 end
 
 puts "## Account:  #{Supersaas::Client.instance.account_name}"
-puts "## API Key: #{'*' * Supersaas::Client.instance.api_key.size}\n\r"
+puts "## API Key: #{'*' * Supersaas::Client.instance.api_key.size}"
 
 Supersaas::Client.instance.verbose = true
 
-puts "creating new user..."
-puts "\n\r#### Supersaas::Client.instance.users.create({...})\n\r"
-params = {full_name: 'Example', name: 'example@example.com', email: 'example@example.com', api_key: 'example'}
+puts 'creating new user...'
+puts "#### Supersaas::Client.instance.users.create({...})"
+params = { full_name: 'Example', name: 'example@example.com', email: 'example@example.com', api_key: 'example' }
 Supersaas::Client.instance.users.create(params)
 new_user_id = nil
 
-puts "\n\rlisting users..."
-puts "\n\r#### Supersaas::Client.instance.users.list(nil, 50)\n\r"
+puts "listing users..."
+puts "#### Supersaas::Client.instance.users.list(nil, 50)"
 
 users = Supersaas::Client.instance.users.list(nil, 50)
 users.each do |user|
-  new_user_id = user.id if user.name == params[:email] || user.email == params[:email]
+  new_user_id = user.id if user.name == params[:email]
 end
 
 if new_user_id
-  puts "\n\rgetting user..."
-  puts "\n\r#### Supersaas::Client.instance.users.get(#{new_user_id})\n\r"
+  puts "getting user..."
+  puts "#### Supersaas::Client.instance.users.get(#{new_user_id})"
   user = Supersaas::Client.instance.users.get(new_user_id)
 
-  puts "\n\rupdating user..."
-  puts "\n\r#### Supersaas::Client.instance.users.update(#{new_user_id})\n\r"
-  Supersaas::Client.instance.users.update(new_user_id, {country: 'FR', address: 'Rue 1'})
+  puts "updating user..."
+  puts "#### Supersaas::Client.instance.users.update(#{new_user_id})"
+  Supersaas::Client.instance.users.update(new_user_id, { country: 'FR', address: 'Rue 1' })
 
-  puts "\n\rdeleting user..."
-  puts "\n\r#### Supersaas::Client.instance.users.delete(#{user.id})\n\r"
+  puts "deleting user..."
+  puts "#### Supersaas::Client.instance.users.delete(#{user.id})"
   Supersaas::Client.instance.users.delete(user.id)
 else
-  puts "\n\r... did not find user in list"
+  puts "... did not find user in list"
 end
 
-puts "\n\rcreating user with errors..."
-puts "\n\r#### Supersaas::Client.instance.users.create\n\r"
-Supersaas::Client.instance.users.create({name: 'error'})
-puts
+puts "creating user with errors..."
+puts "#### Supersaas::Client.instance.users.create"
+begin
+  Supersaas::Client.instance.users.create({ name: 'error' })
+rescue Supersaas::Exception => e
+  puts "This raises an error #{e.message}"
+end
+
+puts "#### Supersaas::Client.instance.users.field_list"
+Supersaas::Client.instance.users.field_list
+puts

data/lib/supersaas-api-client/api/appointments.rb

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 module Supersaas
   # REF: https://www.supersaas.com/info/dev/appointment_api
   class Appointments < BaseApi
-    def agenda(schedule_id, user_id, from_time=nil)
+    def agenda(schedule_id, user_id, from_time = nil, slot = false)
       path = "/agenda/#{validate_id(schedule_id)}"
       params = {
         user: validate_present(user_id),
         from: from_time && validate_datetime(from_time)
       }
+      params.merge!(slot: true) if slot
       res = client.get(path, params)
       map_slots_or_bookings(res)
     end
 
-    def agenda_slots(schedule_id, user_id, from_time=nil)
+    def agenda_slots(schedule_id, user_id, from_time = nil)
       path = "/agenda/#{validate_id(schedule_id)}"
       params = {
         user: validate_present(user_id),
@@ -22,7 +25,7 @@ module Supersaas
       map_slots_or_bookings(res, true)
     end
 
-    def available(schedule_id, from_time, length_minutes=nil, resource=nil, full=nil, limit=nil)
+    def available(schedule_id, from_time, length_minutes = nil, resource = nil, full = nil, limit = nil)
       path = "/free/#{validate_id(schedule_id)}"
       params = {
         length: length_minutes && validate_number(length_minutes),
@@ -35,27 +38,27 @@ module Supersaas
       map_slots_or_bookings(res)
     end
 
-    def list(schedule_id, form=nil, start_time=nil, limit=nil)
-      path = "/bookings"
+    def list(schedule_id, form = nil, start_time = nil, limit = nil)
+      path = '/bookings'
       params = {
-          schedule_id: validate_id(schedule_id),
-          form: form ? true : nil,
-          start: start_time ? validate_datetime(start_time) : nil,
-          limit: limit && validate_number(limit)
+        schedule_id: validate_id(schedule_id),
+        form: form ? true : nil,
+        start: start_time ? validate_datetime(start_time) : nil,
+        limit: limit && validate_number(limit)
       }
       res = client.get(path, params)
       map_slots_or_bookings(res)
     end
 
     def get(schedule_id, appointment_id)
-      params = {schedule_id: validate_id(schedule_id)}
+      params = { schedule_id: validate_id(schedule_id) }
       path = "/bookings/#{validate_id(appointment_id)}"
       res = client.get(path, params)
       Supersaas::Appointment.new(res)
     end
 
-    def create(schedule_id, user_id, attributes, form=nil, webhook=nil)
-      path = "/bookings"
+    def create(schedule_id, user_id, attributes, form = nil, webhook = nil)
+      path = '/bookings'
       params = {
         schedule_id: schedule_id,
         webhook: webhook,
@@ -83,16 +86,14 @@ module Supersaas
       client.post(path, params)
     end
 
-    def update(schedule_id, appointment_id, attributes, form=nil, webhook=nil)
+    def update(schedule_id, appointment_id, attributes, form = nil, webhook = nil)
       path = "/bookings/#{validate_id(appointment_id)}"
       params = {
         schedule_id: schedule_id,
-        webhook: webhook,
-        form: form,
         booking: {
           start: attributes[:start],
           finish: attributes[:finish],
-          name: validate_present(attributes[:name]),
+          name: attributes[:name],
           email: attributes[:email],
           full_name: attributes[:full_name],
           address: attributes[:address],
@@ -108,33 +109,39 @@ module Supersaas
           slot_id: attributes[:slot_id]
         }
       }
+
+      params.merge!(form: form) if form
+      params.merge!(webhook: webhook) if webhook
+      params[:booking].compact!
       client.put(path, params)
     end
 
     def delete(schedule_id, appointment_id)
       path = "/bookings/#{validate_id(appointment_id)}"
-      params = {schedule_id: validate_id(schedule_id)}
+      params = { schedule_id: validate_id(schedule_id) }
       client.delete(path, nil, params)
     end
 
-    def changes(schedule_id, from_time=nil, to=nil, slot=false)
+    def changes(schedule_id, from_time = nil, to = nil, slot = false, user = nil, limit = nil, offset = nil)
       path = "/changes/#{validate_id(schedule_id)}"
-      params = build_param({}, from_time, to, slot)
+      params = build_param({}, from_time, to, slot, user, limit, offset)
       res = client.get(path, params)
       map_slots_or_bookings(res)
     end
 
-    def range(schedule_id, today=false, from_time=nil, to=nil, slot=false)
+    def range(schedule_id, today = false, from_time = nil, to = nil, slot = false, user = nil, resource_id = nil, service_id = nil,
+              limit = nil, offset = nil)
       path = "/range/#{validate_id(schedule_id)}"
-      params = {}; params.merge!(today: true) if today
-      params = build_param(params, from_time, to, slot)
+      params = {}
+      params.merge!(today: true) if today
+      params = build_param(params, from_time, to, slot, user, limit, offset, resource_id, service_id)
       res = client.get(path, params)
       map_slots_or_bookings(res)
     end
 
     private
 
-    def map_slots_or_bookings(obj, slot=false)
+    def map_slots_or_bookings(obj, slot = false)
       if obj.is_a?(Array) && slot
         obj.map { |attributes| Supersaas::Slot.new(attributes) }
       elsif obj.is_a?(Array)
@@ -148,11 +155,16 @@ module Supersaas
       end
     end
 
-    def build_param(params, from_time, to, slot)
+    def build_param(params, from_time, to, slot, user, limit, offset, resource_id = nil, service_id = nil)
       params.merge!(from: validate_datetime(from_time)) if from_time
       params.merge!(to: validate_datetime(to)) if to
       params.merge!(slot: true) if slot
+      params.merge!(user: validate_user(user)) if user
+      params.merge!(limit: validate_number(limit)) if limit
+      params.merge!(offset: validate_number(offset)) if offset
+      params.merge!(resource_id: validate_id(resource_id)) if resource_id
+      params.merge!(service_id: validate_id(service_id)) if service_id
       params
     end
   end
-end
+end