Skip to content

Commit

Permalink
fix inlineObject names
Browse files Browse the repository at this point in the history
  • Loading branch information
damcou committed Nov 10, 2021
1 parent a3e6016 commit a0399ae
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 42 deletions.
20 changes: 8 additions & 12 deletions app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,14 @@ const client = new SearchApi();
async function testClient() {
// test openapi gen
try {
const res = await client.multipleQueries(
'R2IYF7ETH7',
'e1e920e59f457ec70473486171c1d3b6',
{
'requests' : [
{
indexName: 'docsearch',
query: 'crawler',
}
]
}
);
const res = await client.multipleQueries('R2IYF7ETH7', 'e1e920e59f457ec70473486171c1d3b6', {
requests: [
{
indexName: 'docsearch',
query: 'crawler',
},
],
});

console.log('[1-RESPONSE]', res);
} catch (e) {
Expand Down
1 change: 1 addition & 0 deletions openapi_spec/paths/indexes/batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ post:
content:
application/json:
schema:
title: batchObject
type: object
properties:
requests:
Expand Down
1 change: 1 addition & 0 deletions openapi_spec/paths/indexes/multipleQueries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ post:
content:
application/json:
schema:
title: multipleQueriesObject
type: object
additionalProperties: false
properties:
Expand Down
28 changes: 14 additions & 14 deletions output/client-search/searchApi.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import localVarRequest from 'request';
import http from 'http';

import { InlineObject } from '../model/inlineObject';
import { InlineObject1 } from '../model/inlineObject1';
import { BatchObject } from '../model/batchObject';
import { InlineResponse200 } from '../model/inlineResponse200';
import { InlineResponse2001 } from '../model/inlineResponse2001';
import { MultipleQueriesObject } from '../model/multipleQueriesObject';
import { MultipleQueriesResponse } from '../model/multipleQueriesResponse';

import { ObjectSerializer, Authentication, VoidAuth, Interceptor } from '../model/models';
Expand Down Expand Up @@ -81,13 +81,13 @@ export class SearchApi {
* @param xAlgoliaApplicationId Algolia appID
* @param xAlgoliaAPIKey Algolia API key
* @param indexName The index in which to perform the request
* @param inlineObject1
* @param batchObject
*/
public async batch(
xAlgoliaApplicationId: string,
xAlgoliaAPIKey: string,
indexName: string,
inlineObject1: InlineObject1,
batchObject: BatchObject,
options: { headers: { [name: string]: string } } = { headers: {} }
): Promise<{ response: http.IncomingMessage; body: InlineResponse2001 }> {
const localVarPath =
Expand Down Expand Up @@ -126,9 +126,9 @@ export class SearchApi {
throw new Error('Required parameter indexName was null or undefined when calling batch.');
}

// verify required parameter 'inlineObject1' is not null or undefined
if (inlineObject1 === null || inlineObject1 === undefined) {
throw new Error('Required parameter inlineObject1 was null or undefined when calling batch.');
// verify required parameter 'batchObject' is not null or undefined
if (batchObject === null || batchObject === undefined) {
throw new Error('Required parameter batchObject was null or undefined when calling batch.');
}

localVarHeaderParams['X-Algolia-Application-Id'] = ObjectSerializer.serialize(
Expand All @@ -150,7 +150,7 @@ export class SearchApi {
uri: localVarPath,
useQuerystring: this._useQuerystring,
json: true,
body: ObjectSerializer.serialize(inlineObject1, 'InlineObject1'),
body: ObjectSerializer.serialize(batchObject, 'BatchObject'),
};

let authenticationPromise = Promise.resolve();
Expand Down Expand Up @@ -194,12 +194,12 @@ export class SearchApi {
* @summary Get search results for the given requests.
* @param xAlgoliaApplicationId Algolia appID
* @param xAlgoliaAPIKey Algolia API key
* @param inlineObject
* @param multipleQueriesObject
*/
public async multipleQueries(
xAlgoliaApplicationId: string,
xAlgoliaAPIKey: string,
inlineObject: InlineObject,
multipleQueriesObject: MultipleQueriesObject,
options: { headers: { [name: string]: string } } = { headers: {} }
): Promise<{ response: http.IncomingMessage; body: MultipleQueriesResponse }> {
const localVarPath = this.basePath + '/1/indexes/*/queries';
Expand Down Expand Up @@ -228,10 +228,10 @@ export class SearchApi {
);
}

// verify required parameter 'inlineObject' is not null or undefined
if (inlineObject === null || inlineObject === undefined) {
// verify required parameter 'multipleQueriesObject' is not null or undefined
if (multipleQueriesObject === null || multipleQueriesObject === undefined) {
throw new Error(
'Required parameter inlineObject was null or undefined when calling multipleQueries.'
'Required parameter multipleQueriesObject was null or undefined when calling multipleQueries.'
);
}

Expand All @@ -254,7 +254,7 @@ export class SearchApi {
uri: localVarPath,
useQuerystring: this._useQuerystring,
json: true,
body: ObjectSerializer.serialize(inlineObject, 'InlineObject'),
body: ObjectSerializer.serialize(multipleQueriesObject, 'MultipleQueriesObject'),
};

let authenticationPromise = Promise.resolve();
Expand Down
4 changes: 2 additions & 2 deletions output/model/inlineObject1.ts → output/model/batchObject.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { RequestFile } from './models';
import { Operation } from './operation';

export class InlineObject1 {
export class BatchObject {
'requests'?: Array<Operation>;

static discriminator: string | undefined = undefined;
Expand All @@ -15,6 +15,6 @@ export class InlineObject1 {
];

static getAttributeTypeMap() {
return InlineObject1.attributeTypeMap;
return BatchObject.attributeTypeMap;
}
}
14 changes: 7 additions & 7 deletions output/model/models.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import localVarRequest from 'request';

export * from './inlineObject';
export * from './inlineObject1';
export * from './batchObject';
export * from './inlineResponse200';
export * from './inlineResponse2001';
export * from './modelError';
export * from './multipleQueries';
export * from './multipleQueriesObject';
export * from './multipleQueriesResponse';
export * from './multipleQueriesResponseHits';
export * from './multipleQueriesResponseResults';
Expand All @@ -23,12 +23,12 @@ export interface RequestDetailedFile {

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;

import { InlineObject } from './inlineObject';
import { InlineObject1 } from './inlineObject1';
import { BatchObject } from './batchObject';
import { InlineResponse200 } from './inlineResponse200';
import { InlineResponse2001 } from './inlineResponse2001';
import { ModelError } from './modelError';
import { MultipleQueries } from './multipleQueries';
import { MultipleQueriesObject } from './multipleQueriesObject';
import { MultipleQueriesResponse } from './multipleQueriesResponse';
import { MultipleQueriesResponseHits } from './multipleQueriesResponseHits';
import { MultipleQueriesResponseResults } from './multipleQueriesResponseResults';
Expand All @@ -37,18 +37,18 @@ import { Operation } from './operation';
let primitives = ['string', 'boolean', 'double', 'integer', 'long', 'float', 'number', 'any'];

let enumsMap: { [index: string]: any } = {
'InlineObject.StrategyEnum': InlineObject.StrategyEnum,
'MultipleQueries.TypeEnum': MultipleQueries.TypeEnum,
'MultipleQueriesObject.StrategyEnum': MultipleQueriesObject.StrategyEnum,
'Operation.ActionEnum': Operation.ActionEnum,
};

let typeMap: { [index: string]: any } = {
InlineObject: InlineObject,
InlineObject1: InlineObject1,
BatchObject: BatchObject,
InlineResponse200: InlineResponse200,
InlineResponse2001: InlineResponse2001,
ModelError: ModelError,
MultipleQueries: MultipleQueries,
MultipleQueriesObject: MultipleQueriesObject,
MultipleQueriesResponse: MultipleQueriesResponse,
MultipleQueriesResponseHits: MultipleQueriesResponseHits,
MultipleQueriesResponseResults: MultipleQueriesResponseResults,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { RequestFile } from './models';
import { MultipleQueries } from './multipleQueries';

export class InlineObject {
export class MultipleQueriesObject {
'requests': Array<MultipleQueries>;
'strategy'?: InlineObject.StrategyEnum;
'strategy'?: MultipleQueriesObject.StrategyEnum;

static discriminator: string | undefined = undefined;

Expand All @@ -16,16 +16,16 @@ export class InlineObject {
{
name: 'strategy',
baseName: 'strategy',
type: 'InlineObject.StrategyEnum',
type: 'MultipleQueriesObject.StrategyEnum',
},
];

static getAttributeTypeMap() {
return InlineObject.attributeTypeMap;
return MultipleQueriesObject.attributeTypeMap;
}
}

export namespace InlineObject {
export namespace MultipleQueriesObject {
export enum StrategyEnum {
None = <any>'none',
StopIfEnoughMatches = <any>'stopIfEnoughMatches',
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ __metadata:

"algoliasearch-client-javascript@file:output/::locator=%40algolia%2Fautomation-javascript-client%40workspace%3A.":
version: 5.0.0
resolution: "algoliasearch-client-javascript@file:output/#output/::hash=45fb8f&locator=%40algolia%2Fautomation-javascript-client%40workspace%3A."
resolution: "algoliasearch-client-javascript@file:output/#output/::hash=c742d8&locator=%40algolia%2Fautomation-javascript-client%40workspace%3A."
dependencies:
"@types/request": ^2.48.7
request: ^2.81.0
checksum: 7e6066fb79f6c2994b211223e80ce77a86df1c114643b407de12dfc6f17126b7f0ca0916a4dfe3fa5d4862726289cfe964e5a8137cc0e5c5aa799b6063ac272d
checksum: 38077b78c6b1aa562ff3b4d5c8cd844f1291360410c187261bcc78a74dc094d6689d1be153d7a96314beda74486eee9c83b8e9a01e4d9c9ad4ca29a66e3a9402
languageName: node
linkType: hard

Expand Down

0 comments on commit a0399ae

Please sign in to comment.