Skip to content

Commit 254d608

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-specwarthyHantingZhang2
authored
fix case search documentation (#80)
Co-authored-by: ci.datadog-api-spec <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Co-authored-by: Paul <[email protected]> Co-authored-by: Hanting ZHANG <[email protected]>
1 parent 6685f88 commit 254d608

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-04-11 15:35:27.700324",
8-
"spec_repo_commit": "8ffb168c"
7+
"regenerated": "2024-04-15 13:32:58.157121",
8+
"spec_repo_commit": "5c7e123b"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-04-11 15:35:27.721018",
13-
"spec_repo_commit": "8ffb168c"
12+
"regenerated": "2024-04-15 13:32:58.174477",
13+
"spec_repo_commit": "5c7e123b"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23926,7 +23926,7 @@ paths:
2392623926
operationId: SearchCases
2392723927
parameters:
2392823928
- $ref: '#/components/parameters/PageSize'
23929-
- $ref: '#/components/parameters/PageOffset'
23929+
- $ref: '#/components/parameters/PageNumber'
2393023930
- $ref: '#/components/parameters/CaseSortableFieldParameter'
2393123931
- description: Search query
2393223932
in: query
@@ -23969,7 +23969,7 @@ paths:
2396923969
- Case Management
2397023970
x-pagination:
2397123971
limitParam: page[size]
23972-
pageOffsetParam: page[offset]
23972+
pageParam: page[number]
2397323973
resultsPath: data
2397423974
post:
2397523975
description: Create a Case

src/datadogV2/api/api_case_management.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use std::io::Write;
1818
pub struct SearchCasesOptionalParams {
1919
/// Size for a given page. The maximum allowed value is 100.
2020
pub page_size: Option<i64>,
21-
/// Specific offset to use as the beginning of the returned page.
22-
pub page_offset: Option<i64>,
21+
/// Specific page number to return.
22+
pub page_number: Option<i64>,
2323
/// Specify which field to sort
2424
pub sort_field: Option<crate::datadogV2::model::CaseSortableField>,
2525
/// Search query
@@ -34,9 +34,9 @@ impl SearchCasesOptionalParams {
3434
self.page_size = Some(value);
3535
self
3636
}
37-
/// Specific offset to use as the beginning of the returned page.
38-
pub fn page_offset(mut self, value: i64) -> Self {
39-
self.page_offset = Some(value);
37+
/// Specific page number to return.
38+
pub fn page_number(mut self, value: i64) -> Self {
39+
self.page_number = Some(value);
4040
self
4141
}
4242
/// Specify which field to sort
@@ -1234,6 +1234,9 @@ impl CaseManagementAPI {
12341234
} else {
12351235
page_size = params.page_size.unwrap().clone();
12361236
}
1237+
if params.page_number.is_none() {
1238+
params.page_number = Some(0);
1239+
}
12371240
loop {
12381241
let resp = self.search_cases(params.clone()).await?;
12391242
let Some(data) = resp.data else { break };
@@ -1247,11 +1250,7 @@ impl CaseManagementAPI {
12471250
if count < page_size as usize {
12481251
break;
12491252
}
1250-
if params.page_offset.is_none() {
1251-
params.page_offset = Some(page_size.clone());
1252-
} else {
1253-
params.page_offset = Some(params.page_offset.unwrap() + page_size.clone());
1254-
}
1253+
params.page_number = Some(params.page_number.unwrap() + 1);
12551254
}
12561255
}
12571256
}
@@ -1269,7 +1268,7 @@ impl CaseManagementAPI {
12691268

12701269
// unbox and build optional parameters
12711270
let page_size = params.page_size;
1272-
let page_offset = params.page_offset;
1271+
let page_number = params.page_number;
12731272
let sort_field = params.sort_field;
12741273
let filter = params.filter;
12751274
let sort_asc = params.sort_asc;
@@ -1287,9 +1286,9 @@ impl CaseManagementAPI {
12871286
local_req_builder =
12881287
local_req_builder.query(&[("page[size]", &local_query_param.to_string())]);
12891288
};
1290-
if let Some(ref local_query_param) = page_offset {
1289+
if let Some(ref local_query_param) = page_number {
12911290
local_req_builder =
1292-
local_req_builder.query(&[("page[offset]", &local_query_param.to_string())]);
1291+
local_req_builder.query(&[("page[number]", &local_query_param.to_string())]);
12931292
};
12941293
if let Some(ref local_query_param) = sort_field {
12951294
local_req_builder =

tests/scenarios/function_mappings.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11139,8 +11139,8 @@ fn test_v2_search_cases(world: &mut DatadogWorld, _parameters: &HashMap<String,
1113911139
let page_size = _parameters
1114011140
.get("page[size]")
1114111141
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
11142-
let page_offset = _parameters
11143-
.get("page[offset]")
11142+
let page_number = _parameters
11143+
.get("page[number]")
1114411144
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1114511145
let sort_field = _parameters
1114611146
.get("sort[field]")
@@ -11153,7 +11153,7 @@ fn test_v2_search_cases(world: &mut DatadogWorld, _parameters: &HashMap<String,
1115311153
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1115411154
let mut params = datadogV2::api_case_management::SearchCasesOptionalParams::default();
1115511155
params.page_size = page_size;
11156-
params.page_offset = page_offset;
11156+
params.page_number = page_number;
1115711157
params.sort_field = sort_field;
1115811158
params.filter = filter;
1115911159
params.sort_asc = sort_asc;
@@ -11186,8 +11186,8 @@ fn test_v2_search_cases_with_pagination(
1118611186
let page_size = _parameters
1118711187
.get("page[size]")
1118811188
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
11189-
let page_offset = _parameters
11190-
.get("page[offset]")
11189+
let page_number = _parameters
11190+
.get("page[number]")
1119111191
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1119211192
let sort_field = _parameters
1119311193
.get("sort[field]")
@@ -11200,7 +11200,7 @@ fn test_v2_search_cases_with_pagination(
1120011200
.and_then(|param| Some(serde_json::from_value(param.clone()).unwrap()));
1120111201
let mut params = datadogV2::api_case_management::SearchCasesOptionalParams::default();
1120211202
params.page_size = page_size;
11203-
params.page_offset = page_offset;
11203+
params.page_number = page_number;
1120411204
params.sort_field = sort_field;
1120511205
params.filter = filter;
1120611206
params.sort_asc = sort_asc;

0 commit comments

Comments
 (0)