Skip to content

Commit

Permalink
Merge branch 'main' into fix/ingestion-required-params
Browse files Browse the repository at this point in the history
  • Loading branch information
shortcuts committed Aug 12, 2024
2 parents c4ab86d + 2f10fcf commit f58a854
Show file tree
Hide file tree
Showing 31 changed files with 76 additions and 85 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@babel/preset-env": "7.25.3",
"@babel/preset-typescript": "7.24.7",
"@types/jest": "29.5.12",
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"jest": "29.7.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@algolia/requester-node-http": "5.0.0-beta.18"
},
"devDependencies": {
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"rollup": "4.20.0",
"typescript": "5.5.4"
},
Expand Down
27 changes: 9 additions & 18 deletions clients/algoliasearch-client-javascript/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand All @@ -25,7 +25,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand Down Expand Up @@ -53,7 +53,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand All @@ -66,7 +66,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand All @@ -79,7 +79,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand All @@ -92,7 +92,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand All @@ -118,7 +118,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand All @@ -144,7 +144,7 @@ __metadata:
"@algolia/client-common": "npm:5.0.0-beta.18"
"@algolia/requester-browser-xhr": "npm:5.0.0-beta.18"
"@algolia/requester-node-http": "npm:5.0.0-beta.18"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
languageName: unknown
Expand Down Expand Up @@ -2998,15 +2998,6 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:22.1.0":
version: 22.1.0
resolution: "@types/node@npm:22.1.0"
dependencies:
undici-types: "npm:~6.13.0"
checksum: 10/c2ac1340509646b6c673b27fae2a46e501a97e540e7221be4dd2e0be7a0f61efefb5bf3be8bedf2dbce245fa49cfc49bba77bce73fa3c4296d0d19521ced3222
languageName: node
linkType: hard

"@types/normalize-package-data@npm:^2.4.0":
version: 2.4.4
resolution: "@types/normalize-package-data@npm:2.4.4"
Expand Down Expand Up @@ -3237,7 +3228,7 @@ __metadata:
"@babel/preset-env": "npm:7.25.3"
"@babel/preset-typescript": "npm:7.24.7"
"@types/jest": "npm:29.5.12"
"@types/node": "npm:22.1.0"
"@types/node": "npm:22.2.0"
jest: "npm:29.7.0"
rollup: "npm:4.20.0"
typescript: "npm:5.5.4"
Expand Down
4 changes: 2 additions & 2 deletions tests/output/csharp/src/generated/e2e/Insights.test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public async Task PushEventsTest1()
Index = "products",
UserToken = "user-123456",
AuthenticatedUserToken = "user-123456",
Timestamp = 1723161600000L,
Timestamp = 1723420800000L,
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
QueryID = "43b15df305339e827f0ac0bdc5ebcaa7",
}
Expand All @@ -76,7 +76,7 @@ public async Task PushEventsTest1()
Index = "products",
UserToken = "user-123456",
AuthenticatedUserToken = "user-123456",
Timestamp = 1723161600000L,
Timestamp = 1723420800000L,
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
}
)
Expand Down
6 changes: 3 additions & 3 deletions tests/output/csharp/src/generated/requests/Insights.test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ await client.PushEventsAsync(
Index = "products",
UserToken = "user-123456",
AuthenticatedUserToken = "user-123456",
Timestamp = 1723161600000L,
Timestamp = 1723420800000L,
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
QueryID = "43b15df305339e827f0ac0bdc5ebcaa7",
}
Expand All @@ -593,7 +593,7 @@ await client.PushEventsAsync(
Index = "products",
UserToken = "user-123456",
AuthenticatedUserToken = "user-123456",
Timestamp = 1723161600000L,
Timestamp = 1723420800000L,
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
}
)
Expand All @@ -605,7 +605,7 @@ await client.PushEventsAsync(
Assert.Equal("/1/events", req.Path);
Assert.Equal("POST", req.Method.ToString());
JsonAssert.EqualOverrideDefault(
"{\"events\":[{\"eventType\":\"conversion\",\"eventName\":\"Product Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723161600000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product Detail Page Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723161600000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
"{\"events\":[{\"eventType\":\"conversion\",\"eventName\":\"Product Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723420800000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product Detail Page Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723420800000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
req.Body,
new JsonDiffConfig(false)
);
Expand Down
6 changes: 3 additions & 3 deletions tests/output/dart/test/requests/insights_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ void main() {
index: "products",
userToken: "user-123456",
authenticatedUserToken: "user-123456",
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: [
"9780545139700",
"9780439784542",
Expand All @@ -646,7 +646,7 @@ void main() {
index: "products",
userToken: "user-123456",
authenticatedUserToken: "user-123456",
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: [
"9780545139700",
"9780439784542",
Expand All @@ -659,7 +659,7 @@ void main() {
expectPath(request.path, '/1/events');
expect(request.method, 'post');
expectBody(request.body,
"""{"events":[{"eventType":"conversion","eventName":"Product Purchased","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1723161600000,"objectIDs":["9780545139700","9780439784542"],"queryID":"43b15df305339e827f0ac0bdc5ebcaa7"},{"eventType":"view","eventName":"Product Detail Page Viewed","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1723161600000,"objectIDs":["9780545139700","9780439784542"]}]}""");
"""{"events":[{"eventType":"conversion","eventName":"Product Purchased","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1723420800000,"objectIDs":["9780545139700","9780439784542"],"queryID":"43b15df305339e827f0ac0bdc5ebcaa7"},{"eventType":"view","eventName":"Product Detail Page Viewed","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1723420800000,"objectIDs":["9780545139700","9780439784542"]}]}""");
},
),
);
Expand Down
4 changes: 2 additions & 2 deletions tests/output/go/tests/e2e/insights_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tests/output/go/tests/requests/insights_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void pushEventsTest1() {
.setIndex("products")
.setUserToken("user-123456")
.setAuthenticatedUserToken("user-123456")
.setTimestamp(1723161600000L)
.setTimestamp(1723420800000L)
.setObjectIDs(List.of("9780545139700", "9780439784542"))
.setQueryID("43b15df305339e827f0ac0bdc5ebcaa7"),
new ViewedObjectIDs()
Expand All @@ -59,7 +59,7 @@ void pushEventsTest1() {
.setIndex("products")
.setUserToken("user-123456")
.setAuthenticatedUserToken("user-123456")
.setTimestamp(1723161600000L)
.setTimestamp(1723420800000L)
.setObjectIDs(List.of("9780545139700", "9780439784542"))
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ void pushEventsTest1() {
.setIndex("products")
.setUserToken("user-123456")
.setAuthenticatedUserToken("user-123456")
.setTimestamp(1723161600000L)
.setTimestamp(1723420800000L)
.setObjectIDs(List.of("9780545139700", "9780439784542"))
.setQueryID("43b15df305339e827f0ac0bdc5ebcaa7"),
new ViewedObjectIDs()
Expand All @@ -615,7 +615,7 @@ void pushEventsTest1() {
.setIndex("products")
.setUserToken("user-123456")
.setAuthenticatedUserToken("user-123456")
.setTimestamp(1723161600000L)
.setTimestamp(1723420800000L)
.setObjectIDs(List.of("9780545139700", "9780439784542"))
)
)
Expand All @@ -627,9 +627,9 @@ void pushEventsTest1() {
assertDoesNotThrow(() ->
JSONAssert.assertEquals(
"{\"events\":[{\"eventType\":\"conversion\",\"eventName\":\"Product" +
" Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723161600000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product" +
" Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723420800000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product" +
" Detail Page" +
" Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723161600000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
" Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1723420800000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
req.body,
JSONCompareMode.STRICT
)
Expand Down
2 changes: 1 addition & 1 deletion tests/output/javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"@types/jest": "29.5.12",
"@types/node": "22.1.0",
"@types/node": "22.2.0",
"dotenv": "16.4.5",
"jest": "29.7.0",
"typescript": "5.5.4"
Expand Down
4 changes: 2 additions & 2 deletions tests/output/javascript/src/e2e/insights.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('pushEvents', () => {
index: 'products',
userToken: 'user-123456',
authenticatedUserToken: 'user-123456',
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: ['9780545139700', '9780439784542'],
queryID: '43b15df305339e827f0ac0bdc5ebcaa7',
},
Expand All @@ -44,7 +44,7 @@ describe('pushEvents', () => {
index: 'products',
userToken: 'user-123456',
authenticatedUserToken: 'user-123456',
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: ['9780545139700', '9780439784542'],
},
],
Expand Down
8 changes: 4 additions & 4 deletions tests/output/javascript/src/requests/insights.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ describe('pushEvents', () => {
index: 'products',
userToken: 'user-123456',
authenticatedUserToken: 'user-123456',
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: ['9780545139700', '9780439784542'],
queryID: '43b15df305339e827f0ac0bdc5ebcaa7',
},
Expand All @@ -394,7 +394,7 @@ describe('pushEvents', () => {
index: 'products',
userToken: 'user-123456',
authenticatedUserToken: 'user-123456',
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: ['9780545139700', '9780439784542'],
},
],
Expand All @@ -410,7 +410,7 @@ describe('pushEvents', () => {
index: 'products',
userToken: 'user-123456',
authenticatedUserToken: 'user-123456',
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: ['9780545139700', '9780439784542'],
queryID: '43b15df305339e827f0ac0bdc5ebcaa7',
},
Expand All @@ -420,7 +420,7 @@ describe('pushEvents', () => {
index: 'products',
userToken: 'user-123456',
authenticatedUserToken: 'user-123456',
timestamp: 1723161600000,
timestamp: 1723420800000,
objectIDs: ['9780545139700', '9780439784542'],
},
],
Expand Down
Loading

0 comments on commit f58a854

Please sign in to comment.