Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(specs): add new events type for insights #2080

Merged
merged 9 commits into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
protected Builder<String, Lambda> addMustacheLambdas() {
Builder<String, Lambda> lambdas = super.addMustacheLambdas();

lambdas.put("escapeDollar", new EscapeDollarLambda());
lambdas.put("escapeQuotes", new EscapeQuotesLambda());
lambdas.put("escapeSlash", new EscapeSlashLambda());
lambdas.put("replaceBacktick", new ReplaceBacktickLambda());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.algolia.codegen.cts.lambda;

import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Template;
import java.io.IOException;
import java.io.Writer;

public class EscapeDollarLambda implements Mustache.Lambda {

@Override
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
String text = fragment.execute();
writer.write(text.replace("$", "\\$"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
req.request.body = "{}";
}

// For golang, jsonassert expect % to be formatted, we need to escape them
if (language.equals("go") && req.request.body != null) {
req.request.body = req.request.body.replace("%", "%%");
}

// For dart, same thing but for $
if (language.equals("dart") && req.request.body != null) {
req.request.body = req.request.body.replace("$", "\\$");
}

// In a case of a `GET` or `DELETE` request, we want to assert if the body
// is correctly parsed (absent from the payload)
if (req.request.method.equals("GET") || req.request.method.equals("DELETE")) {
Expand Down
3 changes: 0 additions & 3 deletions specs/insights/common/enums.yml

This file was deleted.

2 changes: 2 additions & 0 deletions specs/insights/common/schemas/AddToCartEvent.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
type: string
enum: [addToCart]
33 changes: 33 additions & 0 deletions specs/insights/common/schemas/AddedToCartObjectIDs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
type: object
title: Added to cart object IDs
description: |
Use this event to track when users add items to their shopping cart unrelated to a previous Algolia request. For example, if you don't use Algolia to build your category pages, use this event.
To track add-to-cart events related to Algolia requests, use the "Added to cart object IDs after search" event.
additionalProperties: false
properties:
eventName:
$ref: './EventAttributes.yml#/eventName'
eventType:
$ref: './ConversionEvent.yml'
eventSubtype:
$ref: './AddToCartEvent.yml'
index:
$ref: './EventAttributes.yml#/index'
objectIDs:
$ref: './EventAttributes.yml#/objectIDs'
objectData:
$ref: './EventAttributes.yml#/objectDataList'
currency:
$ref: './EventAttributes.yml#/currency'
userToken:
$ref: './EventAttributes.yml#/userToken'
timestamp:
$ref: './EventAttributes.yml#/timestamp'
required:
- eventName
- eventType
- eventSubtype
- index
- objectIDs
- userToken
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
type: object
title: Added to cart object IDs after search
description: |
Use this event to track when users add items to their shopping cart after a previous Algolia request.
If you're building your category pages with Algolia, you'll also use this event.
additionalProperties: false
properties:
eventName:
$ref: './EventAttributes.yml#/eventName'
eventType:
$ref: './ConversionEvent.yml'
eventSubtype:
$ref: './AddToCartEvent.yml'
index:
$ref: './EventAttributes.yml#/index'
queryID:
$ref: './EventAttributes.yml#/queryID'
objectIDs:
$ref: './EventAttributes.yml#/objectIDs'
objectData:
$ref: './EventAttributes.yml#/objectDataAfterSearchList'
currency:
$ref: './EventAttributes.yml#/currency'
userToken:
$ref: './EventAttributes.yml#/userToken'
timestamp:
$ref: './EventAttributes.yml#/timestamp'
required:
- eventName
- eventType
- eventSubtype
- queryID
- index
- objectIDs
- userToken
66 changes: 66 additions & 0 deletions specs/insights/common/schemas/EventAttributes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ eventName:
type: string
minLength: 1
maxLength: 64
pattern: '[\x20-\x7E]{1,64}'
description: |
Can contain up to 64 ASCII characters.
Expand Down Expand Up @@ -81,3 +82,68 @@ positions:
The first search result has a position of 1 (not 0).
You must provide 1 `position` for each `objectID`.
example: [1, 2, 5]

price:
description: The price of the item. This should be the final price, inclusive of any discounts in effect.
oneOf:
- type: number
format: double
- type: string

discount:
description: Absolute value of the discount in effect for this object, measured in `currency`.
oneOf:
- type: number
format: double
- type: string

objectData:
type: object
additionalProperties: false
properties:
price:
$ref: '#/price'
quantity:
type: integer
format: int32
description: The quantity of the purchased or added-to-cart item. The total value of a purchase is the sum of `quantity` multiplied with the `price` for each purchased item.
discount:
$ref: '#/discount'

objectDataList:
type: array
description: |
Extra information about the records involved in the event—for example, to add price and quantities of purchased products.
If provided, must be the same length as `objectIDs`.
items:
$ref: '#/objectData'

objectDataAfterSearch:
type: object
additionalProperties: false
properties:
queryID:
type: string
description: ID of the query that this specific record is attributable to. Used to track purchase events with multiple items originating from different searches.
price:
$ref: '#/price'
quantity:
type: integer
format: int32
description: The quantity of the purchased or added-to-cart item. The total value of a purchase is the sum of `quantity` multiplied with the `price` for each purchased item.
discount:
$ref: '#/discount'

objectDataAfterSearchList:
type: array
description: |
Extra information about the records involved in the event—for example, to add price and quantities of purchased products.
If provided, must be the same length as `objectIDs`.
items:
$ref: '#/objectDataAfterSearch'

currency:
type: string
description: If you include pricing information in the `objectData` parameter, you must also specify the currency as ISO-4217 currency code, such as USD or EUR.
4 changes: 4 additions & 0 deletions specs/insights/common/schemas/EventsItems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ oneOf:
- $ref: './ConvertedFilters.yml'
- $ref: './ViewedObjectIDs.yml'
- $ref: './ViewedFilters.yml'
- $ref: './AddedToCartObjectIDsAfterSearch.yml'
- $ref: './AddedToCartObjectIDs.yml'
- $ref: './PurchasedObjectIDs.yml'
- $ref: './PurchasedObjectIDsAfterSearch.yml'
millotp marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions specs/insights/common/schemas/PurchaseEvent.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
type: string
enum: [purchase]
33 changes: 33 additions & 0 deletions specs/insights/common/schemas/PurchasedObjectIDs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
type: object
title: Purchased object IDs
description: |
Use this event to track when users make a purchase unrelated to a previous Algolia request. For example, if you don't use Algolia to build your category pages, use this event.
To track purchase events related to Algolia requests, use the "Purchased object IDs after search" event.
additionalProperties: false
properties:
eventName:
$ref: './EventAttributes.yml#/eventName'
eventType:
$ref: './ConversionEvent.yml'
eventSubtype:
$ref: './PurchaseEvent.yml'
index:
$ref: './EventAttributes.yml#/index'
objectIDs:
$ref: './EventAttributes.yml#/objectIDs'
objectData:
$ref: './EventAttributes.yml#/objectDataList'
currency:
$ref: './EventAttributes.yml#/currency'
userToken:
$ref: './EventAttributes.yml#/userToken'
timestamp:
$ref: './EventAttributes.yml#/timestamp'
required:
- eventName
- eventType
- eventSubtype
- index
- objectIDs
- userToken
35 changes: 35 additions & 0 deletions specs/insights/common/schemas/PurchasedObjectIDsAfterSearch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
type: object
title: Purchased object IDs after search
description: |
Use this event to track when users make a purchase after a previous Algolia request.
If you're building your category pages with Algolia, you'll also use this event.
additionalProperties: false
properties:
eventName:
$ref: './EventAttributes.yml#/eventName'
eventType:
$ref: './ConversionEvent.yml'
eventSubtype:
$ref: './PurchaseEvent.yml'
index:
$ref: './EventAttributes.yml#/index'
queryID:
$ref: './EventAttributes.yml#/queryID'
objectIDs:
$ref: './EventAttributes.yml#/objectIDs'
objectData:
$ref: './EventAttributes.yml#/objectDataAfterSearchList'
currency:
$ref: './EventAttributes.yml#/currency'
userToken:
$ref: './EventAttributes.yml#/userToken'
timestamp:
$ref: './EventAttributes.yml#/timestamp'
required:
- eventName
- eventType
- eventSubtype
- queryID
- index
- objectIDs
- userToken
2 changes: 1 addition & 1 deletion templates/dart/tests/param_value.mustache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{#isNull}}empty(){{/isNull}}
{{#isString}}"{{{value}}}"{{/isString}}
{{#isString}}"{{#lambda.escapeDollar}}{{{value}}}{{/lambda.escapeDollar}}"{{/isString}}
{{#isNumber}}{{{value}}}{{/isNumber}}
{{#isBoolean}}{{{value}}}{{/isBoolean}}
{{#isEnum}}{{{objectName}}}.fromJson("{{value}}"){{/isEnum}}
Expand Down
67 changes: 67 additions & 0 deletions tests/CTS/methods/requests/insights/pushEvents.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,72 @@
]
}
}
},
{
"testName": "AddedToCartObjectIDs",
"parameters": {
"events": [
{
"eventType": "conversion",
"eventSubtype": "addToCart",
"eventName": "Product Added To Cart",
"index": "products",
"queryID": "43b15df305339e827f0ac0bdc5ebcaa7",
"userToken": "user-123456",
"timestamp": 1641290601962,
"objectIDs": [
"9780545139700",
"9780439784542"
],
"objectData": [
{
"price": 19.99,
"quantity": 10,
"discount": 2.5
},
{
"price": "8$",
"quantity": 7,
"discount": "30%"
}
],
"currency": "USD"
}
]
},
"request": {
"path": "/1/events",
"method": "POST",
"body": {
"events": [
{
"eventType": "conversion",
"eventSubtype": "addToCart",
"eventName": "Product Added To Cart",
"index": "products",
"queryID": "43b15df305339e827f0ac0bdc5ebcaa7",
"userToken": "user-123456",
"timestamp": 1641290601962,
"objectIDs": [
"9780545139700",
"9780439784542"
],
"objectData": [
{
"price": 19.99,
"quantity": 10,
"discount": 2.5
},
{
"price": "8$",
"quantity": 7,
"discount": "30%"
}
],
"currency": "USD"
}
]
}
}
}
]