Skip to content

Commit bcb482b

Browse files
authored
Merge pull request #28 from merge-api/fern-bot/07-26-2024-0604PM
July Merge API Sync
2 parents df53960 + 7bac7e3 commit bcb482b

File tree

87 files changed

+1586
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1586
-294
lines changed

lib/merge_ruby_client.rb

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
require_relative "environment"
44
require_relative "types_export"
55
require_relative "requests"
6-
require_relative "merge_ruby_client/filestorage/client"
76
require_relative "merge_ruby_client/ats/client"
87
require_relative "merge_ruby_client/crm/client"
8+
require_relative "merge_ruby_client/filestorage/client"
99
require_relative "merge_ruby_client/hris/client"
1010
require_relative "merge_ruby_client/ticketing/client"
1111
require_relative "merge_ruby_client/accounting/client"
1212

1313
module Merge
1414
class Client
15-
# @return [Merge::Filestorage::Client]
16-
attr_reader :filestorage
1715
# @return [Merge::Ats::Client]
1816
attr_reader :ats
1917
# @return [Merge::Crm::Client]
2018
attr_reader :crm
19+
# @return [Merge::Filestorage::Client]
20+
attr_reader :filestorage
2121
# @return [Merge::Hris::Client]
2222
attr_reader :hris
2323
# @return [Merge::Ticketing::Client]
@@ -42,22 +42,22 @@ def initialize(api_key:, base_url: nil, environment: Merge::Environment::PRODUCT
4242
api_key: api_key,
4343
account_token: account_token
4444
)
45-
@filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
4645
@ats = Merge::Ats::Client.new(request_client: @request_client)
4746
@crm = Merge::Crm::Client.new(request_client: @request_client)
47+
@filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
4848
@hris = Merge::Hris::Client.new(request_client: @request_client)
4949
@ticketing = Merge::Ticketing::Client.new(request_client: @request_client)
5050
@accounting = Merge::Accounting::Client.new(request_client: @request_client)
5151
end
5252
end
5353

5454
class AsyncClient
55-
# @return [Merge::Filestorage::AsyncClient]
56-
attr_reader :filestorage
5755
# @return [Merge::Ats::AsyncClient]
5856
attr_reader :ats
5957
# @return [Merge::Crm::AsyncClient]
6058
attr_reader :crm
59+
# @return [Merge::Filestorage::AsyncClient]
60+
attr_reader :filestorage
6161
# @return [Merge::Hris::AsyncClient]
6262
attr_reader :hris
6363
# @return [Merge::Ticketing::AsyncClient]
@@ -82,9 +82,9 @@ def initialize(api_key:, base_url: nil, environment: Merge::Environment::PRODUCT
8282
api_key: api_key,
8383
account_token: account_token
8484
)
85-
@filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
8685
@ats = Merge::Ats::AsyncClient.new(request_client: @async_request_client)
8786
@crm = Merge::Crm::AsyncClient.new(request_client: @async_request_client)
87+
@filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
8888
@hris = Merge::Hris::AsyncClient.new(request_client: @async_request_client)
8989
@ticketing = Merge::Ticketing::AsyncClient.new(request_client: @async_request_client)
9090
@accounting = Merge::Accounting::AsyncClient.new(request_client: @async_request_client)

lib/merge_ruby_client/accounting/types/credit_note_line_item.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class CreditNoteLineItem
6969
# platform.
7070
# @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
7171
# @return [Merge::Accounting::CreditNoteLineItem]
72-
def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, item: OMIT, name: OMIT,
73-
description: OMIT, quantity: OMIT, memo: OMIT, unit_price: OMIT, total_line_amount: OMIT, tracking_category: OMIT, tracking_categories: OMIT, account: OMIT, company: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
72+
def initialize(tracking_categories:, id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, item: OMIT, name: OMIT,
73+
description: OMIT, quantity: OMIT, memo: OMIT, unit_price: OMIT, total_line_amount: OMIT, tracking_category: OMIT, account: OMIT, company: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
7474
@id = id if id != OMIT
7575
@remote_id = remote_id if remote_id != OMIT
7676
@created_at = created_at if created_at != OMIT
@@ -83,7 +83,7 @@ def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, i
8383
@unit_price = unit_price if unit_price != OMIT
8484
@total_line_amount = total_line_amount if total_line_amount != OMIT
8585
@tracking_category = tracking_category if tracking_category != OMIT
86-
@tracking_categories = tracking_categories if tracking_categories != OMIT
86+
@tracking_categories = tracking_categories
8787
@account = account if account != OMIT
8888
@company = company if company != OMIT
8989
@remote_was_deleted = remote_was_deleted if remote_was_deleted != OMIT
@@ -190,7 +190,7 @@ def self.validate_raw(obj:)
190190
obj.unit_price&.is_a?(String) != false || raise("Passed value for field obj.unit_price is not the expected type, validation failed.")
191191
obj.total_line_amount&.is_a?(String) != false || raise("Passed value for field obj.total_line_amount is not the expected type, validation failed.")
192192
obj.tracking_category&.is_a?(String) != false || raise("Passed value for field obj.tracking_category is not the expected type, validation failed.")
193-
obj.tracking_categories&.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
193+
obj.tracking_categories.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
194194
obj.account&.is_a?(String) != false || raise("Passed value for field obj.account is not the expected type, validation failed.")
195195
obj.company.nil? || Merge::Accounting::CreditNoteLineItemCompany.validate_raw(obj: obj.company)
196196
obj.remote_was_deleted&.is_a?(Boolean) != false || raise("Passed value for field obj.remote_was_deleted is not the expected type, validation failed.")

lib/merge_ruby_client/accounting/types/purchase_order_line_item.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,8 @@ class PurchaseOrderLineItem
691691
# platform.
692692
# @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
693693
# @return [Merge::Accounting::PurchaseOrderLineItem]
694-
def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, description: OMIT,
695-
unit_price: OMIT, quantity: OMIT, item: OMIT, account: OMIT, tracking_category: OMIT, tracking_categories: OMIT, tax_amount: OMIT, total_line_amount: OMIT, currency: OMIT, exchange_rate: OMIT, company: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
694+
def initialize(tracking_categories:, id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, description: OMIT,
695+
unit_price: OMIT, quantity: OMIT, item: OMIT, account: OMIT, tracking_category: OMIT, tax_amount: OMIT, total_line_amount: OMIT, currency: OMIT, exchange_rate: OMIT, company: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
696696
@id = id if id != OMIT
697697
@remote_id = remote_id if remote_id != OMIT
698698
@created_at = created_at if created_at != OMIT
@@ -703,7 +703,7 @@ def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, d
703703
@item = item if item != OMIT
704704
@account = account if account != OMIT
705705
@tracking_category = tracking_category if tracking_category != OMIT
706-
@tracking_categories = tracking_categories if tracking_categories != OMIT
706+
@tracking_categories = tracking_categories
707707
@tax_amount = tax_amount if tax_amount != OMIT
708708
@total_line_amount = total_line_amount if total_line_amount != OMIT
709709
@currency = currency if currency != OMIT
@@ -809,7 +809,7 @@ def self.validate_raw(obj:)
809809
obj.item.nil? || Merge::Accounting::PurchaseOrderLineItemItem.validate_raw(obj: obj.item)
810810
obj.account&.is_a?(String) != false || raise("Passed value for field obj.account is not the expected type, validation failed.")
811811
obj.tracking_category&.is_a?(String) != false || raise("Passed value for field obj.tracking_category is not the expected type, validation failed.")
812-
obj.tracking_categories&.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
812+
obj.tracking_categories.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
813813
obj.tax_amount&.is_a?(String) != false || raise("Passed value for field obj.tax_amount is not the expected type, validation failed.")
814814
obj.total_line_amount&.is_a?(String) != false || raise("Passed value for field obj.total_line_amount is not the expected type, validation failed.")
815815
obj.currency&.is_a?(Merge::Accounting::CurrencyEnum) != false || raise("Passed value for field obj.currency is not the expected type, validation failed.")

lib/merge_ruby_client/accounting/types/purchase_order_line_item_request.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -682,16 +682,16 @@ class PurchaseOrderLineItemRequest
682682
# @param linked_account_params [Hash{String => Object}]
683683
# @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
684684
# @return [Merge::Accounting::PurchaseOrderLineItemRequest]
685-
def initialize(remote_id: OMIT, description: OMIT, unit_price: OMIT, quantity: OMIT, item: OMIT, account: OMIT,
686-
tracking_category: OMIT, tracking_categories: OMIT, tax_amount: OMIT, total_line_amount: OMIT, currency: OMIT, exchange_rate: OMIT, company: OMIT, integration_params: OMIT, linked_account_params: OMIT, additional_properties: nil)
685+
def initialize(tracking_categories:, remote_id: OMIT, description: OMIT, unit_price: OMIT, quantity: OMIT, item: OMIT, account: OMIT,
686+
tracking_category: OMIT, tax_amount: OMIT, total_line_amount: OMIT, currency: OMIT, exchange_rate: OMIT, company: OMIT, integration_params: OMIT, linked_account_params: OMIT, additional_properties: nil)
687687
@remote_id = remote_id if remote_id != OMIT
688688
@description = description if description != OMIT
689689
@unit_price = unit_price if unit_price != OMIT
690690
@quantity = quantity if quantity != OMIT
691691
@item = item if item != OMIT
692692
@account = account if account != OMIT
693693
@tracking_category = tracking_category if tracking_category != OMIT
694-
@tracking_categories = tracking_categories if tracking_categories != OMIT
694+
@tracking_categories = tracking_categories
695695
@tax_amount = tax_amount if tax_amount != OMIT
696696
@total_line_amount = total_line_amount if total_line_amount != OMIT
697697
@currency = currency if currency != OMIT
@@ -789,7 +789,7 @@ def self.validate_raw(obj:)
789789
obj.item.nil? || Merge::Accounting::PurchaseOrderLineItemRequestItem.validate_raw(obj: obj.item)
790790
obj.account&.is_a?(String) != false || raise("Passed value for field obj.account is not the expected type, validation failed.")
791791
obj.tracking_category&.is_a?(String) != false || raise("Passed value for field obj.tracking_category is not the expected type, validation failed.")
792-
obj.tracking_categories&.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
792+
obj.tracking_categories.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
793793
obj.tax_amount&.is_a?(String) != false || raise("Passed value for field obj.tax_amount is not the expected type, validation failed.")
794794
obj.total_line_amount&.is_a?(String) != false || raise("Passed value for field obj.total_line_amount is not the expected type, validation failed.")
795795
obj.currency&.is_a?(Merge::Accounting::CurrencyEnum) != false || raise("Passed value for field obj.currency is not the expected type, validation failed.")

lib/merge_ruby_client/accounting/types/transaction_line_item.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,8 @@ class TransactionLineItem
691691
# platform.
692692
# @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
693693
# @return [Merge::Accounting::TransactionLineItem]
694-
def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, memo: OMIT, unit_price: OMIT,
695-
quantity: OMIT, item: OMIT, account: OMIT, tracking_category: OMIT, tracking_categories: OMIT, total_line_amount: OMIT, tax_rate: OMIT, currency: OMIT, exchange_rate: OMIT, company: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
694+
def initialize(tracking_categories:, id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, memo: OMIT, unit_price: OMIT,
695+
quantity: OMIT, item: OMIT, account: OMIT, tracking_category: OMIT, total_line_amount: OMIT, tax_rate: OMIT, currency: OMIT, exchange_rate: OMIT, company: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
696696
@id = id if id != OMIT
697697
@remote_id = remote_id if remote_id != OMIT
698698
@created_at = created_at if created_at != OMIT
@@ -703,7 +703,7 @@ def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, m
703703
@item = item if item != OMIT
704704
@account = account if account != OMIT
705705
@tracking_category = tracking_category if tracking_category != OMIT
706-
@tracking_categories = tracking_categories if tracking_categories != OMIT
706+
@tracking_categories = tracking_categories
707707
@total_line_amount = total_line_amount if total_line_amount != OMIT
708708
@tax_rate = tax_rate if tax_rate != OMIT
709709
@currency = currency if currency != OMIT
@@ -809,7 +809,7 @@ def self.validate_raw(obj:)
809809
obj.item.nil? || Merge::Accounting::TransactionLineItemItem.validate_raw(obj: obj.item)
810810
obj.account&.is_a?(String) != false || raise("Passed value for field obj.account is not the expected type, validation failed.")
811811
obj.tracking_category&.is_a?(String) != false || raise("Passed value for field obj.tracking_category is not the expected type, validation failed.")
812-
obj.tracking_categories&.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
812+
obj.tracking_categories.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
813813
obj.total_line_amount&.is_a?(String) != false || raise("Passed value for field obj.total_line_amount is not the expected type, validation failed.")
814814
obj.tax_rate&.is_a?(String) != false || raise("Passed value for field obj.tax_rate is not the expected type, validation failed.")
815815
obj.currency&.is_a?(Merge::Accounting::CurrencyEnum) != false || raise("Passed value for field obj.currency is not the expected type, validation failed.")

lib/merge_ruby_client/accounting/types/vendor_credit_line.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ class VendorCreditLine
6262
# platform.
6363
# @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
6464
# @return [Merge::Accounting::VendorCreditLine]
65-
def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, net_amount: OMIT,
66-
tracking_category: OMIT, tracking_categories: OMIT, description: OMIT, account: OMIT, company: OMIT, exchange_rate: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
65+
def initialize(tracking_categories:, id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, net_amount: OMIT,
66+
tracking_category: OMIT, description: OMIT, account: OMIT, company: OMIT, exchange_rate: OMIT, remote_was_deleted: OMIT, additional_properties: nil)
6767
@id = id if id != OMIT
6868
@remote_id = remote_id if remote_id != OMIT
6969
@created_at = created_at if created_at != OMIT
7070
@modified_at = modified_at if modified_at != OMIT
7171
@net_amount = net_amount if net_amount != OMIT
7272
@tracking_category = tracking_category if tracking_category != OMIT
73-
@tracking_categories = tracking_categories if tracking_categories != OMIT
73+
@tracking_categories = tracking_categories
7474
@description = description if description != OMIT
7575
@account = account if account != OMIT
7676
@company = company if company != OMIT
@@ -156,7 +156,7 @@ def self.validate_raw(obj:)
156156
obj.modified_at&.is_a?(DateTime) != false || raise("Passed value for field obj.modified_at is not the expected type, validation failed.")
157157
obj.net_amount&.is_a?(Float) != false || raise("Passed value for field obj.net_amount is not the expected type, validation failed.")
158158
obj.tracking_category&.is_a?(String) != false || raise("Passed value for field obj.tracking_category is not the expected type, validation failed.")
159-
obj.tracking_categories&.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
159+
obj.tracking_categories.is_a?(Array) != false || raise("Passed value for field obj.tracking_categories is not the expected type, validation failed.")
160160
obj.description&.is_a?(String) != false || raise("Passed value for field obj.description is not the expected type, validation failed.")
161161
obj.account.nil? || Merge::Accounting::VendorCreditLineAccount.validate_raw(obj: obj.account)
162162
obj.company&.is_a?(String) != false || raise("Passed value for field obj.company is not the expected type, validation failed.")

lib/merge_ruby_client/ats/applications/client.rb

+2
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ def list(candidate_id: nil, created_after: nil, created_before: nil, credited_to
103103
# * :offers (Array<Merge::Ats::ApplicationRequestOffersItem>)
104104
# * :source (String)
105105
# * :credited_to (Hash)
106+
# * :screening_question_answers (Array<Merge::Ats::ApplicationRequestScreeningQuestionAnswersItem>)
106107
# * :current_stage (Hash)
107108
# * :reject_reason (Hash)
108109
# * :remote_template_id (String)
@@ -351,6 +352,7 @@ def list(candidate_id: nil, created_after: nil, created_before: nil, credited_to
351352
# * :offers (Array<Merge::Ats::ApplicationRequestOffersItem>)
352353
# * :source (String)
353354
# * :credited_to (Hash)
355+
# * :screening_question_answers (Array<Merge::Ats::ApplicationRequestScreeningQuestionAnswersItem>)
354356
# * :current_stage (Hash)
355357
# * :reject_reason (Hash)
356358
# * :remote_template_id (String)

0 commit comments

Comments
 (0)