Merge pull request #3721 from abpframework/maliming/docs-es

Enhanced reindex function.

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Documents/IDocumentAdminAppService.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
 
 namespace Volo.Docs.Admin.Documents
@@ -10,7 +11,5 @@ namespace Volo.Docs.Admin.Documents
         Task PullAllAsync(PullAllDocumentInput input);
 
         Task PullAsync(PullDocumentInput input);
-
-        Task ReindexAsync();
     }
-}
+}

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/IProjectAdminAppService.cs

@@ -12,9 +12,13 @@ namespace Volo.Docs.Admin.Projects
         Task<ProjectDto> GetAsync(Guid id);
 
         Task<ProjectDto> CreateAsync(CreateProjectDto input);
-     
+
         Task<ProjectDto> UpdateAsync(Guid id, UpdateProjectDto input);
-     
+
         Task DeleteAsync(Guid id);
+
+        Task ReindexAsync(ReindexInput input);
+
+        Task ReindexAllAsync();
     }
-}
+}

modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/Projects/ReindexInput.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Volo.Docs.Admin.Projects
+{
+    public class ReindexInput
+    {
+        public Guid ProjectId { get; set; }
+    }
+}

modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Documents/DocumentAdminAppService.cs

@@ -25,17 +25,13 @@ namespace Volo.Docs.Admin.Documents
         private readonly IDistributedCache<DocumentUpdateInfo> _documentUpdateCache;
         private readonly IDistributedCache<List<VersionInfo>> _versionCache;
         private readonly IDistributedCache<LanguageConfig> _languageCache;
-        private readonly IDistributedCache<DocumentResource> _resourceCache;
-        private readonly IDocumentFullSearch _documentFullSearch;
 
         public DocumentAdminAppService(IProjectRepository projectRepository,
             IDocumentRepository documentRepository,
             IDocumentSourceFactory documentStoreFactory,
             IDistributedCache<DocumentUpdateInfo> documentUpdateCache,
             IDistributedCache<List<VersionInfo>> versionCache,
-            IDistributedCache<LanguageConfig> languageCache,
-            IDistributedCache<DocumentResource> resourceCache,
-            IDocumentFullSearch documentFullSearch)
+            IDistributedCache<LanguageConfig> languageCache)
         {
             _projectRepository = projectRepository;
             _documentRepository = documentRepository;
@@ -43,8 +39,6 @@ namespace Volo.Docs.Admin.Documents
             _documentUpdateCache = documentUpdateCache;
             _versionCache = versionCache;
             _languageCache = languageCache;
-            _resourceCache = resourceCache;
-            _documentFullSearch = documentFullSearch;
 
             LocalizationResource = typeof(DocsResource);
         }
@@ -125,32 +119,6 @@ namespace Volo.Docs.Admin.Documents
             await UpdateDocumentUpdateInfoCache(sourceDocument);
         }
 
-        public async Task ReindexAsync()
-        {
-            var docs = await _documentRepository.GetListAsync();
-            var projects = await _projectRepository.GetListAsync();
-            foreach (var doc in docs)
-            {
-                var project = projects.FirstOrDefault(x => x.Id == doc.ProjectId);
-                if (project == null)
-                {
-                    continue;
-                }
-
-                if (doc.FileName == project.NavigationDocumentName)
-                {
-                    continue;
-                }
-
-                if (doc.FileName == project.ParametersDocumentName)
-                {
-                    continue;
-                }
-
-                await _documentFullSearch.AddOrUpdateAsync(doc);
-            }
-        }
-
         private async Task UpdateDocumentUpdateInfoCache(Document document)
         {
             var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
@@ -174,4 +142,4 @@ namespace Volo.Docs.Admin.Documents
             return document;
         }
     }
-}
+}

modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Guids;
+using Volo.Docs.Documents;
+using Volo.Docs.Documents.FullSearch.Elastic;
 using Volo.Docs.Localization;
 using Volo.Docs.Projects;
 
@@ -14,15 +17,22 @@ namespace Volo.Docs.Admin.Projects
     public class ProjectAdminAppService : ApplicationService, IProjectAdminAppService
     {
         private readonly IProjectRepository _projectRepository;
+        private readonly IDocumentRepository _documentRepository;
+        private readonly IDocumentFullSearch _documentFullSearch;
         private readonly IGuidGenerator _guidGenerator;
 
         public ProjectAdminAppService(
-            IProjectRepository projectRepository, IGuidGenerator guidGenerator)
+            IProjectRepository projectRepository,
+            IDocumentRepository documentRepository,
+            IDocumentFullSearch documentFullSearch,
+            IGuidGenerator guidGenerator)
         {
             ObjectMapperContext = typeof(DocsAdminApplicationModule);
             LocalizationResource = typeof(DocsResource);
 
             _projectRepository = projectRepository;
+            _documentRepository = documentRepository;
+            _documentFullSearch = documentFullSearch;
             _guidGenerator = guidGenerator;
         }
 
@@ -51,7 +61,7 @@ namespace Volo.Docs.Admin.Projects
             {
                 throw new ProjectShortNameAlreadyExistsException(input.ShortName);
             }
-            
+
             var project = new Project(_guidGenerator.Create(),
                 input.Name,
                 input.ShortName,
@@ -71,7 +81,7 @@ namespace Volo.Docs.Admin.Projects
             {
                 project.ExtraProperties.Add(extraProperty.Key, extraProperty.Value);
             }
-            
+
             project = await _projectRepository.InsertAsync(project);
 
             return ObjectMapper.Map<Project, ProjectDto>(project);
@@ -106,6 +116,57 @@ namespace Volo.Docs.Admin.Projects
         {
             await _projectRepository.DeleteAsync(id);
         }
-        
+
+        public async Task ReindexAsync(ReindexInput input)
+        {
+            var project = await _projectRepository.GetAsync(input.ProjectId);
+
+            await _documentFullSearch.DeleteAllByProjectIdAsync(project.Id);
+
+            var docs = await _documentRepository.GetListByProjectId(project.Id);
+
+            foreach (var doc in docs)
+            {
+                if (doc.FileName == project.NavigationDocumentName)
+                {
+                    continue;
+                }
+
+                if (doc.FileName == project.ParametersDocumentName)
+                {
+                    continue;
+                }
+
+                await _documentFullSearch.AddOrUpdateAsync(doc);
+            }
+        }
+
+        public async Task ReindexAllAsync()
+        {
+            await _documentFullSearch.DeleteAllAsync();
+
+            var docs = await _documentRepository.GetListAsync();
+            var projects = await _projectRepository.GetListAsync();
+            foreach (var doc in docs)
+            {
+                var project = projects.FirstOrDefault(x => x.Id == doc.ProjectId);
+                if (project == null)
+                {
+                    continue;
+                }
+
+                if (doc.FileName == project.NavigationDocumentName)
+                {
+                    continue;
+                }
+
+                if (doc.FileName == project.ParametersDocumentName)
+                {
+                    continue;
+                }
+
+                await _documentFullSearch.AddOrUpdateAsync(doc);
+            }
+        }
     }
-}
+}

modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/DocumentsAdminController.cs

@@ -39,12 +39,5 @@ namespace Volo.Docs.Admin
         {
              return _documentAdminAppService.PullAsync(input);
         }
-
-        [HttpPost]
-        [Route("Reindex")]
-        public Task ReindexAsync()
-        {
-            return _documentAdminAppService.ReindexAsync();
-        }
     }
 }

modules/docs/src/Volo.Docs.Admin.HttpApi/Volo/Docs/Admin/ProjectsAdminController.cs

@@ -53,5 +53,19 @@ namespace Volo.Docs.Admin
         {
             return _projectAppService.DeleteAsync(id);
         }
+
+        [HttpPost]
+        [Route("ReindexAll")]
+        public Task ReindexAllAsync()
+        {
+            return _projectAppService.ReindexAllAsync();
+        }
+
+        [HttpPost]
+        [Route("Reindex")]
+        public Task ReindexAsync(ReindexInput input)
+        {
+            return _projectAppService.ReindexAsync(input);
+        }
     }
 }

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/Index.cshtml

@@ -39,6 +39,10 @@
                         </abp-dropdown-menu>
                     </abp-dropdown>
                 }
+                @if (await Authorization.IsGrantedAsync(DocsAdminPermissions.Projects.Default))
+                {
+                    <abp-button button-type="Primary" icon="plus" text="@L["ReIndexAllProjects"].Value" id="ReIndexAllProjects" />
+                }
             </abp-column>
         </abp-row>
     </abp-card-header>

modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Projects/index.js

@@ -74,6 +74,18 @@
                                             _dataTable.ajax.reload();
                                         });
                                 }
+                            },
+                            {
+                                text: l('ReIndexProject'),
+                                visible: abp.auth.isGranted('Docs.Admin.Documents'),
+                                confirmMessage: function (data) { return l('ReIndexProjectConfirmationMessage', data.record.name); },
+                                action: function (data) {
+                                    volo.docs.admin.projectsAdmin
+                                        .reindex({ projectId: data.record.id})
+                                        .then(function () {
+                                            abp.message.success(l('SuccessfullyReIndexProject', data.record.name));
+                                        });
+                                }
                             }
                         ]
                 }
@@ -110,6 +122,19 @@
         _createModal.open({source:"GitHub"});
     });
 
+    $("#ReIndexAllProjects").click(function (event) {
+        abp.message.confirm(l('ReIndexAllProjectConfirmationMessage'))
+            .done(function (accepted) {
+                if (accepted) {
+                    volo.docs.admin.projectsAdmin
+                    .reindexAll()
+                    .then(function () {
+                        abp.message.success(l('SuccessfullyReIndexAllProject'));
+                    });
+                }
+            });
+    });
+
     _createModal.onClose(function () {
         _dataTable.ajax.reload();
     });
@@ -118,4 +143,4 @@
         _dataTable.ajax.reload();
     });
 
-});
+});

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/ElasticDocumentFullSearch.cs

@@ -92,6 +92,48 @@ namespace Volo.Docs.Documents.FullSearch.Elastic
                 .DeleteAsync(DocumentPath<Document>.Id(id), x => x.Index(_options.IndexName), cancellationToken));
         }
 
+        public async Task DeleteAllAsync(CancellationToken cancellationToken = default)
+        {
+            ValidateElasticSearchEnabled();
+
+            var request = new DeleteByQueryRequest(_options.IndexName)
+            {
+                Query = new MatchAllQuery()
+            };
+
+            HandleError(await _clientProvider.GetClient()
+                .DeleteByQueryAsync(request, cancellationToken));
+        }
+
+        public async Task DeleteAllByProjectIdAsync(Guid projectId, CancellationToken cancellationToken = default)
+        {
+            ValidateElasticSearchEnabled();
+
+            var request = new DeleteByQueryRequest(_options.IndexName)
+            {
+                Query = new BoolQuery
+                {
+                    Filter = new QueryContainer[]
+                    {
+                        new BoolQuery
+                        {
+                            Must = new QueryContainer[]
+                            {
+                                new TermQuery
+                                {
+                                    Field = "projectId",
+                                    Value = projectId
+                                }
+                            }
+                        }
+                    }
+                },
+            };
+
+            HandleError(await _clientProvider.GetClient()
+                .DeleteByQueryAsync(request, cancellationToken));
+        }
+
         public async Task<List<EsDocument>> SearchAsync(string context, Guid projectId, string languageCode,
             string version, int? skipCount = null, int? maxResultCount = null,
             CancellationToken cancellationToken = default)
@@ -185,4 +227,4 @@ namespace Volo.Docs.Documents.FullSearch.Elastic
             }
         }
     }
-}
+}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/FullSearch/Elastic/IDocumentFullSearch.cs

@@ -13,8 +13,12 @@ namespace Volo.Docs.Documents.FullSearch.Elastic
 
         Task DeleteAsync(Guid id, CancellationToken cancellationToken = default);
 
+        Task DeleteAllAsync(CancellationToken cancellationToken = default);
+
+        Task DeleteAllByProjectIdAsync(Guid projectId, CancellationToken cancellationToken = default);
+
         Task<List<EsDocument>> SearchAsync(string context, Guid projectId, string languageCode,
             string version, int? skipCount = null, int? maxResultCount = null,
             CancellationToken cancellationToken = default);
     }
-}
+}

modules/docs/src/Volo.Docs.Domain/Volo/Docs/Localization/Domain/en.json

@@ -11,6 +11,12 @@
     "Delete": "Delete",
     "ClearCache": "Clear cache",
     "ClearCacheConfirmationMessage": "Are you sure to clear all caches for project \"{0}\"",
+    "ReIndexAllProjects": "ReIndex all projects",
+    "ReIndexProject": "ReIndex project",
+    "ReIndexProjectConfirmationMessage":"Are you sure to reindex for project \"{0}\"",
+    "SuccessfullyReIndexProject": "Successfully reindex for project \"{0}\"",
+    "ReIndexAllProjectConfirmationMessage": "Are you sure to reindex all project?",
+    "SuccessfullyReIndexAllProject": "Successfully reindex for all projects",
     "InThisDocument": "In this document",
     "GoToTop": "Go to top",
     "Projects": "Project(s)",