chore: removed dto suffix

thecogworks · Aug 10, 2020 · a21bfeb · a21bfeb
1 parent b0a4d45
commit a21bfeb
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 52 deletions.
diff --git a/Cogworks.AzureSearch/Indexes/AzureIndex.cs b/Cogworks.AzureSearch/Indexes/AzureIndex.cs
@@ -8,13 +8,13 @@ namespace Cogworks.AzureSearch.Indexes
 {
     public interface IAzureIndex<in TAzureModel> where TAzureModel : IAzureModelIdentity
     {
-        Task<AzureDocumentOperationResultDto> AddOrUpdateDocumentAsync(TAzureModel model);
+        Task<AzureDocumentOperationResult> AddOrUpdateDocumentAsync(TAzureModel model);
 
-        Task<AzureBatchDocumentsOperationResultDto> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models);
+        Task<AzureBatchDocumentsOperationResult> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models);
 
-        Task<AzureDocumentOperationResultDto> TryRemoveDocumentAsync(TAzureModel model);
+        Task<AzureDocumentOperationResult> TryRemoveDocumentAsync(TAzureModel model);
 
-        Task<AzureBatchDocumentsOperationResultDto> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models);
+        Task<AzureBatchDocumentsOperationResult> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models);
     }
 
     public class AzureIndex<TAzureModel> : IAzureIndex<TAzureModel> where TAzureModel : class, IAzureModelIdentity, new()
@@ -24,16 +24,16 @@ public interface IAzureIndex<in TAzureModel> where TAzureModel : IAzureModelIden
         public AzureIndex(IAzureDocumentOperation<TAzureModel> azureSearchRepository)
             => _azureSearchRepository = azureSearchRepository;
 
-        public async Task<AzureDocumentOperationResultDto> AddOrUpdateDocumentAsync(TAzureModel model)
+        public async Task<AzureDocumentOperationResult> AddOrUpdateDocumentAsync(TAzureModel model)
             => await _azureSearchRepository.AddOrUpdateDocumentAsync(model);
 
-        public async Task<AzureDocumentOperationResultDto> TryRemoveDocumentAsync(TAzureModel model)
+        public async Task<AzureDocumentOperationResult> TryRemoveDocumentAsync(TAzureModel model)
             => await _azureSearchRepository.TryRemoveDocumentAsync(model);
 
-        public async Task<AzureBatchDocumentsOperationResultDto> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models)
+        public async Task<AzureBatchDocumentsOperationResult> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models)
             => await _azureSearchRepository.AddOrUpdateDocumentsAsync(models);
 
-        public async Task<AzureBatchDocumentsOperationResultDto> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models)
+        public async Task<AzureBatchDocumentsOperationResult> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models)
             => await _azureSearchRepository.TryRemoveDocumentsAsync(models);
     }
 }
diff --git a/Cogworks.AzureSearch/Initializers/AzureInitializer.cs b/Cogworks.AzureSearch/Initializers/AzureInitializer.cs
@@ -8,7 +8,7 @@ namespace Cogworks.AzureSearch.Initializers
 {
     public interface IAzureInitializer<in TAzureModel> where TAzureModel : IAzureModelIdentity
     {
-        Task<AzureIndexOperationResultDto> InitializeAsync();
+        Task<AzureIndexOperationResult> InitializeAsync();
     }
 
     public class AzureInitializer<TAzureModel> : IAzureInitializer<TAzureModel>
@@ -23,7 +23,7 @@ public AzureInitializer(AzureSearchIndexOption azureSearchIndexOption, IAzureInd
             _azureIndexOperation = azureIndexOperation;
         }
 
-        public async Task<AzureIndexOperationResultDto> InitializeAsync()
+        public async Task<AzureIndexOperationResult> InitializeAsync()
         {
             if (_azureSearchIndexOption.Recreate)
             {

diff --git a/Cogworks.AzureSearch/Models/Dtos/AzureBatchDocumentsOperationResult.cs b/Cogworks.AzureSearch/Models/Dtos/AzureBatchDocumentsOperationResult.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Cogworks.AzureSearch.Models.Dtos
+{
+    public class AzureBatchDocumentsOperationResult
+    {
+        public bool Succeeded { get; set; }
+
+        public string Message { get; set; }
+
+        public IEnumerable<AzureDocumentOperationResult> SucceededDocuments { get; set; } = Enumerable.Empty<AzureDocumentOperationResult>();
+
+        public IEnumerable<AzureDocumentOperationResult> FailedDocuments { get; set; } = Enumerable.Empty<AzureDocumentOperationResult>();
+    }
+}
diff --git a/Cogworks.AzureSearch/Models/Dtos/AzureBatchDocumentsOperationResultDto.cs b/Cogworks.AzureSearch/Models/Dtos/AzureBatchDocumentsOperationResultDto.cs
diff --git a/...s/Dtos/AzureDocumentOperationResultDto.cs → ...dels/Dtos/AzureDocumentOperationResult.cs b/...s/Dtos/AzureDocumentOperationResultDto.cs → ...dels/Dtos/AzureDocumentOperationResult.cs
@@ -1,6 +1,6 @@
 namespace Cogworks.AzureSearch.Models.Dtos
 {
-    public class AzureDocumentOperationResultDto
+    public class AzureDocumentOperationResult
     {
         public bool Succeeded { get; set; }
 

diff --git a/...dels/Dtos/AzureIndexOperationResultDto.cs → .../Models/Dtos/AzureIndexOperationResult.cs b/...dels/Dtos/AzureIndexOperationResultDto.cs → .../Models/Dtos/AzureIndexOperationResult.cs
@@ -1,6 +1,6 @@
 namespace Cogworks.AzureSearch.Models.Dtos
 {
-    public class AzureIndexOperationResultDto
+    public class AzureIndexOperationResult
     {
         public bool Succeeded { get; set; }
 

diff --git a/...zureSearch/Models/Dtos/SearchResultDto.cs → ...s.AzureSearch/Models/Dtos/SearchResult.cs b/...zureSearch/Models/Dtos/SearchResultDto.cs → ...s.AzureSearch/Models/Dtos/SearchResult.cs
@@ -2,9 +2,9 @@
 
 namespace Cogworks.AzureSearch.Models.Dtos
 {
-    public class SearchResultDto<TModel> where TModel : IAzureModelIdentity
+    public class SearchResult<TModel> where TModel : IAzureModelIdentity
     {
-        public long? TotalCount { get; set; }
+        public long TotalCount { get; set; }
 
         public IEnumerable<TModel> Results { get; set; }
 

diff --git a/Cogworks.AzureSearch/Repositories/AzureSearchRepository.cs b/Cogworks.AzureSearch/Repositories/AzureSearchRepository.cs
@@ -15,22 +15,22 @@ public interface IAzureIndexOperation<in TAzureModel> where TAzureModel : IAzure
     {
         Task<bool> IndexExistsAsync();
 
-        Task<AzureIndexOperationResultDto> IndexDeleteAsync();
+        Task<AzureIndexOperationResult> IndexDeleteAsync();
 
-        Task<AzureIndexOperationResultDto> IndexCreateOrUpdateAsync();
+        Task<AzureIndexOperationResult> IndexCreateOrUpdateAsync();
 
-        Task<AzureIndexOperationResultDto> IndexClearAsync();
+        Task<AzureIndexOperationResult> IndexClearAsync();
     }
 
     public interface IAzureDocumentOperation<in TAzureModel> where TAzureModel : IAzureModelIdentity
     {
-        Task<AzureDocumentOperationResultDto> AddOrUpdateDocumentAsync(TAzureModel model);
+        Task<AzureDocumentOperationResult> AddOrUpdateDocumentAsync(TAzureModel model);
 
-        Task<AzureBatchDocumentsOperationResultDto> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models);
+        Task<AzureBatchDocumentsOperationResult> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models);
 
-        Task<AzureDocumentOperationResultDto> TryRemoveDocumentAsync(TAzureModel model);
+        Task<AzureDocumentOperationResult> TryRemoveDocumentAsync(TAzureModel model);
 
-        Task<AzureBatchDocumentsOperationResultDto> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models);
+        Task<AzureBatchDocumentsOperationResult> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models);
     }
 
     public interface IAzureSearchRepository<in TAzureModel> : IAzureDocumentOperation<TAzureModel>, IAzureIndexOperation<TAzureModel>
@@ -54,9 +54,9 @@ public AzureSearchRepository(AzureIndexDefinition<TAzureModel> azureIndexDefinit
         public Task<bool> IndexExistsAsync()
             => _searchServiceClient.Indexes.ExistsAsync(_azureIndexDefinition.IndexName);
 
-        public async Task<AzureIndexOperationResultDto> IndexDeleteAsync()
+        public async Task<AzureIndexOperationResult> IndexDeleteAsync()
         {
-            var result = new AzureIndexOperationResultDto();
+            var result = new AzureIndexOperationResult();
 
             try
             {
@@ -73,15 +73,15 @@ public async Task<AzureIndexOperationResultDto> IndexDeleteAsync()
             return result;
         }
 
-        public async Task<AzureIndexOperationResultDto> IndexCreateOrUpdateAsync()
+        public async Task<AzureIndexOperationResult> IndexCreateOrUpdateAsync()
         {
             var indexDefinition = new Index()
             {
                 Name = _azureIndexDefinition.IndexName,
                 Fields = FieldBuilder.BuildForType<TAzureModel>()
             };
 
-            var result = new AzureIndexOperationResultDto();
+            var result = new AzureIndexOperationResult();
 
             try
             {
@@ -98,7 +98,7 @@ public async Task<AzureIndexOperationResultDto> IndexCreateOrUpdateAsync()
             return result;
         }
 
-        public async Task<AzureIndexOperationResultDto> IndexClearAsync()
+        public async Task<AzureIndexOperationResult> IndexClearAsync()
         {
             if (await IndexExistsAsync())
             {
@@ -108,7 +108,7 @@ public async Task<AzureIndexOperationResultDto> IndexClearAsync()
             return await IndexCreateOrUpdateAsync();
         }
 
-        public async Task<AzureDocumentOperationResultDto> AddOrUpdateDocumentAsync(TAzureModel model)
+        public async Task<AzureDocumentOperationResult> AddOrUpdateDocumentAsync(TAzureModel model)
         {
             var azureBatchDocumentsOperationResult = await AddOrUpdateDocumentsAsync(new[] { model });
 
@@ -117,11 +117,11 @@ public async Task<AzureDocumentOperationResultDto> AddOrUpdateDocumentAsync(TAzu
                 : azureBatchDocumentsOperationResult.FailedDocuments.FirstOrDefault();
         }
 
-        public async Task<AzureBatchDocumentsOperationResultDto> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models)
+        public async Task<AzureBatchDocumentsOperationResult> AddOrUpdateDocumentsAsync(IEnumerable<TAzureModel> models)
         {
             if (!models.HasAny())
             {
-                return new AzureBatchDocumentsOperationResultDto()
+                return new AzureBatchDocumentsOperationResult()
                 {
                     Succeeded = true,
                     Message = "No documents found to index."
@@ -153,7 +153,7 @@ public async Task<AzureBatchDocumentsOperationResultDto> AddOrUpdateDocumentsAsy
             return GetBatchOperationStatus(indexResults, "adding or updating");
         }
 
-        public async Task<AzureDocumentOperationResultDto> TryRemoveDocumentAsync(TAzureModel model)
+        public async Task<AzureDocumentOperationResult> TryRemoveDocumentAsync(TAzureModel model)
         {
             var azureBatchDocumentsOperationResult = await TryRemoveDocumentsAsync(new[] { model });
 
@@ -162,11 +162,11 @@ public async Task<AzureDocumentOperationResultDto> TryRemoveDocumentAsync(TAzure
                 : azureBatchDocumentsOperationResult.FailedDocuments.FirstOrDefault();
         }
 
-        public async Task<AzureBatchDocumentsOperationResultDto> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models)
+        public async Task<AzureBatchDocumentsOperationResult> TryRemoveDocumentsAsync(IEnumerable<TAzureModel> models)
         {
             if (!models.HasAny())
             {
-                return new AzureBatchDocumentsOperationResultDto()
+                return new AzureBatchDocumentsOperationResult()
                 {
                     Succeeded = true,
                     Message = "No documents found to delete."
@@ -197,22 +197,22 @@ public async Task<AzureBatchDocumentsOperationResultDto> TryRemoveDocumentsAsync
             return GetBatchOperationStatus(indexResults, "removing");
         }
 
-        private AzureBatchDocumentsOperationResultDto GetBatchOperationStatus(IEnumerable<IndexingResult> indexingResults, string operationType)
+        private AzureBatchDocumentsOperationResult GetBatchOperationStatus(IEnumerable<IndexingResult> indexingResults, string operationType)
         {
             var successfullyItems = indexingResults.Where(x => x.Succeeded).ToList();
             var failedItems = indexingResults.Where(x => !x.Succeeded).ToList();
 
-            return new AzureBatchDocumentsOperationResultDto
+            return new AzureBatchDocumentsOperationResult
             {
                 Succeeded = !failedItems.Any(),
-                SucceededDocuments = successfullyItems.Select(successfullyItem => new AzureDocumentOperationResultDto
+                SucceededDocuments = successfullyItems.Select(successfullyItem => new AzureDocumentOperationResult
                 {
                     Succeeded = true,
                     Message = $"Successfully {operationType} document.",
                     ModelId = successfullyItem.Key,
                     StatusCode = successfullyItem.StatusCode
                 }).ToList(),
-                FailedDocuments = failedItems.Select(failedItem => new AzureDocumentOperationResultDto
+                FailedDocuments = failedItems.Select(failedItem => new AzureDocumentOperationResult
                 {
                     Message = $"Failed {operationType} document.",
                     ModelId = failedItem.Key,