Skip to content

Commit e707cfa

Browse files
authored
Allow filtering by personalization (#313)
1 parent b4499b4 commit e707cfa

File tree

5 files changed

+43
-8
lines changed

5 files changed

+43
-8
lines changed

packages/runtime/src/useCases/common/Schemas.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22258,6 +22258,19 @@ export const GetRelationshipTemplatesRequest: any = {
2225822258
}
2225922259
}
2226022260
]
22261+
},
22262+
"forIdentity": {
22263+
"anyOf": [
22264+
{
22265+
"type": "string"
22266+
},
22267+
{
22268+
"type": "array",
22269+
"items": {
22270+
"type": "string"
22271+
}
22272+
}
22273+
]
2226122274
}
2226222275
},
2226322276
"additionalProperties": false
@@ -22829,6 +22842,19 @@ export const GetTokensRequest: any = {
2282922842
}
2283022843
}
2283122844
]
22845+
},
22846+
"forIdentity": {
22847+
"anyOf": [
22848+
{
22849+
"type": "string"
22850+
},
22851+
{
22852+
"type": "array",
22853+
"items": {
22854+
"type": "string"
22855+
}
22856+
}
22857+
]
2283222858
}
2283322859
},
2283422860
"additionalProperties": false

packages/runtime/src/useCases/transport/relationshipTemplates/GetRelationshipTemplates.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export interface GetRelationshipTemplatesQuery {
1414
createdBy?: string | string[];
1515
createdByDevice?: string | string[];
1616
maxNumberOfAllocations?: string | string[];
17+
forIdentity?: string | string[];
1718
}
1819

1920
export interface GetRelationshipTemplatesRequest {
@@ -35,7 +36,8 @@ export class GetRelationshipTemplatesUseCase extends UseCase<GetRelationshipTemp
3536
[nameof<RelationshipTemplateDTO>((r) => r.expiresAt)]: true,
3637
[nameof<RelationshipTemplateDTO>((r) => r.createdBy)]: true,
3738
[nameof<RelationshipTemplateDTO>((r) => r.createdByDevice)]: true,
38-
[nameof<RelationshipTemplateDTO>((r) => r.maxNumberOfAllocations)]: true
39+
[nameof<RelationshipTemplateDTO>((r) => r.maxNumberOfAllocations)]: true,
40+
[nameof<RelationshipTemplateDTO>((r) => r.forIdentity)]: true
3941
},
4042
alias: {
4143
[nameof<RelationshipTemplateDTO>((r) => r.isOwn)]: nameof<RelationshipTemplate>((r) => r.isOwn),
@@ -47,7 +49,8 @@ export class GetRelationshipTemplatesUseCase extends UseCase<GetRelationshipTemp
4749
)}`,
4850
[nameof<RelationshipTemplateDTO>((r) => r.maxNumberOfAllocations)]: `${nameof<RelationshipTemplate>((r) => r.cache)}.${nameof<CachedRelationshipTemplate>(
4951
(t) => t.maxNumberOfAllocations
50-
)}`
52+
)}`,
53+
[nameof<RelationshipTemplateDTO>((r) => r.forIdentity)]: `${nameof<RelationshipTemplate>((r) => r.cache)}.${nameof<CachedRelationshipTemplate>((t) => t.forIdentity)}`
5154
}
5255
});
5356

packages/runtime/src/useCases/transport/tokens/GetTokens.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export interface GetTokensQuery {
1212
createdBy?: string | string[];
1313
createdByDevice?: string | string[];
1414
expiresAt?: string | string[];
15+
forIdentity?: string | string[];
1516
}
1617

1718
export interface GetTokensRequest {
@@ -31,13 +32,15 @@ export class GetTokensUseCase extends UseCase<GetTokensRequest, TokenDTO[]> {
3132
[nameof<TokenDTO>((t) => t.createdAt)]: true,
3233
[nameof<TokenDTO>((t) => t.createdBy)]: true,
3334
[nameof<TokenDTO>((t) => t.createdByDevice)]: true,
34-
[nameof<TokenDTO>((t) => t.expiresAt)]: true
35+
[nameof<TokenDTO>((t) => t.expiresAt)]: true,
36+
[nameof<TokenDTO>((t) => t.forIdentity)]: true
3537
},
3638
alias: {
3739
[nameof<TokenDTO>((t) => t.createdAt)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.createdAt)]}`,
3840
[nameof<TokenDTO>((t) => t.createdBy)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.createdBy)]}`,
3941
[nameof<TokenDTO>((t) => t.createdByDevice)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.createdByDevice)]}`,
40-
[nameof<TokenDTO>((t) => t.expiresAt)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.expiresAt)]}`
42+
[nameof<TokenDTO>((t) => t.expiresAt)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.expiresAt)]}`,
43+
[nameof<TokenDTO>((t) => t.forIdentity)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.forIdentity)]}`
4144
}
4245
});
4346

packages/runtime/test/transport/relationshipTemplates.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ describe("RelationshipTemplates query", () => {
276276
await runtimeServices1.transport.relationshipTemplates.createOwnRelationshipTemplate({
277277
maxNumberOfAllocations: 1,
278278
expiresAt: DateTime.utc().plus({ minutes: 10 }).toString(),
279-
content: emptyRelationshipTemplateContent
279+
content: emptyRelationshipTemplateContent,
280+
forIdentity: runtimeServices1.address
280281
})
281282
).value;
282283
const conditions = new QueryParamConditions<GetRelationshipTemplatesQuery>(template, runtimeServices1.transport)
@@ -285,7 +286,8 @@ describe("RelationshipTemplates query", () => {
285286
.addDateSet("expiresAt")
286287
.addStringSet("createdBy")
287288
.addStringSet("createdByDevice")
288-
.addNumberSet("maxNumberOfAllocations");
289+
.addNumberSet("maxNumberOfAllocations")
290+
.addStringSet("forIdentity");
289291

290292
await conditions.executeTests((c, q) => c.relationshipTemplates.getRelationshipTemplates({ query: q }));
291293
});

packages/runtime/test/transport/tokens.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@ describe("Tokens errors", () => {
5252

5353
describe("Tokens query", () => {
5454
test("query own tokens", async () => {
55-
const token = await uploadOwnToken(runtimeServices1.transport);
55+
const token = await uploadOwnToken(runtimeServices1.transport, runtimeServices1.address);
5656
const conditions = new QueryParamConditions<GetTokensQuery>(token, runtimeServices1.transport)
5757
.addDateSet("expiresAt")
5858
.addDateSet("createdAt")
59-
.addStringSet("createdByDevice");
59+
.addStringSet("createdByDevice")
60+
.addStringSet("forIdentity");
6061
await conditions.executeTests((c, q) => c.tokens.getTokens({ query: q, ownerRestriction: OwnerRestriction.Own }));
6162
});
6263

0 commit comments

Comments
 (0)