diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/IProjectAppService.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/IProjectAppService.cs index 1c14d6e9fd..0866fc75e1 100644 --- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/IProjectAppService.cs +++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/IProjectAppService.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; -using Volo.Docs.Documents; namespace Volo.Docs.Projects { diff --git a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/VersionInfoDto.cs b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/VersionInfoDto.cs similarity index 67% rename from modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/VersionInfoDto.cs rename to modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/VersionInfoDto.cs index 4cd34bc082..32ac7bb1c4 100644 --- a/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Documents/VersionInfoDto.cs +++ b/modules/docs/src/Volo.Docs.Application.Contracts/Volo/Docs/Projects/VersionInfoDto.cs @@ -1,12 +1,9 @@ -using System; - -namespace Volo.Docs.Documents +namespace Volo.Docs.Projects { - [Serializable] public class VersionInfoDto { public string DisplayName { get; set; } public string Name { get; set; } } -} \ No newline at end of file +} diff --git a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj index 656d75dd9e..1d2f977806 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj +++ b/modules/docs/src/Volo.Docs.Application/Volo.Docs.Application.csproj @@ -16,8 +16,4 @@ - - - - diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs index 334fe6bfdd..50824df088 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/DocsApplicationAutoMapperProfile.cs @@ -10,6 +10,7 @@ namespace Volo.Docs public DocsApplicationAutoMapperProfile() { CreateMap(); + CreateMap(); CreateMap() .Ignore(x => x.Project); } diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs index 6ec8451e6b..42b0759c59 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs @@ -53,7 +53,7 @@ namespace Volo.Docs.Documents string version) { var documentStore = _documentStoreFactory.Create(project.DocumentStoreType); - var document = await documentStore.Find(project, documentName, version); + var document = await documentStore.FindDocument(project, documentName, version); var dto = ObjectMapper.Map(document); dto.Project = ObjectMapper.Map(project); diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs index ddd2325d14..09fe1c3994 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs +++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Projects/ProjectAppService.cs @@ -13,12 +13,12 @@ namespace Volo.Docs.Projects public class ProjectAppService : ApplicationService, IProjectAppService { private readonly IProjectRepository _projectRepository; - private readonly IDistributedCache> _distributedCache; + private readonly IDistributedCache> _distributedCache; private readonly IDocumentStoreFactory _documentStoreFactory; public ProjectAppService( IProjectRepository projectRepository, - IDistributedCache> distributedCache, + IDistributedCache> distributedCache, IDocumentStoreFactory documentStoreFactory) { _projectRepository = projectRepository; @@ -71,15 +71,15 @@ namespace Volo.Docs.Projects versions.First().Name = project.LatestVersionBranchName; } - return versions; + return ObjectMapper.Map, List>(versions); } - private async Task> GetVersionsFromCache(string projectShortName) + private async Task> GetVersionsFromCache(string projectShortName) { return await _distributedCache.GetAsync(projectShortName); } - private async Task SetVersionsToCache(string projectShortName, List versions) + private async Task SetVersionsToCache(string projectShortName, List versions) { await _distributedCache.SetAsync( projectShortName, diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index 6c9597c822..ac37f6eebc 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -17,6 +17,10 @@ + + + + diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/Document.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs similarity index 100% rename from modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/Document.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentStoreFactory.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentStoreFactory.cs similarity index 100% rename from modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentStoreFactory.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/DocumentStoreFactory.cs diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/GithubDocumentStore.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/GithubDocumentStore.cs similarity index 94% rename from modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/GithubDocumentStore.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/GithubDocumentStore.cs index 061909fd4a..adc570940b 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/GithubDocumentStore.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/GithubDocumentStore.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Net; using System.Threading.Tasks; using Volo.Abp.Domain.Services; +using Volo.Docs.Projects; using ProductHeaderValue = Octokit.ProductHeaderValue; namespace Volo.Docs.Documents @@ -15,7 +16,7 @@ namespace Volo.Docs.Documents { public const string Type = "Github"; //TODO: Convert to "github" - public Task Find( + public Task FindDocument( Projects.Project project, string documentName, string version) @@ -81,7 +82,7 @@ namespace Volo.Docs.Documents } } - public async Task> GetVersions(Volo.Docs.Projects.Project project) + public async Task> GetVersions(Volo.Docs.Projects.Project project) { try { @@ -97,12 +98,12 @@ namespace Volo.Docs.Documents GetGithubRepositoryNameFromUrl(url) ); - return releases.OrderByDescending(r => r.PublishedAt).Select(r => new VersionInfoDto { Name = r.TagName, DisplayName = r.TagName }).ToList(); + return releases.OrderByDescending(r => r.PublishedAt).Select(r => new VersionInfo { Name = r.TagName, DisplayName = r.TagName }).ToList(); } catch (Exception ex) { Logger.LogError(ex.Message, ex); - return new List(); + return new List(); } } diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/IDocumentStore.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStore.cs similarity index 50% rename from modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/IDocumentStore.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStore.cs index 7508e54eff..65a411d44a 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/IDocumentStore.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStore.cs @@ -7,14 +7,8 @@ namespace Volo.Docs.Documents { public interface IDocumentStore : IDomainService { - Task Find( - Project project, - string documentName, - string version - ); + Task FindDocument(Project project, string documentName, string version); - Task> GetVersions( - Project project - ); + Task> GetVersions(Project project); } } \ No newline at end of file diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/IDocumentStoreFactory.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStoreFactory.cs similarity index 83% rename from modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/IDocumentStoreFactory.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStoreFactory.cs index aaada0e7fe..7711c3d0d7 100644 --- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/IDocumentStoreFactory.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentStoreFactory.cs @@ -1,5 +1,3 @@ -using Volo.Docs.Projects; - namespace Volo.Docs.Documents { public interface IDocumentStoreFactory diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/ProjectGithubExtensions.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/ProjectGithubExtensions.cs similarity index 100% rename from modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/ProjectGithubExtensions.cs rename to modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/ProjectGithubExtensions.cs diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/VersionInfo.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/VersionInfo.cs new file mode 100644 index 0000000000..c10781e508 --- /dev/null +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/VersionInfo.cs @@ -0,0 +1,12 @@ +using System; + +namespace Volo.Docs.Projects +{ + [Serializable] //Serialization needed because this object is stored in cache + public class VersionInfo + { + public string DisplayName { get; set; } + + public string Name { get; set; } + } +} \ No newline at end of file