refactor: rename things

Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/StepDefinitions/RelationshipTemplatesStepDefinitions.cs

@@ -120,7 +120,7 @@ public async Task WhenISendsAGETRequestToTheRelationshipTemplatesEndpointWithThe
             var relationshipTemplateId = _relationshipTemplatesContext.CreateRelationshipTemplatesResponses[payload.TemplateName].Id;
             var password = payload.PasswordOnGet == "-" ? null : Convert.FromBase64String(payload.PasswordOnGet.Trim());
 
-            return new RelationshipTemplateQueryItem { Id = relationshipTemplateId, Password = password };
+            return new ListRelationshipTemplatesQueryItem { Id = relationshipTemplateId, Password = password };
         }).ToList();
 
         _responseContext.WhenResponse = _listRelationshipTemplatesResponse = await client.RelationshipTemplates.ListTemplates(queryItems);

Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/StepDefinitions/TokensStepDefinitions.cs

@@ -133,7 +133,7 @@ public async Task WhenISendsAGETRequestToTheTokensEndpointWithTheFollowingPayloa
             var tokenId = _tokensContext.CreateTokenResponses[payload.TokenName].Id;
             var password = payload.PasswordOnGet == "-" ? null : Convert.FromBase64String(payload.PasswordOnGet.Trim());
 
-            return new TokenQueryItem() { Id = tokenId, Password = password };
+            return new ListTokensQueryItem() { Id = tokenId, Password = password };
         }).ToList();
 
         _responseContext.WhenResponse = _listTokensResponse = await client.Tokens.ListTokens(queryItems);
@@ -170,4 +170,3 @@ file class GetRequestPayload
     public required string TokenName { get; set; }
     public required string PasswordOnGet { get; set; }
 }
-

Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs

@@ -9,8 +9,9 @@ namespace Backbone.Modules.Relationships.Application.Infrastructure.Persistence.
 
 public interface IRelationshipTemplatesRepository
 {
-    Task<DbPaginationResult<RelationshipTemplate>> FindTemplatesWithIds(IEnumerable<RelationshipTemplateQueryItem> queryItems, IdentityAddress activeIdentity, PaginationFilter paginationFilter,
+    Task<DbPaginationResult<RelationshipTemplate>> FindTemplates(IEnumerable<ListRelationshipTemplatesQueryItem> queryItems, IdentityAddress activeIdentity, PaginationFilter paginationFilter,
         CancellationToken cancellationToken, bool track = false);
+
     Task<RelationshipTemplate?> Find(RelationshipTemplateId id, IdentityAddress identityAddress, CancellationToken cancellationToken, bool track = false);
     Task Add(RelationshipTemplate template, CancellationToken cancellationToken);
     Task Update(RelationshipTemplate template);

Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Handler.cs

@@ -17,7 +17,7 @@ public Handler(IUserContext userContext, IRelationshipTemplatesRepository relati
 
     public async Task<ListRelationshipTemplatesResponse> Handle(ListRelationshipTemplatesQuery request, CancellationToken cancellationToken)
     {
-        var dbPaginationResult = await _relationshipTemplatesRepository.FindTemplatesWithIds(request.QueryItems, _userContext.GetAddress(), request.PaginationFilter,
+        var dbPaginationResult = await _relationshipTemplatesRepository.FindTemplates(request.QueryItems, _userContext.GetAddress(), request.PaginationFilter,
             cancellationToken, track: false);
 
         return new ListRelationshipTemplatesResponse(dbPaginationResult, request.PaginationFilter);

Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesQuery.cs

@@ -5,17 +5,17 @@ namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queri
 
 public class ListRelationshipTemplatesQuery : IRequest<ListRelationshipTemplatesResponse>
 {
-    public ListRelationshipTemplatesQuery(PaginationFilter paginationFilter, IEnumerable<RelationshipTemplateQueryItem>? queries)
+    public ListRelationshipTemplatesQuery(PaginationFilter paginationFilter, IEnumerable<ListRelationshipTemplatesQueryItem>? queries)
     {
         PaginationFilter = paginationFilter;
         QueryItems = queries == null ? [] : queries.ToList();
     }
 
     public PaginationFilter PaginationFilter { get; set; }
-    public List<RelationshipTemplateQueryItem> QueryItems { get; set; }
+    public List<ListRelationshipTemplatesQueryItem> QueryItems { get; set; }
 }
 
-public class RelationshipTemplateQueryItem
+public class ListRelationshipTemplatesQueryItem
 {
     public required string Id { get; set; }
     public byte[]? Password { get; set; }

Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Validator.Tests.cs

@@ -3,7 +3,6 @@
 using Backbone.UnitTestTools.BaseClasses;
 using Backbone.UnitTestTools.FluentValidation;
 using FluentValidation.TestHelper;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Xunit;
 
 namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
@@ -17,7 +16,8 @@ public void Happy_path_with_password()
         var validator = new Validator();
 
         // Act
-        var validationResult = validator.TestValidate(new ListRelationshipTemplatesQuery(new PaginationFilter(), new[] { new RelationshipTemplateQueryItem() { Id = RelationshipTemplateId.New(), Password = [1, 2, 3] } }));
+        var validationResult = validator.TestValidate(new ListRelationshipTemplatesQuery(new PaginationFilter(),
+            new[] { new ListRelationshipTemplatesQueryItem() { Id = RelationshipTemplateId.New(), Password = [1, 2, 3] } }));
 
         // Assert
         validationResult.ShouldNotHaveAnyValidationErrors();
@@ -30,7 +30,8 @@ public void Happy_path_without_password()
         var validator = new Validator();
 
         // Act
-        var validationResult = validator.TestValidate(new ListRelationshipTemplatesQuery(new PaginationFilter(), new[] { new RelationshipTemplateQueryItem() { Id = RelationshipTemplateId.New() } }));
+        var validationResult =
+            validator.TestValidate(new ListRelationshipTemplatesQuery(new PaginationFilter(), new[] { new ListRelationshipTemplatesQueryItem() { Id = RelationshipTemplateId.New() } }));
 
         // Assert
         validationResult.ShouldNotHaveAnyValidationErrors();

Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Validator.cs

@@ -20,7 +20,7 @@ public Validator()
             {
                 queryItems
                     .RuleFor(query => query.Id)
-                    .ValidId<RelationshipTemplateQueryItem, RelationshipTemplateId>();
+                    .ValidId<ListRelationshipTemplatesQueryItem, RelationshipTemplateId>();
 
                 queryItems
                     .RuleFor(query => query.Password)

Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipTemplatesController.cs

@@ -45,13 +45,13 @@ public async Task<IActionResult> GetById(string id, [FromQuery] byte[]? password
         StatusCodes.Status200OK)]
     public async Task<IActionResult> GetAll([FromQuery] PaginationFilter paginationFilter, [FromQuery] string? templates, [FromQuery] IEnumerable<string> ids, CancellationToken cancellationToken)
     {
-        List<RelationshipTemplateQueryItem>? relationshipTemplateQueryItems;
+        List<ListRelationshipTemplatesQueryItem>? relationshipTemplateQueryItems;
 
         if (templates != null)
         {
             try
             {
-                relationshipTemplateQueryItems = JsonSerializer.Deserialize<List<RelationshipTemplateQueryItem>>(templates, _jsonSerializerOptions);
+                relationshipTemplateQueryItems = JsonSerializer.Deserialize<List<ListRelationshipTemplatesQueryItem>>(templates, _jsonSerializerOptions);
             }
             catch (JsonException ex)
             {
@@ -60,7 +60,7 @@ public async Task<IActionResult> GetAll([FromQuery] PaginationFilter paginationF
         }
         else
         {
-            relationshipTemplateQueryItems = ids.Select(id => new RelationshipTemplateQueryItem { Id = id }).ToList();
+            relationshipTemplateQueryItems = ids.Select(id => new ListRelationshipTemplatesQueryItem { Id = id }).ToList();
         }
 
         var request = new ListRelationshipTemplatesQuery(paginationFilter, relationshipTemplateQueryItems);

Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipTemplatesRepository.cs

@@ -48,7 +48,7 @@ public async Task Delete(Expression<Func<RelationshipTemplate, bool>> filter, Ca
         return template;
     }
 
-    public async Task<DbPaginationResult<RelationshipTemplate>> FindTemplatesWithIds(IEnumerable<RelationshipTemplateQueryItem> queryItems, IdentityAddress activeIdentity,
+    public async Task<DbPaginationResult<RelationshipTemplate>> FindTemplates(IEnumerable<ListRelationshipTemplatesQueryItem> queryItems, IdentityAddress activeIdentity,
         PaginationFilter paginationFilter,
         CancellationToken cancellationToken, bool track = false)
     {

Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs

@@ -10,8 +10,10 @@ namespace Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Reposit
 public interface ITokensRepository
 {
     Task Add(Token token);
-    Task<DbPaginationResult<Token>> FindTokensWithIds(IEnumerable<TokenQueryItem> queryItems, IdentityAddress activeIdentity, PaginationFilter paginationFilter, CancellationToken cancellationToken, bool track = false);
+
+    Task<DbPaginationResult<Token>> FindTokens(IEnumerable<ListTokensQueryItem> queryItems, IdentityAddress activeIdentity, PaginationFilter paginationFilter,
+        CancellationToken cancellationToken, bool track = false);
+
     Task<Token?> Find(TokenId tokenId, IdentityAddress? activeIdentity, CancellationToken cancellationToken, bool track = false);
-    Task<DbPaginationResult<Token>> FindAllWithIds(IdentityAddress activeIdentity, IEnumerable<TokenId> ids, PaginationFilter paginationFilter, CancellationToken cancellationToken);
     Task DeleteTokens(Expression<Func<Token, bool>> filter, CancellationToken cancellationToken);
 }

Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/Handler.cs

@@ -1,7 +1,6 @@
 using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
 using Backbone.DevelopmentKit.Identity.ValueObjects;
 using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
-using Backbone.Modules.Tokens.Domain.Entities;
 using MediatR;
 
 namespace Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
@@ -19,7 +18,7 @@ public Handler(ITokensRepository tokensRepository, IUserContext userContext)
 
     public async Task<ListTokensResponse> Handle(ListTokensQuery request, CancellationToken cancellationToken)
     {
-        var dbPaginationResult = await _tokensRepository.FindTokensWithIds(request.QueryItems, _activeIdentity, request.PaginationFilter, cancellationToken, track: false);
+        var dbPaginationResult = await _tokensRepository.FindTokens(request.QueryItems, _activeIdentity, request.PaginationFilter, cancellationToken, track: false);
 
         return new ListTokensResponse(dbPaginationResult, request.PaginationFilter);
     }

Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQuery.cs

@@ -5,17 +5,17 @@ namespace Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
 
 public class ListTokensQuery : IRequest<ListTokensResponse>
 {
-    public ListTokensQuery(PaginationFilter paginationFilter, IEnumerable<TokenQueryItem>? queries)
+    public ListTokensQuery(PaginationFilter paginationFilter, IEnumerable<ListTokensQueryItem>? queries)
     {
         PaginationFilter = paginationFilter;
         QueryItems = queries == null ? [] : queries.ToList();
     }
 
     public PaginationFilter PaginationFilter { get; set; }
-    public List<TokenQueryItem> QueryItems { get; set; }
+    public List<ListTokensQueryItem> QueryItems { get; set; }
 }
 
-public class TokenQueryItem
+public class ListTokensQueryItem
 {
     public required string Id { get; set; }
     public byte[]? Password { get; set; }

Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/Validator.cs

@@ -24,7 +24,7 @@ public Validator()
             {
                 queryItems
                     .RuleFor(query => query.Id)
-                    .ValidId<TokenQueryItem, TokenId>();
+                    .ValidId<ListTokensQueryItem, TokenId>();
 
                 queryItems
                     .RuleFor(query => query.Password)

Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs

@@ -54,13 +54,13 @@ public async Task<IActionResult> GetToken([FromRoute] string id, [FromQuery] byt
     public async Task<IActionResult> ListTokens([FromQuery] PaginationFilter paginationFilter, [FromQuery] string? tokens,
         [FromQuery] IEnumerable<string> ids, CancellationToken cancellationToken)
     {
-        List<TokenQueryItem>? tokenQueryItems;
+        List<ListTokensQueryItem>? tokenQueryItems;
 
         if (tokens != null)
         {
             try
             {
-                tokenQueryItems = JsonSerializer.Deserialize<List<TokenQueryItem>>(tokens, _jsonSerializerOptions);
+                tokenQueryItems = JsonSerializer.Deserialize<List<ListTokensQueryItem>>(tokens, _jsonSerializerOptions);
             }
             catch (JsonException ex)
             {
@@ -69,7 +69,7 @@ public async Task<IActionResult> ListTokens([FromQuery] PaginationFilter paginat
         }
         else
         {
-            tokenQueryItems = ids.Select(id => new TokenQueryItem { Id = id }).ToList();
+            tokenQueryItems = ids.Select(id => new ListTokensQueryItem { Id = id }).ToList();
         }
 
         var request = new ListTokensQuery(paginationFilter, tokenQueryItems);

Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs

@@ -24,7 +24,7 @@ public TokensRepository(TokensDbContext dbContext)
         _readonlyTokensDbSet = dbContext.Tokens.AsNoTracking();
     }
 
-    public async Task<DbPaginationResult<Token>> FindTokensWithIds(IEnumerable<TokenQueryItem> queryItems, IdentityAddress activeIdentity,
+    public async Task<DbPaginationResult<Token>> FindTokens(IEnumerable<ListTokensQueryItem> queryItems, IdentityAddress activeIdentity,
         PaginationFilter paginationFilter, CancellationToken cancellationToken, bool track = false)
     {
         var queryItemsList = queryItems.ToList();

Sdks/ConsumerApi.Sdk/src/Endpoints/RelationshipTemplates/RelationshipTemplatesEndpoint.cs

@@ -9,7 +9,7 @@ namespace Backbone.ConsumerApi.Sdk.Endpoints.RelationshipTemplates;
 
 public class RelationshipTemplatesEndpoint(EndpointClient client) : ConsumerApiEndpoint(client)
 {
-    public async Task<ApiResponse<ListRelationshipTemplatesResponse>> ListTemplates(IEnumerable<RelationshipTemplateQueryItem> queryItems, PaginationFilter? pagination = null)
+    public async Task<ApiResponse<ListRelationshipTemplatesResponse>> ListTemplates(IEnumerable<ListRelationshipTemplatesQueryItem> queryItems, PaginationFilter? pagination = null)
     {
         return await _client
             .Request<ListRelationshipTemplatesResponse>(HttpMethod.Get, $"api/{API_VERSION}/RelationshipTemplates")
@@ -37,7 +37,7 @@ public async Task<ApiResponse<CreateRelationshipTemplateResponse>> CreateTemplat
 
 file static class RelationshipTemplateQueryExtensions
 {
-    public static string ToJson(this IEnumerable<RelationshipTemplateQueryItem> queryItems)
+    public static string ToJson(this IEnumerable<ListRelationshipTemplatesQueryItem> queryItems)
     {
         return JsonConvert.SerializeObject(queryItems, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore, Formatting = Formatting.None });
     }

Sdks/ConsumerApi.Sdk/src/Endpoints/RelationshipTemplates/Types/Requests/RelationshipTemplateQueryItem.cs → Sdks/ConsumerApi.Sdk/src/Endpoints/RelationshipTemplates/Types/Requests/ListRelationshipTemplatesQueryItem.cs

@@ -1,6 +1,6 @@
 namespace Backbone.ConsumerApi.Sdk.Endpoints.RelationshipTemplates.Types.Requests;
 
-public class RelationshipTemplateQueryItem
+public class ListRelationshipTemplatesQueryItem
 {
     public required string Id { get; set; }
     public byte[]? Password { get; set; }

Sdks/ConsumerApi.Sdk/src/Endpoints/Tokens/TokensEndpoint.cs

@@ -23,7 +23,7 @@ public async Task<ApiResponse<ListTokensResponse>> ListTokens(PaginationFilter?
         return await _client.Get<ListTokensResponse>($"api/{API_VERSION}/Tokens", null, pagination);
     }
 
-    public async Task<ApiResponse<ListTokensResponse>> ListTokens(IEnumerable<TokenQueryItem> queryItems, PaginationFilter? pagination = null)
+    public async Task<ApiResponse<ListTokensResponse>> ListTokens(IEnumerable<ListTokensQueryItem> queryItems, PaginationFilter? pagination = null)
     {
         return await _client
             .Request<ListTokensResponse>(HttpMethod.Get, $"api/{API_VERSION}/Tokens")

Sdks/ConsumerApi.Sdk/src/Endpoints/Tokens/Types/Requests/TokenQueryItem.cs → Sdks/ConsumerApi.Sdk/src/Endpoints/Tokens/Types/Requests/ListTokensQueryItem.cs

@@ -1,6 +1,6 @@
 namespace Backbone.ConsumerApi.Sdk.Endpoints.Tokens.Types.Requests;
 
-public class TokenQueryItem
+public class ListTokensQueryItem
 {
     public required string Id { get; set; }
     public byte[]? Password { get; set; }