merge_hris_client 3.2.1 → 3.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (226) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +49 -16
  3. data/docs/AccountDetails.md +3 -1
  4. data/docs/AccountDetailsAndActions.md +7 -3
  5. data/docs/AccountIntegration.md +8 -4
  6. data/docs/AdvancedMetadata.md +28 -0
  7. data/docs/AuditLogEvent.md +32 -0
  8. data/docs/AuditTrailApi.md +91 -0
  9. data/docs/BankInfo.md +6 -4
  10. data/docs/BankInfoApi.md +4 -4
  11. data/docs/Benefit.md +6 -4
  12. data/docs/CommonModelScopeAPI.md +18 -0
  13. data/docs/Company.md +6 -4
  14. data/docs/CreateFieldMappingRequest.md +28 -0
  15. data/docs/DataPassthroughRequest.md +4 -4
  16. data/docs/DebugModelLogSummary.md +1 -1
  17. data/docs/Deduction.md +6 -4
  18. data/docs/Dependent.md +6 -4
  19. data/docs/Earning.md +6 -4
  20. data/docs/Employee.md +7 -3
  21. data/docs/EmployeePayrollRun.md +6 -4
  22. data/docs/EmployeeRequest.md +2 -0
  23. data/docs/EmployeesApi.md +10 -4
  24. data/docs/EmployerBenefit.md +6 -4
  25. data/docs/Employment.md +6 -4
  26. data/docs/EmploymentsApi.md +4 -4
  27. data/docs/EndUserDetailsRequest.md +13 -7
  28. data/docs/EventTypeEnum.md +15 -0
  29. data/docs/ExternalTargetFieldAPI.md +22 -0
  30. data/docs/ExternalTargetFieldAPIResponse.md +48 -0
  31. data/docs/FieldMappingApi.md +455 -0
  32. data/docs/FieldMappingApiInstance.md +24 -0
  33. data/docs/FieldMappingApiInstanceRemoteField.md +22 -0
  34. data/docs/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.md +22 -0
  35. data/docs/FieldMappingApiInstanceResponse.md +48 -0
  36. data/docs/FieldMappingApiInstanceTargetField.md +22 -0
  37. data/docs/FieldMappingInstanceResponse.md +24 -0
  38. data/docs/FieldPermissionDeserializer.md +20 -0
  39. data/docs/FieldPermissionDeserializerRequest.md +20 -0
  40. data/docs/ForceResyncApi.md +1 -1
  41. data/docs/GenerateRemoteKeyRequest.md +1 -1
  42. data/docs/Group.md +9 -5
  43. data/docs/GroupsApi.md +8 -4
  44. data/docs/IndividualCommonModelScopeDeserializer.md +22 -0
  45. data/docs/IndividualCommonModelScopeDeserializerRequest.md +22 -0
  46. data/docs/Issue.md +1 -1
  47. data/docs/IssuesApi.md +5 -3
  48. data/docs/LinkTokenApi.md +1 -1
  49. data/docs/LinkedAccountCommonModelScopeDeserializerRequest.md +18 -0
  50. data/docs/LinkedAccountsApi.md +2 -2
  51. data/docs/Location.md +6 -4
  52. data/docs/LocationsApi.md +6 -4
  53. data/docs/MetaResponse.md +1 -1
  54. data/docs/ModelPermissionDeserializer.md +18 -0
  55. data/docs/ModelPermissionDeserializerRequest.md +18 -0
  56. data/docs/PaginatedAuditLogEventList.md +22 -0
  57. data/docs/PaginatedTimesheetEntryList.md +22 -0
  58. data/docs/PatchedEditFieldMappingRequest.md +22 -0
  59. data/docs/PayGroup.md +6 -4
  60. data/docs/PayrollRun.md +6 -4
  61. data/docs/PayrollRunsApi.md +4 -4
  62. data/docs/RemoteEndpointInfo.md +22 -0
  63. data/docs/RemoteFieldAPI.md +28 -0
  64. data/docs/RemoteFieldAPIResponse.md +48 -0
  65. data/docs/RemoteKeyForRegenerationRequest.md +1 -1
  66. data/docs/RoleEnum.md +15 -0
  67. data/docs/ScopesApi.md +222 -0
  68. data/docs/SyncStatusApi.md +1 -1
  69. data/docs/Tax.md +6 -4
  70. data/docs/Team.md +6 -4
  71. data/docs/TimeOff.md +5 -3
  72. data/docs/TimeOffApi.md +12 -4
  73. data/docs/TimeOffBalance.md +6 -4
  74. data/docs/TimeOffBalancesApi.md +4 -4
  75. data/docs/TimesheetEntriesApi.md +341 -0
  76. data/docs/TimesheetEntry.md +38 -0
  77. data/docs/TimesheetEntryEndpointRequest.md +18 -0
  78. data/docs/TimesheetEntryRequest.md +28 -0
  79. data/docs/TimesheetEntryResponse.md +24 -0
  80. data/lib/merge_hris_client/api/audit_trail_api.rb +95 -0
  81. data/lib/merge_hris_client/api/bank_info_api.rb +4 -4
  82. data/lib/merge_hris_client/api/employees_api.rb +13 -4
  83. data/lib/merge_hris_client/api/employments_api.rb +4 -4
  84. data/lib/merge_hris_client/api/field_mapping_api.rb +424 -0
  85. data/lib/merge_hris_client/api/force_resync_api.rb +2 -2
  86. data/lib/merge_hris_client/api/groups_api.rb +10 -4
  87. data/lib/merge_hris_client/api/issues_api.rb +7 -4
  88. data/lib/merge_hris_client/api/linked_accounts_api.rb +3 -3
  89. data/lib/merge_hris_client/api/locations_api.rb +11 -4
  90. data/lib/merge_hris_client/api/payroll_runs_api.rb +4 -4
  91. data/lib/merge_hris_client/api/scopes_api.rb +209 -0
  92. data/lib/merge_hris_client/api/sync_status_api.rb +2 -2
  93. data/lib/merge_hris_client/api/time_off_api.rb +16 -4
  94. data/lib/merge_hris_client/api/time_off_balances_api.rb +4 -4
  95. data/lib/merge_hris_client/api/timesheet_entries_api.rb +342 -0
  96. data/lib/merge_hris_client/configuration.rb +4 -0
  97. data/lib/merge_hris_client/models/account_details.rb +14 -5
  98. data/lib/merge_hris_client/models/account_details_and_actions.rb +28 -4
  99. data/lib/merge_hris_client/models/account_integration.rb +36 -14
  100. data/lib/merge_hris_client/models/advanced_metadata.rb +270 -0
  101. data/lib/merge_hris_client/models/audit_log_event.rb +356 -0
  102. data/lib/merge_hris_client/models/bank_info.rb +24 -16
  103. data/lib/merge_hris_client/models/benefit.rb +24 -16
  104. data/lib/merge_hris_client/models/common_model_scope_api.rb +226 -0
  105. data/lib/merge_hris_client/models/company.rb +24 -16
  106. data/lib/merge_hris_client/models/create_field_mapping_request.rb +396 -0
  107. data/lib/merge_hris_client/models/data_passthrough_request.rb +3 -0
  108. data/lib/merge_hris_client/models/deduction.rb +24 -16
  109. data/lib/merge_hris_client/models/dependent.rb +24 -16
  110. data/lib/merge_hris_client/models/earning.rb +24 -16
  111. data/lib/merge_hris_client/models/employee.rb +34 -15
  112. data/lib/merge_hris_client/models/employee_payroll_run.rb +24 -16
  113. data/lib/merge_hris_client/models/employee_request.rb +12 -1
  114. data/lib/merge_hris_client/models/employer_benefit.rb +24 -16
  115. data/lib/merge_hris_client/models/employment.rb +24 -16
  116. data/lib/merge_hris_client/models/end_user_details_request.rb +67 -6
  117. data/lib/merge_hris_client/models/event_type_enum.rb +81 -0
  118. data/lib/merge_hris_client/models/external_target_field_api.rb +239 -0
  119. data/lib/merge_hris_client/models/external_target_field_api_response.rb +385 -0
  120. data/lib/merge_hris_client/models/field_mapping_api_instance.rb +247 -0
  121. data/lib/merge_hris_client/models/field_mapping_api_instance_remote_field.rb +253 -0
  122. data/lib/merge_hris_client/models/field_mapping_api_instance_remote_field_remote_endpoint_info.rb +241 -0
  123. data/lib/merge_hris_client/models/field_mapping_api_instance_response.rb +385 -0
  124. data/lib/merge_hris_client/models/field_mapping_api_instance_target_field.rb +251 -0
  125. data/lib/merge_hris_client/models/field_mapping_instance_response.rb +266 -0
  126. data/lib/merge_hris_client/models/field_permission_deserializer.rb +231 -0
  127. data/lib/merge_hris_client/models/field_permission_deserializer_request.rb +231 -0
  128. data/lib/merge_hris_client/models/generate_remote_key_request.rb +1 -0
  129. data/lib/merge_hris_client/models/group.rb +34 -15
  130. data/lib/merge_hris_client/models/individual_common_model_scope_deserializer.rb +243 -0
  131. data/lib/merge_hris_client/models/individual_common_model_scope_deserializer_request.rb +262 -0
  132. data/lib/merge_hris_client/models/linked_account_common_model_scope_deserializer_request.rb +226 -0
  133. data/lib/merge_hris_client/models/location.rb +24 -16
  134. data/lib/merge_hris_client/models/model_permission_deserializer.rb +218 -0
  135. data/lib/merge_hris_client/models/model_permission_deserializer_request.rb +218 -0
  136. data/lib/merge_hris_client/models/paginated_audit_log_event_list.rb +240 -0
  137. data/lib/merge_hris_client/models/paginated_timesheet_entry_list.rb +240 -0
  138. data/lib/merge_hris_client/models/patched_edit_field_mapping_request.rb +271 -0
  139. data/lib/merge_hris_client/models/pay_group.rb +24 -16
  140. data/lib/merge_hris_client/models/payroll_run.rb +24 -16
  141. data/lib/merge_hris_client/models/remote_endpoint_info.rb +253 -0
  142. data/lib/merge_hris_client/models/remote_field_api.rb +285 -0
  143. data/lib/merge_hris_client/models/remote_field_api_response.rb +385 -0
  144. data/lib/merge_hris_client/models/remote_key_for_regeneration_request.rb +1 -0
  145. data/lib/merge_hris_client/models/role_enum.rb +49 -0
  146. data/lib/merge_hris_client/models/tax.rb +24 -16
  147. data/lib/merge_hris_client/models/team.rb +24 -16
  148. data/lib/merge_hris_client/models/time_off.rb +23 -15
  149. data/lib/merge_hris_client/models/time_off_balance.rb +24 -16
  150. data/lib/merge_hris_client/models/timesheet_entry.rb +326 -0
  151. data/lib/merge_hris_client/models/timesheet_entry_endpoint_request.rb +223 -0
  152. data/lib/merge_hris_client/models/timesheet_entry_request.rb +278 -0
  153. data/lib/merge_hris_client/models/timesheet_entry_response.rb +266 -0
  154. data/lib/merge_hris_client/version.rb +1 -1
  155. data/lib/merge_hris_client.rb +35 -21
  156. data/spec/api/audit_trail_api_spec.rb +51 -0
  157. data/spec/api/bank_info_api_spec.rb +2 -2
  158. data/spec/api/employees_api_spec.rb +5 -2
  159. data/spec/api/employments_api_spec.rb +2 -2
  160. data/spec/api/field_mapping_api_spec.rb +107 -0
  161. data/spec/api/force_resync_api_spec.rb +1 -1
  162. data/spec/api/groups_api_spec.rb +4 -2
  163. data/spec/api/issues_api_spec.rb +3 -2
  164. data/spec/api/linked_accounts_api_spec.rb +1 -1
  165. data/spec/api/locations_api_spec.rb +3 -2
  166. data/spec/api/payroll_runs_api_spec.rb +2 -2
  167. data/spec/api/scopes_api_spec.rb +68 -0
  168. data/spec/api/sync_status_api_spec.rb +1 -1
  169. data/spec/api/time_off_api_spec.rb +6 -2
  170. data/spec/api/time_off_balances_api_spec.rb +2 -2
  171. data/spec/api/timesheet_entries_api_spec.rb +99 -0
  172. data/spec/models/account_details_and_actions_spec.rb +12 -0
  173. data/spec/models/account_details_spec.rb +6 -0
  174. data/spec/models/account_integration_spec.rb +14 -2
  175. data/spec/models/advanced_metadata_spec.rb +64 -0
  176. data/spec/models/audit_log_event_spec.rb +76 -0
  177. data/spec/models/bank_info_spec.rb +12 -6
  178. data/spec/models/benefit_spec.rb +12 -6
  179. data/spec/models/common_model_scope_api_spec.rb +34 -0
  180. data/spec/models/company_spec.rb +11 -5
  181. data/spec/models/create_field_mapping_request_spec.rb +64 -0
  182. data/spec/models/deduction_spec.rb +12 -6
  183. data/spec/models/dependent_spec.rb +12 -6
  184. data/spec/models/earning_spec.rb +11 -5
  185. data/spec/models/employee_payroll_run_spec.rb +12 -6
  186. data/spec/models/employee_request_spec.rb +6 -0
  187. data/spec/models/employee_spec.rb +18 -6
  188. data/spec/models/employer_benefit_spec.rb +12 -6
  189. data/spec/models/employment_spec.rb +12 -6
  190. data/spec/models/end_user_details_request_spec.rb +18 -0
  191. data/spec/models/event_type_enum_spec.rb +28 -0
  192. data/spec/models/external_target_field_api_response_spec.rb +124 -0
  193. data/spec/models/external_target_field_api_spec.rb +46 -0
  194. data/spec/models/field_mapping_api_instance_remote_field_remote_endpoint_info_spec.rb +46 -0
  195. data/spec/models/field_mapping_api_instance_remote_field_spec.rb +46 -0
  196. data/spec/models/field_mapping_api_instance_response_spec.rb +124 -0
  197. data/spec/models/field_mapping_api_instance_spec.rb +52 -0
  198. data/spec/models/field_mapping_api_instance_target_field_spec.rb +46 -0
  199. data/spec/models/field_mapping_instance_response_spec.rb +52 -0
  200. data/spec/models/field_permission_deserializer_request_spec.rb +40 -0
  201. data/spec/models/field_permission_deserializer_spec.rb +40 -0
  202. data/spec/models/group_spec.rb +13 -1
  203. data/spec/models/individual_common_model_scope_deserializer_request_spec.rb +46 -0
  204. data/spec/models/individual_common_model_scope_deserializer_spec.rb +46 -0
  205. data/spec/models/linked_account_common_model_scope_deserializer_request_spec.rb +34 -0
  206. data/spec/models/location_spec.rb +12 -6
  207. data/spec/models/model_permission_deserializer_request_spec.rb +34 -0
  208. data/spec/models/model_permission_deserializer_spec.rb +34 -0
  209. data/spec/models/paginated_audit_log_event_list_spec.rb +46 -0
  210. data/spec/models/paginated_timesheet_entry_list_spec.rb +46 -0
  211. data/spec/models/patched_edit_field_mapping_request_spec.rb +46 -0
  212. data/spec/models/pay_group_spec.rb +9 -3
  213. data/spec/models/payroll_run_spec.rb +12 -6
  214. data/spec/models/remote_endpoint_info_spec.rb +46 -0
  215. data/spec/models/remote_field_api_response_spec.rb +124 -0
  216. data/spec/models/remote_field_api_spec.rb +64 -0
  217. data/spec/models/role_enum_spec.rb +28 -0
  218. data/spec/models/tax_spec.rb +12 -6
  219. data/spec/models/team_spec.rb +10 -4
  220. data/spec/models/time_off_balance_spec.rb +12 -6
  221. data/spec/models/time_off_spec.rb +12 -6
  222. data/spec/models/timesheet_entry_endpoint_request_spec.rb +34 -0
  223. data/spec/models/timesheet_entry_request_spec.rb +64 -0
  224. data/spec/models/timesheet_entry_response_spec.rb +52 -0
  225. data/spec/models/timesheet_entry_spec.rb +94 -0
  226. metadata +266 -126
@@ -21,6 +21,12 @@ module MergeHRISClient
21
21
  # The third-party API ID of the matching object.
22
22
  attr_accessor :remote_id
23
23
 
24
+ # The datetime that this object was created by Merge.
25
+ attr_accessor :created_at
26
+
27
+ # The datetime that this object was modified by Merge.
28
+ attr_accessor :modified_at
29
+
24
30
  attr_accessor :employee_payroll_run
25
31
 
26
32
  # The amount earned.
@@ -29,12 +35,9 @@ module MergeHRISClient
29
35
  # The type of earning. * `SALARY` - SALARY * `REIMBURSEMENT` - REIMBURSEMENT * `OVERTIME` - OVERTIME * `BONUS` - BONUS
30
36
  attr_accessor :type
31
37
 
32
- # Indicates whether or not this object has been deleted by third party webhooks.
38
+ # Indicates whether or not this object has been deleted in the third party platform.
33
39
  attr_accessor :remote_was_deleted
34
40
 
35
- # This is the datetime that this object was last updated by Merge
36
- attr_accessor :modified_at
37
-
38
41
  attr_accessor :field_mappings
39
42
 
40
43
  attr_accessor :remote_data
@@ -44,11 +47,12 @@ module MergeHRISClient
44
47
  {
45
48
  :'id' => :'id',
46
49
  :'remote_id' => :'remote_id',
50
+ :'created_at' => :'created_at',
51
+ :'modified_at' => :'modified_at',
47
52
  :'employee_payroll_run' => :'employee_payroll_run',
48
53
  :'amount' => :'amount',
49
54
  :'type' => :'type',
50
55
  :'remote_was_deleted' => :'remote_was_deleted',
51
- :'modified_at' => :'modified_at',
52
56
  :'field_mappings' => :'field_mappings',
53
57
  :'remote_data' => :'remote_data'
54
58
  }
@@ -64,12 +68,13 @@ module MergeHRISClient
64
68
  {
65
69
  :'id' => :'String',
66
70
  :'remote_id' => :'String',
71
+ :'created_at' => :'Time',
72
+ :'modified_at' => :'Time',
67
73
  :'employee_payroll_run' => :'String',
68
74
  :'amount' => :'Float',
69
75
  :'type' => :'EarningTypeEnum',
70
76
  :'remote_was_deleted' => :'Boolean',
71
- :'modified_at' => :'Time',
72
- :'field_mappings' => :'Hash<String, Object>',
77
+ :'field_mappings' => :'Object',
73
78
  :'remote_data' => :'Array<RemoteData>'
74
79
  }
75
80
  end
@@ -109,6 +114,14 @@ module MergeHRISClient
109
114
  self.remote_id = attributes[:'remote_id']
110
115
  end
111
116
 
117
+ if attributes.key?(:'created_at')
118
+ self.created_at = attributes[:'created_at']
119
+ end
120
+
121
+ if attributes.key?(:'modified_at')
122
+ self.modified_at = attributes[:'modified_at']
123
+ end
124
+
112
125
  if attributes.key?(:'employee_payroll_run')
113
126
  self.employee_payroll_run = attributes[:'employee_payroll_run']
114
127
  end
@@ -125,14 +138,8 @@ module MergeHRISClient
125
138
  self.remote_was_deleted = attributes[:'remote_was_deleted']
126
139
  end
127
140
 
128
- if attributes.key?(:'modified_at')
129
- self.modified_at = attributes[:'modified_at']
130
- end
131
-
132
141
  if attributes.key?(:'field_mappings')
133
- if (value = attributes[:'field_mappings']).is_a?(Hash)
134
- self.field_mappings = value
135
- end
142
+ self.field_mappings = attributes[:'field_mappings']
136
143
  end
137
144
 
138
145
  if attributes.key?(:'remote_data')
@@ -162,11 +169,12 @@ module MergeHRISClient
162
169
  self.class == o.class &&
163
170
  id == o.id &&
164
171
  remote_id == o.remote_id &&
172
+ created_at == o.created_at &&
173
+ modified_at == o.modified_at &&
165
174
  employee_payroll_run == o.employee_payroll_run &&
166
175
  amount == o.amount &&
167
176
  type == o.type &&
168
177
  remote_was_deleted == o.remote_was_deleted &&
169
- modified_at == o.modified_at &&
170
178
  field_mappings == o.field_mappings &&
171
179
  remote_data == o.remote_data
172
180
  end
@@ -180,7 +188,7 @@ module MergeHRISClient
180
188
  # Calculates hash code according to all attributes.
181
189
  # @return [Integer] Hash code
182
190
  def hash
183
- [id, remote_id, employee_payroll_run, amount, type, remote_was_deleted, modified_at, field_mappings, remote_data].hash
191
+ [id, remote_id, created_at, modified_at, employee_payroll_run, amount, type, remote_was_deleted, field_mappings, remote_data].hash
184
192
  end
185
193
 
186
194
  # Builds the object from hash
@@ -21,6 +21,12 @@ module MergeHRISClient
21
21
  # The third-party API ID of the matching object.
22
22
  attr_accessor :remote_id
23
23
 
24
+ # The datetime that this object was created by Merge.
25
+ attr_accessor :created_at
26
+
27
+ # The datetime that this object was modified by Merge.
28
+ attr_accessor :modified_at
29
+
24
30
  # The employee's number that appears in the third-party integration's UI.
25
31
  attr_accessor :employee_number
26
32
 
@@ -33,6 +39,9 @@ module MergeHRISClient
33
39
  # The employee's last name.
34
40
  attr_accessor :last_name
35
41
 
42
+ # The employee's preferred first name.
43
+ attr_accessor :preferred_name
44
+
36
45
  # The employee's full name, to use for display purposes. If a preferred first name is available, the full name will include the preferred first name.
37
46
  attr_accessor :display_full_name
38
47
 
@@ -106,9 +115,6 @@ module MergeHRISClient
106
115
 
107
116
  attr_accessor :remote_was_deleted
108
117
 
109
- # This is the datetime that this object was last updated by Merge
110
- attr_accessor :modified_at
111
-
112
118
  attr_accessor :field_mappings
113
119
 
114
120
  attr_accessor :remote_data
@@ -118,10 +124,13 @@ module MergeHRISClient
118
124
  {
119
125
  :'id' => :'id',
120
126
  :'remote_id' => :'remote_id',
127
+ :'created_at' => :'created_at',
128
+ :'modified_at' => :'modified_at',
121
129
  :'employee_number' => :'employee_number',
122
130
  :'company' => :'company',
123
131
  :'first_name' => :'first_name',
124
132
  :'last_name' => :'last_name',
133
+ :'preferred_name' => :'preferred_name',
125
134
  :'display_full_name' => :'display_full_name',
126
135
  :'username' => :'username',
127
136
  :'groups' => :'groups',
@@ -147,7 +156,6 @@ module MergeHRISClient
147
156
  :'avatar' => :'avatar',
148
157
  :'custom_fields' => :'custom_fields',
149
158
  :'remote_was_deleted' => :'remote_was_deleted',
150
- :'modified_at' => :'modified_at',
151
159
  :'field_mappings' => :'field_mappings',
152
160
  :'remote_data' => :'remote_data'
153
161
  }
@@ -163,10 +171,13 @@ module MergeHRISClient
163
171
  {
164
172
  :'id' => :'String',
165
173
  :'remote_id' => :'String',
174
+ :'created_at' => :'Time',
175
+ :'modified_at' => :'Time',
166
176
  :'employee_number' => :'String',
167
177
  :'company' => :'String',
168
178
  :'first_name' => :'String',
169
179
  :'last_name' => :'String',
180
+ :'preferred_name' => :'String',
170
181
  :'display_full_name' => :'String',
171
182
  :'username' => :'String',
172
183
  :'groups' => :'Array<String>',
@@ -192,8 +203,7 @@ module MergeHRISClient
192
203
  :'avatar' => :'String',
193
204
  :'custom_fields' => :'Hash<String, Object>',
194
205
  :'remote_was_deleted' => :'Boolean',
195
- :'modified_at' => :'Time',
196
- :'field_mappings' => :'Hash<String, Object>',
206
+ :'field_mappings' => :'Object',
197
207
  :'remote_data' => :'Array<RemoteData>'
198
208
  }
199
209
  end
@@ -206,6 +216,7 @@ module MergeHRISClient
206
216
  :'company',
207
217
  :'first_name',
208
218
  :'last_name',
219
+ :'preferred_name',
209
220
  :'display_full_name',
210
221
  :'username',
211
222
  :'work_email',
@@ -256,6 +267,14 @@ module MergeHRISClient
256
267
  self.remote_id = attributes[:'remote_id']
257
268
  end
258
269
 
270
+ if attributes.key?(:'created_at')
271
+ self.created_at = attributes[:'created_at']
272
+ end
273
+
274
+ if attributes.key?(:'modified_at')
275
+ self.modified_at = attributes[:'modified_at']
276
+ end
277
+
259
278
  if attributes.key?(:'employee_number')
260
279
  self.employee_number = attributes[:'employee_number']
261
280
  end
@@ -272,6 +291,10 @@ module MergeHRISClient
272
291
  self.last_name = attributes[:'last_name']
273
292
  end
274
293
 
294
+ if attributes.key?(:'preferred_name')
295
+ self.preferred_name = attributes[:'preferred_name']
296
+ end
297
+
275
298
  if attributes.key?(:'display_full_name')
276
299
  self.display_full_name = attributes[:'display_full_name']
277
300
  end
@@ -378,14 +401,8 @@ module MergeHRISClient
378
401
  self.remote_was_deleted = attributes[:'remote_was_deleted']
379
402
  end
380
403
 
381
- if attributes.key?(:'modified_at')
382
- self.modified_at = attributes[:'modified_at']
383
- end
384
-
385
404
  if attributes.key?(:'field_mappings')
386
- if (value = attributes[:'field_mappings']).is_a?(Hash)
387
- self.field_mappings = value
388
- end
405
+ self.field_mappings = attributes[:'field_mappings']
389
406
  end
390
407
 
391
408
  if attributes.key?(:'remote_data')
@@ -475,10 +492,13 @@ module MergeHRISClient
475
492
  self.class == o.class &&
476
493
  id == o.id &&
477
494
  remote_id == o.remote_id &&
495
+ created_at == o.created_at &&
496
+ modified_at == o.modified_at &&
478
497
  employee_number == o.employee_number &&
479
498
  company == o.company &&
480
499
  first_name == o.first_name &&
481
500
  last_name == o.last_name &&
501
+ preferred_name == o.preferred_name &&
482
502
  display_full_name == o.display_full_name &&
483
503
  username == o.username &&
484
504
  groups == o.groups &&
@@ -504,7 +524,6 @@ module MergeHRISClient
504
524
  avatar == o.avatar &&
505
525
  custom_fields == o.custom_fields &&
506
526
  remote_was_deleted == o.remote_was_deleted &&
507
- modified_at == o.modified_at &&
508
527
  field_mappings == o.field_mappings &&
509
528
  remote_data == o.remote_data
510
529
  end
@@ -518,7 +537,7 @@ module MergeHRISClient
518
537
  # Calculates hash code according to all attributes.
519
538
  # @return [Integer] Hash code
520
539
  def hash
521
- [id, remote_id, employee_number, company, first_name, last_name, display_full_name, username, groups, work_email, personal_email, mobile_phone_number, employments, home_location, work_location, manager, team, pay_group, ssn, gender, ethnicity, marital_status, date_of_birth, hire_date, start_date, remote_created_at, employment_status, termination_date, avatar, custom_fields, remote_was_deleted, modified_at, field_mappings, remote_data].hash
540
+ [id, remote_id, created_at, modified_at, employee_number, company, first_name, last_name, preferred_name, display_full_name, username, groups, work_email, personal_email, mobile_phone_number, employments, home_location, work_location, manager, team, pay_group, ssn, gender, ethnicity, marital_status, date_of_birth, hire_date, start_date, remote_created_at, employment_status, termination_date, avatar, custom_fields, remote_was_deleted, field_mappings, remote_data].hash
522
541
  end
523
542
 
524
543
  # Builds the object from hash
@@ -21,6 +21,12 @@ module MergeHRISClient
21
21
  # The third-party API ID of the matching object.
22
22
  attr_accessor :remote_id
23
23
 
24
+ # The datetime that this object was created by Merge.
25
+ attr_accessor :created_at
26
+
27
+ # The datetime that this object was modified by Merge.
28
+ attr_accessor :modified_at
29
+
24
30
  # The employee whose payroll is being run.
25
31
  attr_accessor :employee
26
32
 
@@ -48,12 +54,9 @@ module MergeHRISClient
48
54
 
49
55
  attr_accessor :taxes
50
56
 
51
- # Indicates whether or not this object has been deleted by third party webhooks.
57
+ # Indicates whether or not this object has been deleted in the third party platform.
52
58
  attr_accessor :remote_was_deleted
53
59
 
54
- # This is the datetime that this object was last updated by Merge
55
- attr_accessor :modified_at
56
-
57
60
  attr_accessor :field_mappings
58
61
 
59
62
  attr_accessor :remote_data
@@ -63,6 +66,8 @@ module MergeHRISClient
63
66
  {
64
67
  :'id' => :'id',
65
68
  :'remote_id' => :'remote_id',
69
+ :'created_at' => :'created_at',
70
+ :'modified_at' => :'modified_at',
66
71
  :'employee' => :'employee',
67
72
  :'payroll_run' => :'payroll_run',
68
73
  :'gross_pay' => :'gross_pay',
@@ -74,7 +79,6 @@ module MergeHRISClient
74
79
  :'deductions' => :'deductions',
75
80
  :'taxes' => :'taxes',
76
81
  :'remote_was_deleted' => :'remote_was_deleted',
77
- :'modified_at' => :'modified_at',
78
82
  :'field_mappings' => :'field_mappings',
79
83
  :'remote_data' => :'remote_data'
80
84
  }
@@ -90,6 +94,8 @@ module MergeHRISClient
90
94
  {
91
95
  :'id' => :'String',
92
96
  :'remote_id' => :'String',
97
+ :'created_at' => :'Time',
98
+ :'modified_at' => :'Time',
93
99
  :'employee' => :'String',
94
100
  :'payroll_run' => :'String',
95
101
  :'gross_pay' => :'Float',
@@ -101,8 +107,7 @@ module MergeHRISClient
101
107
  :'deductions' => :'Array<Deduction>',
102
108
  :'taxes' => :'Array<Tax>',
103
109
  :'remote_was_deleted' => :'Boolean',
104
- :'modified_at' => :'Time',
105
- :'field_mappings' => :'Hash<String, Object>',
110
+ :'field_mappings' => :'Object',
106
111
  :'remote_data' => :'Array<RemoteData>'
107
112
  }
108
113
  end
@@ -146,6 +151,14 @@ module MergeHRISClient
146
151
  self.remote_id = attributes[:'remote_id']
147
152
  end
148
153
 
154
+ if attributes.key?(:'created_at')
155
+ self.created_at = attributes[:'created_at']
156
+ end
157
+
158
+ if attributes.key?(:'modified_at')
159
+ self.modified_at = attributes[:'modified_at']
160
+ end
161
+
149
162
  if attributes.key?(:'employee')
150
163
  self.employee = attributes[:'employee']
151
164
  end
@@ -196,14 +209,8 @@ module MergeHRISClient
196
209
  self.remote_was_deleted = attributes[:'remote_was_deleted']
197
210
  end
198
211
 
199
- if attributes.key?(:'modified_at')
200
- self.modified_at = attributes[:'modified_at']
201
- end
202
-
203
212
  if attributes.key?(:'field_mappings')
204
- if (value = attributes[:'field_mappings']).is_a?(Hash)
205
- self.field_mappings = value
206
- end
213
+ self.field_mappings = attributes[:'field_mappings']
207
214
  end
208
215
 
209
216
  if attributes.key?(:'remote_data')
@@ -233,6 +240,8 @@ module MergeHRISClient
233
240
  self.class == o.class &&
234
241
  id == o.id &&
235
242
  remote_id == o.remote_id &&
243
+ created_at == o.created_at &&
244
+ modified_at == o.modified_at &&
236
245
  employee == o.employee &&
237
246
  payroll_run == o.payroll_run &&
238
247
  gross_pay == o.gross_pay &&
@@ -244,7 +253,6 @@ module MergeHRISClient
244
253
  deductions == o.deductions &&
245
254
  taxes == o.taxes &&
246
255
  remote_was_deleted == o.remote_was_deleted &&
247
- modified_at == o.modified_at &&
248
256
  field_mappings == o.field_mappings &&
249
257
  remote_data == o.remote_data
250
258
  end
@@ -258,7 +266,7 @@ module MergeHRISClient
258
266
  # Calculates hash code according to all attributes.
259
267
  # @return [Integer] Hash code
260
268
  def hash
261
- [id, remote_id, employee, payroll_run, gross_pay, net_pay, start_date, end_date, check_date, earnings, deductions, taxes, remote_was_deleted, modified_at, field_mappings, remote_data].hash
269
+ [id, remote_id, created_at, modified_at, employee, payroll_run, gross_pay, net_pay, start_date, end_date, check_date, earnings, deductions, taxes, remote_was_deleted, field_mappings, remote_data].hash
262
270
  end
263
271
 
264
272
  # Builds the object from hash
@@ -28,6 +28,9 @@ module MergeHRISClient
28
28
  # The employee's last name.
29
29
  attr_accessor :last_name
30
30
 
31
+ # The employee's preferred first name.
32
+ attr_accessor :preferred_name
33
+
31
34
  # The employee's full name, to use for display purposes. If a preferred first name is available, the full name will include the preferred first name.
32
35
  attr_accessor :display_full_name
33
36
 
@@ -104,6 +107,7 @@ module MergeHRISClient
104
107
  :'company' => :'company',
105
108
  :'first_name' => :'first_name',
106
109
  :'last_name' => :'last_name',
110
+ :'preferred_name' => :'preferred_name',
107
111
  :'display_full_name' => :'display_full_name',
108
112
  :'username' => :'username',
109
113
  :'groups' => :'groups',
@@ -143,6 +147,7 @@ module MergeHRISClient
143
147
  :'company' => :'String',
144
148
  :'first_name' => :'String',
145
149
  :'last_name' => :'String',
150
+ :'preferred_name' => :'String',
146
151
  :'display_full_name' => :'String',
147
152
  :'username' => :'String',
148
153
  :'groups' => :'Array<String>',
@@ -177,6 +182,7 @@ module MergeHRISClient
177
182
  :'company',
178
183
  :'first_name',
179
184
  :'last_name',
185
+ :'preferred_name',
180
186
  :'display_full_name',
181
187
  :'username',
182
188
  :'work_email',
@@ -233,6 +239,10 @@ module MergeHRISClient
233
239
  self.last_name = attributes[:'last_name']
234
240
  end
235
241
 
242
+ if attributes.key?(:'preferred_name')
243
+ self.preferred_name = attributes[:'preferred_name']
244
+ end
245
+
236
246
  if attributes.key?(:'display_full_name')
237
247
  self.display_full_name = attributes[:'display_full_name']
238
248
  end
@@ -420,6 +430,7 @@ module MergeHRISClient
420
430
  company == o.company &&
421
431
  first_name == o.first_name &&
422
432
  last_name == o.last_name &&
433
+ preferred_name == o.preferred_name &&
423
434
  display_full_name == o.display_full_name &&
424
435
  username == o.username &&
425
436
  groups == o.groups &&
@@ -455,7 +466,7 @@ module MergeHRISClient
455
466
  # Calculates hash code according to all attributes.
456
467
  # @return [Integer] Hash code
457
468
  def hash
458
- [employee_number, company, first_name, last_name, display_full_name, username, groups, work_email, personal_email, mobile_phone_number, employments, home_location, work_location, manager, team, pay_group, ssn, gender, ethnicity, marital_status, date_of_birth, hire_date, start_date, employment_status, termination_date, avatar, integration_params, linked_account_params].hash
469
+ [employee_number, company, first_name, last_name, preferred_name, display_full_name, username, groups, work_email, personal_email, mobile_phone_number, employments, home_location, work_location, manager, team, pay_group, ssn, gender, ethnicity, marital_status, date_of_birth, hire_date, start_date, employment_status, termination_date, avatar, integration_params, linked_account_params].hash
459
470
  end
460
471
 
461
472
  # Builds the object from hash
@@ -21,6 +21,12 @@ module MergeHRISClient
21
21
  # The third-party API ID of the matching object.
22
22
  attr_accessor :remote_id
23
23
 
24
+ # The datetime that this object was created by Merge.
25
+ attr_accessor :created_at
26
+
27
+ # The datetime that this object was modified by Merge.
28
+ attr_accessor :modified_at
29
+
24
30
  # The type of benefit plan. * `MEDICAL` - MEDICAL * `HEALTH_SAVINGS` - HEALTH_SAVINGS * `INSURANCE` - INSURANCE * `RETIREMENT` - RETIREMENT * `OTHER` - OTHER
25
31
  attr_accessor :benefit_plan_type
26
32
 
@@ -33,12 +39,9 @@ module MergeHRISClient
33
39
  # The employer benefit's deduction code.
34
40
  attr_accessor :deduction_code
35
41
 
36
- # Indicates whether or not this object has been deleted by third party webhooks.
42
+ # Indicates whether or not this object has been deleted in the third party platform.
37
43
  attr_accessor :remote_was_deleted
38
44
 
39
- # This is the datetime that this object was last updated by Merge
40
- attr_accessor :modified_at
41
-
42
45
  attr_accessor :field_mappings
43
46
 
44
47
  attr_accessor :remote_data
@@ -48,12 +51,13 @@ module MergeHRISClient
48
51
  {
49
52
  :'id' => :'id',
50
53
  :'remote_id' => :'remote_id',
54
+ :'created_at' => :'created_at',
55
+ :'modified_at' => :'modified_at',
51
56
  :'benefit_plan_type' => :'benefit_plan_type',
52
57
  :'name' => :'name',
53
58
  :'description' => :'description',
54
59
  :'deduction_code' => :'deduction_code',
55
60
  :'remote_was_deleted' => :'remote_was_deleted',
56
- :'modified_at' => :'modified_at',
57
61
  :'field_mappings' => :'field_mappings',
58
62
  :'remote_data' => :'remote_data'
59
63
  }
@@ -69,13 +73,14 @@ module MergeHRISClient
69
73
  {
70
74
  :'id' => :'String',
71
75
  :'remote_id' => :'String',
76
+ :'created_at' => :'Time',
77
+ :'modified_at' => :'Time',
72
78
  :'benefit_plan_type' => :'BenefitPlanTypeEnum',
73
79
  :'name' => :'String',
74
80
  :'description' => :'String',
75
81
  :'deduction_code' => :'String',
76
82
  :'remote_was_deleted' => :'Boolean',
77
- :'modified_at' => :'Time',
78
- :'field_mappings' => :'Hash<String, Object>',
83
+ :'field_mappings' => :'Object',
79
84
  :'remote_data' => :'Array<Hash<String, Object>>'
80
85
  }
81
86
  end
@@ -116,6 +121,14 @@ module MergeHRISClient
116
121
  self.remote_id = attributes[:'remote_id']
117
122
  end
118
123
 
124
+ if attributes.key?(:'created_at')
125
+ self.created_at = attributes[:'created_at']
126
+ end
127
+
128
+ if attributes.key?(:'modified_at')
129
+ self.modified_at = attributes[:'modified_at']
130
+ end
131
+
119
132
  if attributes.key?(:'benefit_plan_type')
120
133
  self.benefit_plan_type = attributes[:'benefit_plan_type']
121
134
  end
@@ -136,14 +149,8 @@ module MergeHRISClient
136
149
  self.remote_was_deleted = attributes[:'remote_was_deleted']
137
150
  end
138
151
 
139
- if attributes.key?(:'modified_at')
140
- self.modified_at = attributes[:'modified_at']
141
- end
142
-
143
152
  if attributes.key?(:'field_mappings')
144
- if (value = attributes[:'field_mappings']).is_a?(Hash)
145
- self.field_mappings = value
146
- end
153
+ self.field_mappings = attributes[:'field_mappings']
147
154
  end
148
155
 
149
156
  if attributes.key?(:'remote_data')
@@ -218,12 +225,13 @@ module MergeHRISClient
218
225
  self.class == o.class &&
219
226
  id == o.id &&
220
227
  remote_id == o.remote_id &&
228
+ created_at == o.created_at &&
229
+ modified_at == o.modified_at &&
221
230
  benefit_plan_type == o.benefit_plan_type &&
222
231
  name == o.name &&
223
232
  description == o.description &&
224
233
  deduction_code == o.deduction_code &&
225
234
  remote_was_deleted == o.remote_was_deleted &&
226
- modified_at == o.modified_at &&
227
235
  field_mappings == o.field_mappings &&
228
236
  remote_data == o.remote_data
229
237
  end
@@ -237,7 +245,7 @@ module MergeHRISClient
237
245
  # Calculates hash code according to all attributes.
238
246
  # @return [Integer] Hash code
239
247
  def hash
240
- [id, remote_id, benefit_plan_type, name, description, deduction_code, remote_was_deleted, modified_at, field_mappings, remote_data].hash
248
+ [id, remote_id, created_at, modified_at, benefit_plan_type, name, description, deduction_code, remote_was_deleted, field_mappings, remote_data].hash
241
249
  end
242
250
 
243
251
  # Builds the object from hash
@@ -21,6 +21,12 @@ module MergeHRISClient
21
21
  # The third-party API ID of the matching object.
22
22
  attr_accessor :remote_id
23
23
 
24
+ # The datetime that this object was created by Merge.
25
+ attr_accessor :created_at
26
+
27
+ # The datetime that this object was modified by Merge.
28
+ attr_accessor :modified_at
29
+
24
30
  # The employee holding this position.
25
31
  attr_accessor :employee
26
32
 
@@ -51,12 +57,9 @@ module MergeHRISClient
51
57
  # The position's type of employment. * `FULL_TIME` - FULL_TIME * `PART_TIME` - PART_TIME * `INTERN` - INTERN * `CONTRACTOR` - CONTRACTOR * `FREELANCE` - FREELANCE
52
58
  attr_accessor :employment_type
53
59
 
54
- # Indicates whether or not this object has been deleted by third party webhooks.
60
+ # Indicates whether or not this object has been deleted in the third party platform.
55
61
  attr_accessor :remote_was_deleted
56
62
 
57
- # This is the datetime that this object was last updated by Merge
58
- attr_accessor :modified_at
59
-
60
63
  attr_accessor :field_mappings
61
64
 
62
65
  attr_accessor :remote_data
@@ -66,6 +69,8 @@ module MergeHRISClient
66
69
  {
67
70
  :'id' => :'id',
68
71
  :'remote_id' => :'remote_id',
72
+ :'created_at' => :'created_at',
73
+ :'modified_at' => :'modified_at',
69
74
  :'employee' => :'employee',
70
75
  :'job_title' => :'job_title',
71
76
  :'pay_rate' => :'pay_rate',
@@ -77,7 +82,6 @@ module MergeHRISClient
77
82
  :'effective_date' => :'effective_date',
78
83
  :'employment_type' => :'employment_type',
79
84
  :'remote_was_deleted' => :'remote_was_deleted',
80
- :'modified_at' => :'modified_at',
81
85
  :'field_mappings' => :'field_mappings',
82
86
  :'remote_data' => :'remote_data'
83
87
  }
@@ -93,6 +97,8 @@ module MergeHRISClient
93
97
  {
94
98
  :'id' => :'String',
95
99
  :'remote_id' => :'String',
100
+ :'created_at' => :'Time',
101
+ :'modified_at' => :'Time',
96
102
  :'employee' => :'String',
97
103
  :'job_title' => :'String',
98
104
  :'pay_rate' => :'Float',
@@ -104,8 +110,7 @@ module MergeHRISClient
104
110
  :'effective_date' => :'Time',
105
111
  :'employment_type' => :'EmploymentTypeEnum',
106
112
  :'remote_was_deleted' => :'Boolean',
107
- :'modified_at' => :'Time',
108
- :'field_mappings' => :'Hash<String, Object>',
113
+ :'field_mappings' => :'Object',
109
114
  :'remote_data' => :'Array<RemoteData>'
110
115
  }
111
116
  end
@@ -152,6 +157,14 @@ module MergeHRISClient
152
157
  self.remote_id = attributes[:'remote_id']
153
158
  end
154
159
 
160
+ if attributes.key?(:'created_at')
161
+ self.created_at = attributes[:'created_at']
162
+ end
163
+
164
+ if attributes.key?(:'modified_at')
165
+ self.modified_at = attributes[:'modified_at']
166
+ end
167
+
155
168
  if attributes.key?(:'employee')
156
169
  self.employee = attributes[:'employee']
157
170
  end
@@ -196,14 +209,8 @@ module MergeHRISClient
196
209
  self.remote_was_deleted = attributes[:'remote_was_deleted']
197
210
  end
198
211
 
199
- if attributes.key?(:'modified_at')
200
- self.modified_at = attributes[:'modified_at']
201
- end
202
-
203
212
  if attributes.key?(:'field_mappings')
204
- if (value = attributes[:'field_mappings']).is_a?(Hash)
205
- self.field_mappings = value
206
- end
213
+ self.field_mappings = attributes[:'field_mappings']
207
214
  end
208
215
 
209
216
  if attributes.key?(:'remote_data')
@@ -233,6 +240,8 @@ module MergeHRISClient
233
240
  self.class == o.class &&
234
241
  id == o.id &&
235
242
  remote_id == o.remote_id &&
243
+ created_at == o.created_at &&
244
+ modified_at == o.modified_at &&
236
245
  employee == o.employee &&
237
246
  job_title == o.job_title &&
238
247
  pay_rate == o.pay_rate &&
@@ -244,7 +253,6 @@ module MergeHRISClient
244
253
  effective_date == o.effective_date &&
245
254
  employment_type == o.employment_type &&
246
255
  remote_was_deleted == o.remote_was_deleted &&
247
- modified_at == o.modified_at &&
248
256
  field_mappings == o.field_mappings &&
249
257
  remote_data == o.remote_data
250
258
  end
@@ -258,7 +266,7 @@ module MergeHRISClient
258
266
  # Calculates hash code according to all attributes.
259
267
  # @return [Integer] Hash code
260
268
  def hash
261
- [id, remote_id, employee, job_title, pay_rate, pay_period, pay_frequency, pay_currency, pay_group, flsa_status, effective_date, employment_type, remote_was_deleted, modified_at, field_mappings, remote_data].hash
269
+ [id, remote_id, created_at, modified_at, employee, job_title, pay_rate, pay_period, pay_frequency, pay_currency, pay_group, flsa_status, effective_date, employment_type, remote_was_deleted, field_mappings, remote_data].hash
262
270
  end
263
271
 
264
272
  # Builds the object from hash