Allow filtering by personalization (#313)

nmshd · Oct 25, 2024 · e707cfa · e707cfa
1 parent b4499b4
commit e707cfa
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 8 deletions.
diff --git a/packages/runtime/src/useCases/common/Schemas.ts b/packages/runtime/src/useCases/common/Schemas.ts
@@ -22258,6 +22258,19 @@ export const GetRelationshipTemplatesRequest: any = {
                             }
                         }
                     ]
+                },
+                "forIdentity": {
+                    "anyOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
                 }
             },
             "additionalProperties": false
@@ -22829,6 +22842,19 @@ export const GetTokensRequest: any = {
                             }
                         }
                     ]
+                },
+                "forIdentity": {
+                    "anyOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
                 }
             },
             "additionalProperties": false

diff --git a/packages/runtime/src/useCases/transport/relationshipTemplates/GetRelationshipTemplates.ts b/packages/runtime/src/useCases/transport/relationshipTemplates/GetRelationshipTemplates.ts
@@ -14,6 +14,7 @@ export interface GetRelationshipTemplatesQuery {
     createdBy?: string | string[];
     createdByDevice?: string | string[];
     maxNumberOfAllocations?: string | string[];
+    forIdentity?: string | string[];
 }
 
 export interface GetRelationshipTemplatesRequest {
@@ -35,7 +36,8 @@ export class GetRelationshipTemplatesUseCase extends UseCase<GetRelationshipTemp
             [nameof<RelationshipTemplateDTO>((r) => r.expiresAt)]: true,
             [nameof<RelationshipTemplateDTO>((r) => r.createdBy)]: true,
             [nameof<RelationshipTemplateDTO>((r) => r.createdByDevice)]: true,
-            [nameof<RelationshipTemplateDTO>((r) => r.maxNumberOfAllocations)]: true
+            [nameof<RelationshipTemplateDTO>((r) => r.maxNumberOfAllocations)]: true,
+            [nameof<RelationshipTemplateDTO>((r) => r.forIdentity)]: true
         },
         alias: {
             [nameof<RelationshipTemplateDTO>((r) => r.isOwn)]: nameof<RelationshipTemplate>((r) => r.isOwn),
@@ -47,7 +49,8 @@ export class GetRelationshipTemplatesUseCase extends UseCase<GetRelationshipTemp
             )}`,
             [nameof<RelationshipTemplateDTO>((r) => r.maxNumberOfAllocations)]: `${nameof<RelationshipTemplate>((r) => r.cache)}.${nameof<CachedRelationshipTemplate>(
                 (t) => t.maxNumberOfAllocations
-            )}`
+            )}`,
+            [nameof<RelationshipTemplateDTO>((r) => r.forIdentity)]: `${nameof<RelationshipTemplate>((r) => r.cache)}.${nameof<CachedRelationshipTemplate>((t) => t.forIdentity)}`
         }
     });
 

diff --git a/packages/runtime/src/useCases/transport/tokens/GetTokens.ts b/packages/runtime/src/useCases/transport/tokens/GetTokens.ts
@@ -12,6 +12,7 @@ export interface GetTokensQuery {
     createdBy?: string | string[];
     createdByDevice?: string | string[];
     expiresAt?: string | string[];
+    forIdentity?: string | string[];
 }
 
 export interface GetTokensRequest {
@@ -31,13 +32,15 @@ export class GetTokensUseCase extends UseCase<GetTokensRequest, TokenDTO[]> {
             [nameof<TokenDTO>((t) => t.createdAt)]: true,
             [nameof<TokenDTO>((t) => t.createdBy)]: true,
             [nameof<TokenDTO>((t) => t.createdByDevice)]: true,
-            [nameof<TokenDTO>((t) => t.expiresAt)]: true
+            [nameof<TokenDTO>((t) => t.expiresAt)]: true,
+            [nameof<TokenDTO>((t) => t.forIdentity)]: true
         },
         alias: {
             [nameof<TokenDTO>((t) => t.createdAt)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.createdAt)]}`,
             [nameof<TokenDTO>((t) => t.createdBy)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.createdBy)]}`,
             [nameof<TokenDTO>((t) => t.createdByDevice)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.createdByDevice)]}`,
-            [nameof<TokenDTO>((t) => t.expiresAt)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.expiresAt)]}`
+            [nameof<TokenDTO>((t) => t.expiresAt)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.expiresAt)]}`,
+            [nameof<TokenDTO>((t) => t.forIdentity)]: `${nameof<Token>((t) => t.cache)}.${[nameof<CachedToken>((t) => t.forIdentity)]}`
         }
     });
 

diff --git a/packages/runtime/test/transport/relationshipTemplates.test.ts b/packages/runtime/test/transport/relationshipTemplates.test.ts
@@ -276,7 +276,8 @@ describe("RelationshipTemplates query", () => {
             await runtimeServices1.transport.relationshipTemplates.createOwnRelationshipTemplate({
                 maxNumberOfAllocations: 1,
                 expiresAt: DateTime.utc().plus({ minutes: 10 }).toString(),
-                content: emptyRelationshipTemplateContent
+                content: emptyRelationshipTemplateContent,
+                forIdentity: runtimeServices1.address
             })
         ).value;
         const conditions = new QueryParamConditions<GetRelationshipTemplatesQuery>(template, runtimeServices1.transport)
@@ -285,7 +286,8 @@ describe("RelationshipTemplates query", () => {
             .addDateSet("expiresAt")
             .addStringSet("createdBy")
             .addStringSet("createdByDevice")
-            .addNumberSet("maxNumberOfAllocations");
+            .addNumberSet("maxNumberOfAllocations")
+            .addStringSet("forIdentity");
 
         await conditions.executeTests((c, q) => c.relationshipTemplates.getRelationshipTemplates({ query: q }));
     });

diff --git a/packages/runtime/test/transport/tokens.test.ts b/packages/runtime/test/transport/tokens.test.ts
@@ -52,11 +52,12 @@ describe("Tokens errors", () => {
 
 describe("Tokens query", () => {
     test("query own tokens", async () => {
-        const token = await uploadOwnToken(runtimeServices1.transport);
+        const token = await uploadOwnToken(runtimeServices1.transport, runtimeServices1.address);
         const conditions = new QueryParamConditions<GetTokensQuery>(token, runtimeServices1.transport)
             .addDateSet("expiresAt")
             .addDateSet("createdAt")
-            .addStringSet("createdByDevice");
+            .addStringSet("createdByDevice")
+            .addStringSet("forIdentity");
         await conditions.executeTests((c, q) => c.tokens.getTokens({ query: q, ownerRestriction: OwnerRestriction.Own }));
     });