From 6f97cb888178686b642d25038781079b6c1d73a8 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Tue, 29 Oct 2024 22:19:30 -0400 Subject: [PATCH 01/11] ignore appsettings.json --- .gitignore | 3 ++- rubberduckvba.Server/appsettings.json | 29 --------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 rubberduckvba.Server/appsettings.json diff --git a/.gitignore b/.gitignore index 1a4c036..933f381 100644 --- a/.gitignore +++ b/.gitignore @@ -361,4 +361,5 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd +/rubberduckvba.Server/appsettings.json diff --git a/rubberduckvba.Server/appsettings.json b/rubberduckvba.Server/appsettings.json deleted file mode 100644 index 0a58fec..0000000 --- a/rubberduckvba.Server/appsettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "ConnectionStrings": { - "RubberduckDb": "Data Source=(localdb)\\MSSQLLocalDB;Integrated Security=True;Trust Server Certificate=True;", - "HangfireDb": "Data Source=(localdb)\\MSSQLLocalDB;Integrated Security=True;Trust Server Certificate=True;" - }, - "GitHub": { - "CodeInspectionDefaultSettingsUri": "/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings", - "CodeInspectionInfoResxUri": "https://github.com/rubberduck-vba/Rubberduck/blob/next/Rubberduck.Resources/Inspections/InspectionInfo.resx" - }, - "Hangfire": { - "QueuePollIntervalSeconds": 30, - "AutoRetryAttempts": 2, - "AutoRetryDelaySeconds": [ 2, 5, 10, 30, 60 ], - "HeartbeatIntervalMinutes": 1, - "CancellationCheckIntervalSeconds": 300, - "ConfigureHangfireServerOnStartup": true, - "CreateUpdateInstallerDownloadsJob": true, - "CreateUpdateXmldocContentJob": true, - "UpdateInstallerDownloadsSchedule": "0 0 * * *", // daily - "UpdateXmldocContentSchedule": "0 0 31 2 *" // never - }, - "AllowedHosts": "*" -} From 60bb31ac27dcdb09d1174be9797e733308e7102f Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Tue, 29 Oct 2024 22:19:56 -0400 Subject: [PATCH 02/11] layout tweaks; fix markdown formatting --- .../SyntaxHighlighterService.cs | 3 +- .../Api/Admin/AdminController.cs | 1 - .../Api/Features/FeaturesController.cs | 18 ++-- .../XmlDoc/XmlDocInspection.cs | 4 +- rubberduckvba.Server/Program.cs | 3 +- .../InstallerDownloadStatsOrchestrator.cs | 4 +- .../Services/MarkdownFormattingService.cs | 4 +- rubberduckvba.client/src/app/app.module.ts | 2 + .../example-box/example-box.component.html | 7 +- .../feature-box/feature-box.component.html | 101 ++++++++---------- .../feature-info/feature-info.component.html | 11 +- .../feature-item-box.component.html | 4 +- .../loading-content.component.html | 8 ++ .../loading-content.component.ts | 17 +++ .../src/app/model/tags.model.ts | 4 +- .../routes/features/features.component.html | 21 ++-- .../src/app/routes/home/home.component.ts | 2 +- .../src/assets/__autocompletion.gif | Bin 0 -> 50137 bytes .../src/assets/autocompletion.gif | Bin 50137 -> 11496 bytes 19 files changed, 111 insertions(+), 103 deletions(-) create mode 100644 rubberduckvba.client/src/app/components/loading-content/loading-content.component.html create mode 100644 rubberduckvba.client/src/app/components/loading-content/loading-content.component.ts create mode 100644 rubberduckvba.client/src/assets/__autocompletion.gif diff --git a/RubberduckServices/SyntaxHighlighterService.cs b/RubberduckServices/SyntaxHighlighterService.cs index 7f6a9e8..03ed507 100644 --- a/RubberduckServices/SyntaxHighlighterService.cs +++ b/RubberduckServices/SyntaxHighlighterService.cs @@ -99,7 +99,8 @@ public async Task FormatAsync(string code) let trimmed = line.Substring(indent) select FormatIndents(trimmed); - return await Task.FromResult(string.Join("
", formattedLines)); + var reconstructed = string.Join("
", formattedLines); + return await Task.FromResult(reconstructed); } private void FormatTokens(StringBuilder builder, ITokenStream tokens, IntervalListener[] listeners) diff --git a/rubberduckvba.Server/Api/Admin/AdminController.cs b/rubberduckvba.Server/Api/Admin/AdminController.cs index 9e768f2..16406db 100644 --- a/rubberduckvba.Server/Api/Admin/AdminController.cs +++ b/rubberduckvba.Server/Api/Admin/AdminController.cs @@ -42,7 +42,6 @@ public async ValueTask UpdateTagMetadata() return await ValueTask.FromResult(Ok(jobId)); } - [Authorize("github")] [HttpGet("admin/config/current")] public async ValueTask Config() { diff --git a/rubberduckvba.Server/Api/Features/FeaturesController.cs b/rubberduckvba.Server/Api/Features/FeaturesController.cs index de60313..0a39ef9 100644 --- a/rubberduckvba.Server/Api/Features/FeaturesController.cs +++ b/rubberduckvba.Server/Api/Features/FeaturesController.cs @@ -48,6 +48,9 @@ public async Task>> Index() return Ok(model); } + private static readonly IDictionary _moduleTypeNames = typeof(ExampleModuleType).GetMembers().Where(e => e.GetCustomAttribute() != null) + .ToDictionary(member => member.Name, member => member.GetCustomAttribute()?.Description ?? member.Name); + [HttpGet("features/{name}")] [AllowAnonymous] public async Task> Info([FromRoute] string name) @@ -63,12 +66,10 @@ public async Task> Info([FromRoute] string name) return NotFound(); } - var moduleTypeNames = typeof(ExampleModuleType).GetMembers().Where(e => e.GetCustomAttribute() != null).ToDictionary(member => member.Name, member => member.GetCustomAttribute()?.Description ?? member.Name); - var model = new FeatureViewModel(feature with { Description = await md.FormatMarkdownDocument(feature.Description, true), - ShortDescription = feature.ShortDescription, + ShortDescription = await md.FormatMarkdownDocument(feature.ShortDescription), ParentId = feature.Id, ParentName = feature.Name, @@ -76,8 +77,8 @@ public async Task> Info([FromRoute] string name) Features = feature.Features.Select(subFeature => subFeature with { - Description = subFeature.Description, - ShortDescription = subFeature.ShortDescription + Description = md.FormatMarkdownDocument(subFeature.Description).ConfigureAwait(false).GetAwaiter().GetResult(), + ShortDescription = md.FormatMarkdownDocument(subFeature.ShortDescription).ConfigureAwait(false).GetAwaiter().GetResult() }).ToArray(), Inspections = feature.Items.Select(item => @@ -108,11 +109,14 @@ public async Task> Info([FromRoute] string name) DefaultSeverity = info.DefaultSeverity, QuickFixes = info.QuickFixes, Serialized = item.Serialized, - Examples = info.Examples ?? [] + Examples = info.Examples.Select(e => e with + { + Modules = e.Modules.Select(module => module with { ModuleTypeName = _moduleTypeNames[module.ModuleType.ToString()] }).ToList() + }).ToList() ?? [] }; }).ToArray(), - Items = feature.Items + //Items = feature.Items }); //cache.Write(HttpContext.Request.Path, model); diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs index 7da610b..7ca4812 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs @@ -163,13 +163,13 @@ private IEnumerable ParseExamples(XElement node) { HtmlContent = await _markdownService.FormatMarkdownDocument("" + m.Nodes().OfType().Single().Value.Trim().Replace(" ", " ") + "", withSyntaxHighlighting: true), ModuleName = m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleNameAttribute)?.Value ?? string.Empty, - ModuleType = ModuleTypes.TryGetValue(m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleTypeAttribute)?.Value ?? string.Empty, out var type) ? type : ExampleModuleType.Any, + ModuleType = ModuleTypes.TryGetValue(m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleTypeAttribute)?.Value.Trim() ?? string.Empty, out var type) ? type : ExampleModuleType.Any, }) .Select(t => t.GetAwaiter().GetResult()) .Concat(e.Nodes().OfType().Select(async x => new ExampleModule { - HtmlContent = await _markdownService.FormatMarkdownDocument(x.Value, withSyntaxHighlighting: true), + HtmlContent = await _markdownService.FormatMarkdownDocument("" + x.Value.Trim().Replace(" ", " ") + "", withSyntaxHighlighting: true), ModuleName = "Module1", ModuleType = ExampleModuleType.Any }) diff --git a/rubberduckvba.Server/Program.cs b/rubberduckvba.Server/Program.cs index 9b3e7f7..f379a97 100644 --- a/rubberduckvba.Server/Program.cs +++ b/rubberduckvba.Server/Program.cs @@ -16,13 +16,14 @@ using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.com.Server.Hangfire; using rubberduckvba.com.Server.Services; +using System.Diagnostics; using System.Reflection; namespace rubberduckvba.com.Server; public class HangfireAuthenticationFilter : IDashboardAuthorizationFilter { - public bool Authorize([NotNull] DashboardContext context) => context.Request.RemoteIpAddress == "20.220.30.154"; + public bool Authorize([NotNull] DashboardContext context) => Debugger.IsAttached || context.Request.RemoteIpAddress == "20.220.30.154"; } public class Program diff --git a/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs b/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs index a68264c..e2b1f45 100644 --- a/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs +++ b/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs @@ -13,14 +13,14 @@ public async Task UpdateContentAsync(TagSyncRequestParameters request, Cancellat { await pipeline.ExecuteAsync(request, tokenSource); } - catch (TaskCanceledException) + catch (TaskCanceledException e) { var exceptions = pipeline.Exceptions.ToList(); if (exceptions.Count > 0) { if (exceptions.Count == 1) { - throw exceptions[0]; + throw new OperationCanceledException(e.Message, exceptions[0]); } else { diff --git a/rubberduckvba.Server/Services/MarkdownFormattingService.cs b/rubberduckvba.Server/Services/MarkdownFormattingService.cs index 248c387..8a014bd 100644 --- a/rubberduckvba.Server/Services/MarkdownFormattingService.cs +++ b/rubberduckvba.Server/Services/MarkdownFormattingService.cs @@ -18,7 +18,7 @@ public async Task FormatMarkdownDocument(string content, bool withSyntax return string.Empty; } - var markdown = content.Replace("\n","\r\n"); + var markdown = content.Replace("\n", "\r\n"); if (withSyntaxHighlighting) { markdown = await PreProcessMarkdownString(markdown); @@ -63,7 +63,7 @@ private async Task PreProcessMarkdownString(string content) node.AppendChild(codeAreaDiv); } - return document.DocumentNode.FirstChild.InnerHtml; + return document.DocumentNode.InnerHtml; } private async Task PostProcessHtml(string html) diff --git a/rubberduckvba.client/src/app/app.module.ts b/rubberduckvba.client/src/app/app.module.ts index 8c9cb30..ab024be 100644 --- a/rubberduckvba.client/src/app/app.module.ts +++ b/rubberduckvba.client/src/app/app.module.ts @@ -21,6 +21,7 @@ import { FeatureItemExampleComponent } from './components/quickfix-example.modal import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { BrowserModule } from '@angular/platform-browser'; import { RouterModule } from '@angular/router'; +import { LoadingContentComponent } from './components/loading-content/loading-content.component'; //import { httpInterceptorProviders } from './services/HttpRequestInterceptor'; @@ -38,6 +39,7 @@ import { RouterModule } from '@angular/router'; FeatureItemBoxComponent, ExampleBoxComponent, FeatureItemExampleComponent, + LoadingContentComponent ], bootstrap: [AppComponent], imports: [ diff --git a/rubberduckvba.client/src/app/components/example-box/example-box.component.html b/rubberduckvba.client/src/app/components/example-box/example-box.component.html index 5665c2d..44a5952 100644 --- a/rubberduckvba.client/src/app/components/example-box/example-box.component.html +++ b/rubberduckvba.client/src/app/components/example-box/example-box.component.html @@ -1,9 +1,6 @@
-
-

Loading...

-
@@ -35,14 +32,14 @@

-
+
{{module.moduleName}}
-
+
diff --git a/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html b/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html index 9ea8285..bdf81ab 100644 --- a/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html +++ b/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html @@ -1,70 +1,57 @@ -
+
-
-
-

Loading...

+
+ +
+
+
+

{{feature.title}}

+

+
+
+ + Details ▸ + +
-
- + +
-
-
-
+ +
-
-

-
-
- Details - -
-
-
-
- {{feature.title}} -
-
-
-
-
- -
-
-
-
-
-
-

-
-
+
+

+
diff --git a/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html b/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html index 480466b..46599b3 100644 --- a/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html +++ b/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html @@ -1,11 +1,4 @@ -
-
- Rubberduck logo -
-
-

loading...

-
-
+

{{feature?.title}}

@@ -19,7 +12,7 @@

{{feature?.title}}

- Rubberduck logo + Rubberduck logo
diff --git a/rubberduckvba.client/src/app/components/feature-item-box/feature-item-box.component.html b/rubberduckvba.client/src/app/components/feature-item-box/feature-item-box.component.html index 06b4da1..82b9d26 100644 --- a/rubberduckvba.client/src/app/components/feature-item-box/feature-item-box.component.html +++ b/rubberduckvba.client/src/app/components/feature-item-box/feature-item-box.component.html @@ -137,10 +137,10 @@
Remarks
diff --git a/rubberduckvba.client/src/app/components/loading-content/loading-content.component.html b/rubberduckvba.client/src/app/components/loading-content/loading-content.component.html new file mode 100644 index 0000000..aa5d462 --- /dev/null +++ b/rubberduckvba.client/src/app/components/loading-content/loading-content.component.html @@ -0,0 +1,8 @@ +
+
+ Rubberduck logo +
+
+

loading...

+
+
diff --git a/rubberduckvba.client/src/app/components/loading-content/loading-content.component.ts b/rubberduckvba.client/src/app/components/loading-content/loading-content.component.ts new file mode 100644 index 0000000..84d0f17 --- /dev/null +++ b/rubberduckvba.client/src/app/components/loading-content/loading-content.component.ts @@ -0,0 +1,17 @@ +import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChange, SimpleChanges, TemplateRef, ViewChild, inject } from '@angular/core'; +import { FaIconLibrary } from '@fortawesome/angular-fontawesome'; +import { fas } from '@fortawesome/free-solid-svg-icons'; +import { fab } from '@fortawesome/free-brands-svg-icons'; +import { Tag, TagDownloadInfo } from '../../model/tags.model'; +import { BehaviorSubject } from 'rxjs'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { AngularDeviceInformationService } from 'angular-device-information'; + +@Component({ + //standalone: true, + selector: 'loading-content', + templateUrl: './loading-content.component.html' +}) +export class LoadingContentComponent { + @Input() public show: boolean = true; +} diff --git a/rubberduckvba.client/src/app/model/tags.model.ts b/rubberduckvba.client/src/app/model/tags.model.ts index 678787f..6cc7ef3 100644 --- a/rubberduckvba.client/src/app/model/tags.model.ts +++ b/rubberduckvba.client/src/app/model/tags.model.ts @@ -9,8 +9,8 @@ export interface Tag { name: string; installerDownloadUrl: string; installerDownloads: number; - dateCreated: Date; - dateTimeUpdated: Date; + dateCreated: string; + dateTimeUpdated: string; isPreRelease: boolean; } diff --git a/rubberduckvba.client/src/app/routes/features/features.component.html b/rubberduckvba.client/src/app/routes/features/features.component.html index a9d49dc..4f53c4a 100644 --- a/rubberduckvba.client/src/app/routes/features/features.component.html +++ b/rubberduckvba.client/src/app/routes/features/features.component.html @@ -1,11 +1,4 @@ -
-
- Rubberduck logo -
-
-

loading...

-
-
+

Features

@@ -14,12 +7,18 @@

Features

-

Rubberduck takes inspiration from modern-day IDE features to bring the VBE into this century with game-changing tooling for all VBA programming skill levels. From helping Joe in Accounting with finding worksheets that have code behind them, to freelance veterans importing VBA code from source control repositories, or hobbyist programmers learning the ropes of OOP and unit testing in a language they're comfortable with - the VBE will never feel whole again without Rubberduck!

+

Rubberduck takes inspiration from modern-day IDE features to bring the VBE into this century with game-changing tooling for all skill levels.

-
- Rubberduck logo +
+
+ Rubberduck logo +
+
+ +
+

Your IDE is incomplete without...

diff --git a/rubberduckvba.client/src/app/routes/home/home.component.ts b/rubberduckvba.client/src/app/routes/home/home.component.ts index e590d1b..944d3cd 100644 --- a/rubberduckvba.client/src/app/routes/home/home.component.ts +++ b/rubberduckvba.client/src/app/routes/home/home.component.ts @@ -50,6 +50,6 @@ export class HomeComponent implements OnInit, OnChanges { } public get tagTimestamp(): string { - return this.main != null ? new Date(this.main.dateTimeUpdated).toISOString().replace('T', ' ') : ''; + return this.main != null ? this.main.dateTimeUpdated.replace('T', ' ') : ''; } } diff --git a/rubberduckvba.client/src/assets/__autocompletion.gif b/rubberduckvba.client/src/assets/__autocompletion.gif new file mode 100644 index 0000000000000000000000000000000000000000..12ba85f6a8490f5a604af0a7ad2c9e5b70bd6e84 GIT binary patch literal 50137 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 literal 0 HcmV?d00001 diff --git a/rubberduckvba.client/src/assets/autocompletion.gif b/rubberduckvba.client/src/assets/autocompletion.gif index 12ba85f6a8490f5a604af0a7ad2c9e5b70bd6e84..6b95c10417aa910362c24e4a9d44c3564378e41c 100644 GIT binary patch delta 10528 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 From abff618116e7950a564d01880bfae137141b8ce8 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Tue, 29 Oct 2024 22:22:22 -0400 Subject: [PATCH 03/11] fix env --- rubberduckvba.client/src/environments/environment.prod.ts | 2 +- rubberduckvba.client/src/environments/environment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rubberduckvba.client/src/environments/environment.prod.ts b/rubberduckvba.client/src/environments/environment.prod.ts index e95e3c7..26d101a 100644 --- a/rubberduckvba.client/src/environments/environment.prod.ts +++ b/rubberduckvba.client/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { production: true, - apiBaseUrl: 'https://localhost:44314/' + apiBaseUrl: 'https://test.api.rubberduckvba.com/' }; diff --git a/rubberduckvba.client/src/environments/environment.ts b/rubberduckvba.client/src/environments/environment.ts index 0fd806b..ddc0b2d 100644 --- a/rubberduckvba.client/src/environments/environment.ts +++ b/rubberduckvba.client/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiBaseUrl: 'https://localhost:44314/' + apiBaseUrl: 'https://test.api.rubberduckvba.com/' }; /* From 612934d1586377e2b7f73c1333c2a391ea103db3 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Wed, 30 Oct 2024 00:27:06 -0400 Subject: [PATCH 04/11] fixed markdown formatting --- .../Services/MarkdownFormattingService.cs | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/rubberduckvba.Server/Services/MarkdownFormattingService.cs b/rubberduckvba.Server/Services/MarkdownFormattingService.cs index 8a014bd..6139adc 100644 --- a/rubberduckvba.Server/Services/MarkdownFormattingService.cs +++ b/rubberduckvba.Server/Services/MarkdownFormattingService.cs @@ -11,6 +11,8 @@ public interface IMarkdownFormattingService public class MarkdownFormattingService(ISyntaxHighlighterService service) : IMarkdownFormattingService { + private static readonly Markdown _service = new(); + public async Task FormatMarkdownDocument(string content, bool withSyntaxHighlighting = false) { if (string.IsNullOrWhiteSpace(content)) @@ -19,14 +21,42 @@ public async Task FormatMarkdownDocument(string content, bool withSyntax } var markdown = content.Replace("\n", "\r\n"); + var html = string.Empty; + if (withSyntaxHighlighting) { markdown = await PreProcessMarkdownString(markdown); + + var lastSectionStart = markdown.LastIndexOf(""); + if (lastSectionStart > 0) + { + var sectionStart = 0; + while (sectionStart < lastSectionStart) + { + var sectionEnd = markdown.IndexOf("", sectionEnd) > 0 + ? markdown.IndexOf("", sectionEnd) + 8 + : lastSectionStart; + + var block = markdown.Substring(sectionEnd, sectionStart - sectionEnd).Replace("", "
"); + html += section + block; + } + } + } + else + { + html = _service.Transform(markdown); } - var html = new Markdown().Transform(markdown); var result = await PostProcessHtml(html); - return await Task.FromResult(result); } @@ -40,8 +70,8 @@ private async Task PreProcessMarkdownString(string content) { var code = await service.FormatAsync(node.InnerText); - node.Name = "div"; - node.EndNode.Name = "div"; + //node.Name = "div"; + //node.EndNode.Name = "div"; node.AddClass("vbe-mock-debugger"); node.InnerHtml = string.Empty; From c02b14b6a59910fcf3e8975a1fa304f9ca44241e Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Wed, 30 Oct 2024 00:30:41 -0400 Subject: [PATCH 05/11] fixed markdown formatting --- rubberduckvba.Server/Services/MarkdownFormattingService.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rubberduckvba.Server/Services/MarkdownFormattingService.cs b/rubberduckvba.Server/Services/MarkdownFormattingService.cs index 6139adc..85aa69a 100644 --- a/rubberduckvba.Server/Services/MarkdownFormattingService.cs +++ b/rubberduckvba.Server/Services/MarkdownFormattingService.cs @@ -50,6 +50,10 @@ public async Task FormatMarkdownDocument(string content, bool withSyntax html += section + block; } } + else + { + html = _service.Transform(markdown); + } } else { From 035f8563c37bbc3cf460cb6eb703281e0c6f0077 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Sun, 3 Nov 2024 10:21:05 -0500 Subject: [PATCH 06/11] moving dotnet-cd to self-hosted runner --- .github/workflows/dotnet-cd.yml | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/.github/workflows/dotnet-cd.yml b/.github/workflows/dotnet-cd.yml index c1a6fb3..68379b8 100644 --- a/.github/workflows/dotnet-cd.yml +++ b/.github/workflows/dotnet-cd.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: windows-latest + runs-on: self-hosted steps: - uses: actions/checkout@v4 @@ -29,31 +29,14 @@ jobs: - name: dotnet publish run: dotnet publish "rubberduckvba.Server\rubberduckvba.Server.csproj" --configuration Release --output ${{env.DOTNET_ROOT}}\pub - - name: Upload artifact for deployment job - uses: actions/upload-artifact@v4 - with: - name: webapi - path: ${{env.DOTNET_ROOT}}/pub - deploy: - environment: - name: AZ-Test - url: https://test.rubberduckvba.com - permissions: - contents: none - runs-on: windows-latest + runs-on: self-hosted needs: build steps: - - name: Download artifact from build job - uses: actions/download-artifact@v4 - with: - name: webapi - name: Deploy to IIS - id: deploy-to-iis - uses: ChristopheLav/iis-deploy@v1 - with: - website-name: 'api' - msdeploy-service-url: ${{ secrets.MSDEPLOY_URL }} - msdeploy-username: ${{ secrets.MSDEPLOY_USERNAME }} - msdeploy-password: ${{ secrets.MSDEPLOY_PASSWORD }} - source-path: ${{ github.workspace }}\website\publish + run: | + stop-webapppool rubberduckvba + stop-iissite -Name api -Confirm: $false + Copy-Item ${{env.DOTNET_ROOT}}\pub\* C:/inetpub/wwwroot -Recurse -Force + start-webapppool rubberduckvba + start-iissite api From 481d076b7d45ca179fb32b65f4a57feaf35b0c0c Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Wed, 6 Nov 2024 23:13:25 -0500 Subject: [PATCH 07/11] split featurexmldoc into separate tables, adjust everything accordingly --- .../Api/Admin/AdminController.cs | 12 +- .../Api/Auth/AuthController.cs | 2 +- .../Api/Auth/ClaimsPrincipalExtensions.cs | 4 +- .../Api/Downloads/AvailableDownload.cs | 4 +- .../Api/Downloads/DownloadsController.cs | 4 +- .../Api/Features/FeatureEditViewModel.cs | 12 +- .../Api/Features/FeatureOptionViewModel.cs | 2 +- .../Api/Features/FeatureViewModel.cs | 11 +- .../Api/Features/FeaturesController.cs | 47 +- .../Api/Features/RepositoryOptionViewModel.cs | 4 +- .../Api/Tags/LatestTagsViewModel.cs | 4 +- rubberduckvba.Server/Api/Tags/TagViewModel.cs | 4 +- .../Api/Tags/TagsController.cs | 4 +- .../InspectionDefaultConfig.cs | 2 +- .../Pipeline/Abstract/ActionBlockBase.cs | 5 +- .../Pipeline/Abstract/BroadcastBlockBase.cs | 5 +- .../Pipeline/Abstract/BufferBlockBase.cs | 5 +- .../Pipeline/Abstract/DataflowBlockBase.cs | 5 +- .../Pipeline/Abstract/DataflowJoinBlock.cs | 9 +- .../Abstract/ExecutionDataflowBlockBase.cs | 7 +- .../Pipeline/Abstract/IPipeline.cs | 2 +- .../Abstract/ISynchronizationPipeline.cs | 2 +- .../ISynchronizationPipelineFactory.cs | 2 +- .../Pipeline/Abstract/PipelineBase.cs | 5 +- .../Pipeline/Abstract/PipelineResult.cs | 2 +- .../Pipeline/Abstract/PipelineSection.cs | 5 +- .../SynchronizationPipelineFactory.cs | 20 +- .../Pipeline/Abstract/TransformBlockBase.cs | 5 +- .../Abstract/TransformManyBlockBase.cs | 7 +- .../Pipeline/PipelineLogger.cs | 2 +- .../Context/InitializeContextSection.cs | 8 +- .../Sections/Context/StagingContext.cs | 20 +- .../Pipeline/Sections/Context/SyncContext.cs | 56 +- .../SyncTags/AccumulateProcessedTagsBlock.cs | 9 +- .../SyncTags/AcquireDbMainTagGraphBlock.cs | 9 +- .../SyncTags/AcquireDbNextTagGraphBlock.cs | 9 +- .../SyncTags/BroadcastParametersBlock.cs | 5 +- .../Sections/SyncTags/BroadcastTagsBlock.cs | 5 +- .../Sections/SyncTags/GetTagAssetsBlock.cs | 9 +- .../SyncTags/LoadDbFeatureItemsBlock.cs | 27 +- .../SyncTags/LoadDbLatestTagsBlock.cs | 9 +- .../Sections/SyncTags/LoadFeaturesBlock.cs | 7 +- .../Sections/SyncTags/LoadGitHubTagsBlock.cs | 9 +- .../LoadInspectionDefaultConfigBlock.cs | 7 +- .../Sections/SyncTags/ReceiveRequestBlock.cs | 5 +- .../SyncTags/StreamGitHubOtherTagsBlock.cs | 7 +- .../SyncTags/StreamGitHubTagsBlock.cs | 7 +- .../Sections/SyncTags/SyncTagsSection.cs | 11 +- .../Sections/SyncTags/TagBufferBlock.cs | 7 +- .../Sections/SyncTags/TagExtensions.cs | 8 +- .../SyncXmldoc/AccumulateFeatureItemsBlock.cs | 7 +- .../AccumulateProcessedFeatureItemsBlock.cs | 25 +- .../SyncXmldoc/BroadcastLatestTagsBlock.cs | 7 +- .../SyncXmldoc/BroadcastTagAssetsBlock.cs | 7 +- .../SyncXmldoc/BroadcastXDocumentBlock.cs | 9 +- .../SyncXmldoc/BulkSaveStagingBlock.cs | 9 +- .../SyncXmldoc/DownloadXmlAssetBlock.cs | 7 +- .../SyncXmldoc/FeatureItemBufferBlock.cs | 11 +- .../SyncXmldoc/GetAnnotationNodesBlock.cs | 7 +- .../SyncXmldoc/GetInspectionNodesBlock.cs | 15 +- .../SyncXmldoc/GetQuickFixNodesBlock.cs | 9 +- .../Sections/SyncXmldoc/GetTagAssetBlock.cs | 7 +- .../SyncXmldoc/GetXElementInfoBlock.cs | 9 +- .../Sections/SyncXmldoc/LoadDbTagsBlock.cs | 11 +- .../Sections/SyncXmldoc/LoadFeaturesBlock.cs | 7 +- .../LoadInspectionDefaultConfigBlock.cs | 7 +- .../SyncXmldoc/MergeAnnotationsBlock.cs | 48 ++ .../SyncXmldoc/MergeFeatureItemsBlock.cs | 46 -- .../SyncXmldoc/MergeInspectionsBlock.cs | 48 ++ .../SyncXmldoc/MergeQuickFixesBlock.cs | 48 ++ .../ParseAnnotationXElementInfoBlock.cs | 20 +- .../ParseInspectionXElementInfoBlock.cs | 21 +- .../ParseQuickFixXElementInfoBlock.cs | 21 +- .../SyncXmldoc/StreamXmlAssetsBlock.cs | 7 +- .../Sections/SyncXmldoc/SyncXmldocSection.cs | 48 +- .../Sections/SyncXmldoc/XElementInfo.cs | 2 +- .../Pipeline/SynchronizeTagsPipeline.cs | 11 +- .../Pipeline/SynchronizeXmlPipeline.cs | 24 +- .../SyncRequestParameters.cs | 8 +- .../XmlDoc/Abstract/IXmlDocMerge.cs | 8 +- .../XmlDoc/Abstract/IXmlDocParser.cs | 9 +- .../XmlDoc/Abstract/XmlDocParserBase.cs | 45 +- .../XmlDoc/BeforeAndAfterCodeExample.cs | 11 +- .../XmlDoc/CodeAnalysisXmlDocParser.cs | 45 +- .../XmlDoc/ParsingXmlDocParser.cs | 26 +- .../XmlDoc/Schema/XmlDocSchema.cs | 2 +- .../XmlDoc/XmlDocAnnotation.cs | 178 ++-- .../XmlDoc/XmlDocInspection.cs | 74 +- .../XmlDoc/XmlDocMerge.cs | 80 +- .../XmlDoc/XmlDocQuickFix.cs | 80 +- .../Data/AnnotationsRepository.cs | 55 ++ rubberduckvba.Server/Data/DTO.cs | 44 - rubberduckvba.Server/Data/DataModel.cs | 162 ++-- .../Data/FeaturesRepository.cs | 65 ++ .../Data/InspectionsRepository.cs | 79 ++ .../Data/QuickFixRepository.cs | 78 ++ rubberduckvba.Server/Data/Repository.cs | 95 +++ .../Data/TagAssetsRepository.cs | 38 + rubberduckvba.Server/Data/TagsRepository.cs | 50 ++ .../GitHubAuthenticationHandler.cs | 8 +- rubberduckvba.Server/GitHubSettings.cs | 2 +- .../Hangfire/DockerDashboardFilter.cs | 2 +- .../Hangfire/HangfireConstants.cs | 2 +- .../Hangfire/QueuedUpdateOrchestrator.cs | 15 +- rubberduckvba.Server/Model/Annotation.cs | 46 ++ .../Model/AnnotationParameter.cs | 9 + .../Model/Entity/AnnotationEntity.cs | 11 + rubberduckvba.Server/Model/Entity/Entity.cs | 9 + .../Model/Entity/FeatureEntity.cs | 13 + .../Model/Entity/InspectionEntity.cs | 20 + .../Model/Entity/QuickFixEntity.cs | 20 + .../Model/Entity/TagAssetEntity.cs | 7 + .../Model/Entity/TagEntity.cs | 10 + rubberduckvba.Server/Model/Example.cs | 33 + rubberduckvba.Server/Model/ExampleModule.cs | 26 + .../Model/ExampleModuleType.cs | 15 + rubberduckvba.Server/Model/Feature.cs | 65 ++ rubberduckvba.Server/Model/Inspection.cs | 93 +++ rubberduckvba.Server/Model/QuickFix.cs | 73 ++ rubberduckvba.Server/Model/Tag.cs | 54 ++ rubberduckvba.Server/Model/TagAsset.cs | 33 + rubberduckvba.Server/Program.cs | 20 +- .../Services/ContentCacheService.cs | 2 +- .../Services/DateTimeExtensions.cs | 2 +- .../Services/DistributedCacheService.cs | 2 +- .../Services/GitHubClientService.cs | 45 +- .../Services/IContentOrchestrator.cs | 4 +- .../InstallerDownloadStatsOrchestrator.cs | 8 +- .../Services/MarkdownFormattingService.cs | 2 +- .../Services/RubberduckDbService.cs | 763 +++++------------- .../Services/ServiceLogger.cs | 2 +- .../Services/XmldocContentOrchestrator.cs | 8 +- .../Services/rubberduckdb/FeatureServices.cs | 62 ++ .../Services/rubberduckdb/TagServices.cs | 91 +++ .../feature-box/feature-box.component.html | 26 +- .../feature-info/feature-info.component.html | 8 +- .../src/app/model/feature.model.ts | 2 + rubberduckvba.client/src/styles.css | 5 +- rubberduckvba.database/Tables/Annotations.sql | 17 + .../Tables/FeatureXmlDoc.sql | 19 - rubberduckvba.database/Tables/Inspections.sql | 23 + rubberduckvba.database/Tables/QuickFixes.sql | 23 + .../rubberduckvba.database.sqlproj | 4 +- 143 files changed, 2425 insertions(+), 1447 deletions(-) create mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs delete mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeFeatureItemsBlock.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs create mode 100644 rubberduckvba.Server/Data/AnnotationsRepository.cs delete mode 100644 rubberduckvba.Server/Data/DTO.cs create mode 100644 rubberduckvba.Server/Data/FeaturesRepository.cs create mode 100644 rubberduckvba.Server/Data/InspectionsRepository.cs create mode 100644 rubberduckvba.Server/Data/QuickFixRepository.cs create mode 100644 rubberduckvba.Server/Data/Repository.cs create mode 100644 rubberduckvba.Server/Data/TagAssetsRepository.cs create mode 100644 rubberduckvba.Server/Data/TagsRepository.cs create mode 100644 rubberduckvba.Server/Model/Annotation.cs create mode 100644 rubberduckvba.Server/Model/AnnotationParameter.cs create mode 100644 rubberduckvba.Server/Model/Entity/AnnotationEntity.cs create mode 100644 rubberduckvba.Server/Model/Entity/Entity.cs create mode 100644 rubberduckvba.Server/Model/Entity/FeatureEntity.cs create mode 100644 rubberduckvba.Server/Model/Entity/InspectionEntity.cs create mode 100644 rubberduckvba.Server/Model/Entity/QuickFixEntity.cs create mode 100644 rubberduckvba.Server/Model/Entity/TagAssetEntity.cs create mode 100644 rubberduckvba.Server/Model/Entity/TagEntity.cs create mode 100644 rubberduckvba.Server/Model/Example.cs create mode 100644 rubberduckvba.Server/Model/ExampleModule.cs create mode 100644 rubberduckvba.Server/Model/ExampleModuleType.cs create mode 100644 rubberduckvba.Server/Model/Feature.cs create mode 100644 rubberduckvba.Server/Model/Inspection.cs create mode 100644 rubberduckvba.Server/Model/QuickFix.cs create mode 100644 rubberduckvba.Server/Model/Tag.cs create mode 100644 rubberduckvba.Server/Model/TagAsset.cs create mode 100644 rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs create mode 100644 rubberduckvba.Server/Services/rubberduckdb/TagServices.cs create mode 100644 rubberduckvba.database/Tables/Annotations.sql delete mode 100644 rubberduckvba.database/Tables/FeatureXmlDoc.sql create mode 100644 rubberduckvba.database/Tables/Inspections.sql create mode 100644 rubberduckvba.database/Tables/QuickFixes.sql diff --git a/rubberduckvba.Server/Api/Admin/AdminController.cs b/rubberduckvba.Server/Api/Admin/AdminController.cs index 16406db..26261aa 100644 --- a/rubberduckvba.Server/Api/Admin/AdminController.cs +++ b/rubberduckvba.Server/Api/Admin/AdminController.cs @@ -2,10 +2,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; -using rubberduckvba.com.Server.ContentSynchronization; -using rubberduckvba.com.Server.Hangfire; +using rubberduckvba.Server; +using rubberduckvba.Server.ContentSynchronization; +using rubberduckvba.Server.Hangfire; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.Api.Admin; +namespace rubberduckvba.Server.Api.Admin; [Authorize("github")] @@ -20,7 +22,7 @@ public class AdminController(ConfigurationOptions options, IBackgroundJobClient [HttpPost("admin/update/xmldoc")] public async ValueTask UpdateXmldocContent() { - var parameters = new XmldocSyncRequestParameters { RepositoryId = Services.RepositoryId.Rubberduck, RequestId = Guid.NewGuid() }; + var parameters = new XmldocSyncRequestParameters { RepositoryId = RepositoryId.Rubberduck, RequestId = Guid.NewGuid() }; var jobId = backgroundJob.Enqueue(HangfireConstants.ManualQueueName, () => QueuedUpdateOrchestrator.UpdateXmldocContent(parameters, null!)); logger.LogInformation("JobId {jobId} was enqueued (queue: {queueName}) for xmldoc sync request {requestId}", jobId, HangfireConstants.ManualQueueName, parameters.RequestId); @@ -35,7 +37,7 @@ public async ValueTask UpdateXmldocContent() [HttpPost("admin/update/tags")] public async ValueTask UpdateTagMetadata() { - var parameters = new TagSyncRequestParameters { RepositoryId = Services.RepositoryId.Rubberduck, RequestId = Guid.NewGuid() }; + var parameters = new TagSyncRequestParameters { RepositoryId = RepositoryId.Rubberduck, RequestId = Guid.NewGuid() }; var jobId = backgroundJob.Enqueue(HangfireConstants.ManualQueueName, () => QueuedUpdateOrchestrator.UpdateInstallerDownloadStats(parameters, null!)); logger.LogInformation("JobId {jobId} was enqueued (queue: {queueName}) for tag sync request {requestId}", jobId, HangfireConstants.ManualQueueName, parameters.RequestId); diff --git a/rubberduckvba.Server/Api/Auth/AuthController.cs b/rubberduckvba.Server/Api/Auth/AuthController.cs index 92ef276..10c8c3d 100644 --- a/rubberduckvba.Server/Api/Auth/AuthController.cs +++ b/rubberduckvba.Server/Api/Auth/AuthController.cs @@ -6,7 +6,7 @@ using System.Security.Claims; using System.Text; -namespace rubberduckvba.com.Server.Api.Auth; +namespace rubberduckvba.Server.Api.Auth; public record class UserViewModel { diff --git a/rubberduckvba.Server/Api/Auth/ClaimsPrincipalExtensions.cs b/rubberduckvba.Server/Api/Auth/ClaimsPrincipalExtensions.cs index 42d63d9..076c126 100644 --- a/rubberduckvba.Server/Api/Auth/ClaimsPrincipalExtensions.cs +++ b/rubberduckvba.Server/Api/Auth/ClaimsPrincipalExtensions.cs @@ -3,14 +3,14 @@ using System.Security.Claims; using System.Text; -namespace rubberduckvba.com.Server.Api.Auth; +namespace rubberduckvba.Server.Api.Auth; public static class ClaimsPrincipalExtensions { public static string AsJWT(this ClaimsPrincipal principal, string secret, string issuer, string audience) { var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(secret)); - var token = new JwtSecurityToken(issuer, audience, + var token = new JwtSecurityToken(issuer, audience, claims: principal?.Claims, notBefore: new DateTimeOffset(DateTime.UtcNow).UtcDateTime, expires: new DateTimeOffset(DateTime.UtcNow.AddMinutes(60)).UtcDateTime, diff --git a/rubberduckvba.Server/Api/Downloads/AvailableDownload.cs b/rubberduckvba.Server/Api/Downloads/AvailableDownload.cs index 5b4b5b5..abe2cc9 100644 --- a/rubberduckvba.Server/Api/Downloads/AvailableDownload.cs +++ b/rubberduckvba.Server/Api/Downloads/AvailableDownload.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.Api.Downloads; +namespace rubberduckvba.Server.Api.Downloads; public record class AvailableDownload { diff --git a/rubberduckvba.Server/Api/Downloads/DownloadsController.cs b/rubberduckvba.Server/Api/Downloads/DownloadsController.cs index 0976f59..3a69fc1 100644 --- a/rubberduckvba.Server/Api/Downloads/DownloadsController.cs +++ b/rubberduckvba.Server/Api/Downloads/DownloadsController.cs @@ -1,9 +1,9 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Services; using System.Collections.Immutable; -namespace rubberduckvba.com.Server.Api.Downloads; +namespace rubberduckvba.Server.Api.Downloads; [ApiController] diff --git a/rubberduckvba.Server/Api/Features/FeatureEditViewModel.cs b/rubberduckvba.Server/Api/Features/FeatureEditViewModel.cs index c6b0173..38707d5 100644 --- a/rubberduckvba.Server/Api/Features/FeatureEditViewModel.cs +++ b/rubberduckvba.Server/Api/Features/FeatureEditViewModel.cs @@ -1,7 +1,7 @@ -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.Api.Features; +namespace rubberduckvba.Server.Api.Features; public class FeatureEditViewModel { @@ -30,7 +30,7 @@ public Feature ToFeature() { Id = Id ?? default, ParentId = ParentId, - RepositoryId = (int)RepositoryId, + RepositoryId = RepositoryId, Name = Name, Title = Title, ShortDescription = ShortDescription, @@ -44,8 +44,8 @@ public FeatureEditViewModel(Feature model, FeatureOptionViewModel[] features, Re { Id = model.Id; ParentId = model.ParentId; - RepositoryId = (RepositoryId)model.RepositoryId; - + RepositoryId = model.RepositoryId; + Name = model.Name; Title = model.Title; ShortDescription = model.ShortDescription; diff --git a/rubberduckvba.Server/Api/Features/FeatureOptionViewModel.cs b/rubberduckvba.Server/Api/Features/FeatureOptionViewModel.cs index 968ef86..99ebc75 100644 --- a/rubberduckvba.Server/Api/Features/FeatureOptionViewModel.cs +++ b/rubberduckvba.Server/Api/Features/FeatureOptionViewModel.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.Api.Features; +namespace rubberduckvba.Server.Api.Features; public class FeatureOptionViewModel { diff --git a/rubberduckvba.Server/Api/Features/FeatureViewModel.cs b/rubberduckvba.Server/Api/Features/FeatureViewModel.cs index 8a51a6c..6211158 100644 --- a/rubberduckvba.Server/Api/Features/FeatureViewModel.cs +++ b/rubberduckvba.Server/Api/Features/FeatureViewModel.cs @@ -1,7 +1,6 @@ -using rubberduckvba.com.Server.Data; -using System.Text.Json; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.Api.Features; +namespace rubberduckvba.Server.Api.Features; public class FeatureViewModel { @@ -26,8 +25,7 @@ public FeatureViewModel(Feature model) FeatureTitle = graph.ParentTitle; Features = graph.Features.Select(e => new FeatureViewModel(e)).ToArray(); - Items = graph.Items.Select(e => e with { FeatureId = graph.ParentId!.Value, FeatureName = graph.ParentName, FeatureTitle = graph.ParentTitle }).ToArray(); - Inspections = graph.Items.Select(e => JsonSerializer.Deserialize(e.Serialized)!).ToArray(); + Inspections = graph.Inspections.ToArray(); } } @@ -48,8 +46,7 @@ public FeatureViewModel(Feature model) public bool HasImage { get; init; } public FeatureViewModel[] Features { get; init; } = []; - public FeatureXmlDoc[] Items { get; init; } = []; - public XmlDocInspectionInfo[] Inspections { get; init; } = []; + public Inspection[] Inspections { get; init; } = []; // InspectionViewModel[] } public class FeatureXmlDocViewModel diff --git a/rubberduckvba.Server/Api/Features/FeaturesController.cs b/rubberduckvba.Server/Api/Features/FeaturesController.cs index 0a39ef9..5fe7258 100644 --- a/rubberduckvba.Server/Api/Features/FeaturesController.cs +++ b/rubberduckvba.Server/Api/Features/FeaturesController.cs @@ -1,13 +1,11 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; using System.ComponentModel; using System.Reflection; -using System.Text.Json; -namespace rubberduckvba.com.Server.Api.Features; +namespace rubberduckvba.Server.Api.Features; public record class MarkdownFormattingRequestViewModel { @@ -81,42 +79,9 @@ public async Task> Info([FromRoute] string name) ShortDescription = md.FormatMarkdownDocument(subFeature.ShortDescription).ConfigureAwait(false).GetAwaiter().GetResult() }).ToArray(), - Inspections = feature.Items.Select(item => - { - var info = JsonSerializer.Deserialize(item.Serialized)!; - return new XmlDocInspectionInfo - { - Id = item.Id, - DateTimeInserted = item.DateTimeInserted, - DateTimeUpdated = item.DateTimeUpdated, - IsDiscontinued = item.IsDiscontinued, - IsHidden = item.IsHidden, - IsNew = item.IsNew, - Name = item.Name, - Title = item.Title, - SourceUrl = item.SourceUrl, - - FeatureId = feature.Id, - FeatureName = feature.Name, - FeatureTitle = feature.Title, - - Summary = info.Summary, - Reasoning = info.Reasoning, - Remarks = info.Remarks, - HostApp = info.HostApp, - References = info.References, - InspectionType = info.InspectionType, - DefaultSeverity = info.DefaultSeverity, - QuickFixes = info.QuickFixes, - Serialized = item.Serialized, - Examples = info.Examples.Select(e => e with - { - Modules = e.Modules.Select(module => module with { ModuleTypeName = _moduleTypeNames[module.ModuleType.ToString()] }).ToList() - }).ToList() ?? [] - }; - }).ToArray(), - - //Items = feature.Items + Inspections = feature.Inspections, + QuickFixes = feature.QuickFixes, + Annotations = feature.Annotations, }); //cache.Write(HttpContext.Request.Path, model); diff --git a/rubberduckvba.Server/Api/Features/RepositoryOptionViewModel.cs b/rubberduckvba.Server/Api/Features/RepositoryOptionViewModel.cs index 016fd97..906c185 100644 --- a/rubberduckvba.Server/Api/Features/RepositoryOptionViewModel.cs +++ b/rubberduckvba.Server/Api/Features/RepositoryOptionViewModel.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.Api.Features; +namespace rubberduckvba.Server.Api.Features; public class RepositoryOptionViewModel { diff --git a/rubberduckvba.Server/Api/Tags/LatestTagsViewModel.cs b/rubberduckvba.Server/Api/Tags/LatestTagsViewModel.cs index 98cbe59..1438d04 100644 --- a/rubberduckvba.Server/Api/Tags/LatestTagsViewModel.cs +++ b/rubberduckvba.Server/Api/Tags/LatestTagsViewModel.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.Api.Tags; +namespace rubberduckvba.Server.Api.Tags; public record struct LatestTagsViewModel { diff --git a/rubberduckvba.Server/Api/Tags/TagViewModel.cs b/rubberduckvba.Server/Api/Tags/TagViewModel.cs index 01591b5..30794c9 100644 --- a/rubberduckvba.Server/Api/Tags/TagViewModel.cs +++ b/rubberduckvba.Server/Api/Tags/TagViewModel.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.Api.Tags; +namespace rubberduckvba.Server.Api.Tags; public record struct TagViewModel { diff --git a/rubberduckvba.Server/Api/Tags/TagsController.cs b/rubberduckvba.Server/Api/Tags/TagsController.cs index 37922eb..2302514 100644 --- a/rubberduckvba.Server/Api/Tags/TagsController.cs +++ b/rubberduckvba.Server/Api/Tags/TagsController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.Api.Tags; +namespace rubberduckvba.Server.Api.Tags; [ApiController] diff --git a/rubberduckvba.Server/ContentSynchronization/InspectionDefaultConfig.cs b/rubberduckvba.Server/ContentSynchronization/InspectionDefaultConfig.cs index 4517d4b..27a21a1 100644 --- a/rubberduckvba.Server/ContentSynchronization/InspectionDefaultConfig.cs +++ b/rubberduckvba.Server/ContentSynchronization/InspectionDefaultConfig.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.ContentSynchronization; +namespace rubberduckvba.Server.ContentSynchronization; /// /// Encapsulates the inspection type and default severity setting override for an inspection. diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ActionBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ActionBlockBase.cs index e383a87..1409176 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ActionBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ActionBlockBase.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class ActionBlockBase : ExecutionDataflowBlockBase, TInput, TContext> where TContext : IPipelineContext diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BroadcastBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BroadcastBlockBase.cs index 06f0e26..463368b 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BroadcastBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BroadcastBlockBase.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class BroadcastBlockBase : ExecutionDataflowBlockBase, TInput, TContext> where TContext : IPipelineContext diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BufferBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BufferBlockBase.cs index 40e9dbf..31bd8ea 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BufferBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/BufferBlockBase.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class BufferBlockBase : ExecutionDataflowBlockBase, TInput, TContext> where TContext : IPipelineContext diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowBlockBase.cs index 4a90b50..55f6f68 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowBlockBase.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public interface ISectionBlock where TContext : IPipelineContext diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs index 020b859..6212d48 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs @@ -1,12 +1,13 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; -public class DataflowJoinBlock : DataflowBlockBase, SyncContext>, IDisposable +public class DataflowJoinBlock : DataflowBlockBase, SyncContext>, IDisposable { private readonly ICollection _links = []; - public DataflowJoinBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, string name) + public DataflowJoinBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, string name) : base(parent, tokenSource, logger) { Name = name; diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs index 6e8bc81..1fcb11f 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs @@ -1,7 +1,8 @@ -using System.Diagnostics; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Diagnostics; using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class ExecutionDataflowBlockBase : DataflowBlockBase, IDisposable where TBlock : class, IDataflowBlock, ITargetBlock @@ -123,7 +124,7 @@ protected void LinkToSources(params ISourceBlock[] sources) if (sources != null && sources.Length > 0) { var propagate = sources.Count() == 1; - + foreach (var source in sources) { var propagateSourceCompletion = propagate diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/IPipeline.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/IPipeline.cs index 693e844..b753f5c 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/IPipeline.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/IPipeline.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public interface IPipeline { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipeline.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipeline.cs index fa5cb16..7bc8c94 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipeline.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipeline.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public interface ISynchronizationPipeline : IPipeline where TContext : class diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipelineFactory.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipelineFactory.cs index d89ed05..f115f4d 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipelineFactory.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ISynchronizationPipelineFactory.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public interface ISynchronizationPipelineFactory where TContext : class diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineBase.cs index 85830c2..ba3ccc4 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineBase.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class PipelineBase : IDisposable, IPipeline where TContext : IPipelineContext diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineResult.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineResult.cs index 5084ad3..361f339 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineResult.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineResult.cs @@ -1,6 +1,6 @@ using System.Collections.Concurrent; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public class PipelineResult : IPipelineResult { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs index 13b0b31..6e5524e 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public interface IPipelineResult { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs index 01ae599..cbe73ad 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs @@ -1,8 +1,11 @@ using Hangfire; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model.Entity; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public class SynchronizationPipelineFactory : ISynchronizationPipelineFactory { @@ -12,8 +15,12 @@ public class SynchronizationPipelineFactory : ISynchronizationPipelineFactory _inspections; + private readonly IRepository _quickfixes; + private readonly IRepository _annotations; - public SynchronizationPipelineFactory(ILogger logger, IRubberduckDbService content, IGitHubClientService github, IXmlDocMerge merge, IStagingServices staging, IMarkdownFormattingService markdown) + public SynchronizationPipelineFactory(ILogger logger, IRubberduckDbService content, IGitHubClientService github, IXmlDocMerge merge, IStagingServices staging, IMarkdownFormattingService markdown, + IRepository inspections, IRepository quickfixes, IRepository annotations) { _logger = logger; _content = content; @@ -21,13 +28,16 @@ public SynchronizationPipelineFactory(ILogger logger, IRubberduc _merge = merge; _staging = staging; _markdown = markdown; + _inspections = inspections; + _quickfixes = quickfixes; + _annotations = annotations; } public ISynchronizationPipeline Create(TParameters parameters, CancellationTokenSource tokenSource) where TParameters : IRequestParameters { return parameters switch { - XmldocSyncRequestParameters => new SynchronizeXmlPipeline(parameters, _logger, _content, _github, _merge, _staging, _markdown, tokenSource), + XmldocSyncRequestParameters => new SynchronizeXmlPipeline(parameters, _logger, _content, _github, _merge, _staging, _markdown, tokenSource, _inspections, _quickfixes, _annotations), TagSyncRequestParameters => new SynchronizeTagsPipeline(parameters, _logger, _content, _github, _merge, _staging, tokenSource), _ => throw new NotSupportedException(), }; diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformBlockBase.cs index b41f590..0e44521 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformBlockBase.cs @@ -1,6 +1,7 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class TransformBlockBase : ExecutionDataflowBlockBase, TInput, TContext> where TContext : IPipelineContext diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformManyBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformManyBlockBase.cs index af9e971..512cba0 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformManyBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/TransformManyBlockBase.cs @@ -1,12 +1,13 @@ -using System.Threading.Tasks.Dataflow; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; public abstract class TransformManyBlockBase : ExecutionDataflowBlockBase, TInput, TContext> where TContext : IPipelineContext { protected TransformManyBlockBase(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) - : base(parent, tokenSource, logger) + : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/PipelineLogger.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/PipelineLogger.cs index f94a8db..6ed7f74 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/PipelineLogger.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/PipelineLogger.cs @@ -1,3 +1,3 @@ -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline; public class PipelineLogger { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/InitializeContextSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/InitializeContextSection.cs index d49d1a8..d494ac6 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/InitializeContextSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/InitializeContextSection.cs @@ -1,12 +1,12 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; public class InitializeContextSection : PipelineSection { - public InitializeContextSection(IPipeline parent, CancellationTokenSource tokenSource, ILogger logger) + public InitializeContextSection(IPipeline parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { ReceiveRequest = new ReceiveRequestBlock(this, tokenSource, logger); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs index 56f913c..e6e2301 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs @@ -1,7 +1,7 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; using System.Collections.Concurrent; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; public class StagingContext { @@ -16,7 +16,17 @@ public StagingContext(SyncRequestParameters parameters) public ICollection NewTags { get; set; } = []; public ICollection UpdatedTags { get; set; } = []; - public ConcurrentBag ProcessedFeatureItems { get; } = []; - public ICollection NewFeatureItems { get; set; } = []; - public ICollection UpdatedFeatureItems { get; set; } = []; + public ConcurrentBag ProcessedFeatureItems { get; } = []; + public ICollection NewFeatureItems { get; set; } = []; + public ICollection UpdatedFeatureItems { get; set; } = []; + + + public IEnumerable NewInspections { get; set; } = []; + public IEnumerable UpdatedInspections { get; set; } = []; + + public IEnumerable NewQuickFixes { get; set; } = []; + public IEnumerable UpdatedQuickFixes { get; set; } = []; + + public IEnumerable NewAnnotations { get; set; } = []; + public IEnumerable UpdatedAnnotations { get; set; } = []; } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs index 18925e3..991fd46 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs @@ -1,7 +1,7 @@ -using System.Collections.Immutable; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; +using System.Collections.Immutable; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; public interface IPipelineContext { @@ -17,11 +17,10 @@ public SyncContext(IRequestParameters parameters) private IRequestParameters? _parameters; public IRequestParameters Parameters => ContextNotInitializedException.ThrowIfNull(_parameters); - IRequestParameters IPipelineContext.Parameters => Parameters; + IRequestParameters IPipelineContext.Parameters => Parameters; public void LoadParameters(SyncRequestParameters parameters) { InvalidContextParameterException.ThrowIfNull(nameof(parameters), parameters); - //ContextAlreadyInitializedException.ThrowIfNotNull(_parameters); _parameters = parameters; _staging = new StagingContext(parameters); } @@ -31,7 +30,7 @@ public void LoadParameters(SyncRequestParameters parameters) private TagGraph? _main; - public TagGraph RubberduckDbMain + public TagGraph RubberduckDbMain => ContextNotInitializedException.ThrowIfNull(_main); public void LoadRubberduckDbMain(TagGraph main) @@ -42,7 +41,7 @@ public void LoadRubberduckDbMain(TagGraph main) } private TagGraph? _next; - public TagGraph RubberduckDbNext + public TagGraph RubberduckDbNext => ContextNotInitializedException.ThrowIfNull(_next); public void LoadRubberduckDbNext(TagGraph next) @@ -67,7 +66,7 @@ public void LoadDbTags(IEnumerable tags) } private ImmutableDictionary? _inspectionConfig; - public ImmutableDictionary InspectionDefaultConfig + public ImmutableDictionary InspectionDefaultConfig => ContextNotInitializedException.ThrowIfNull(_inspectionConfig); public void LoadInspectionDefaultConfig(IEnumerable config) { @@ -76,21 +75,42 @@ public void LoadInspectionDefaultConfig(IEnumerable con _inspectionConfig = config.ToImmutableDictionary(e => e.InspectionName); } - private ImmutableHashSet? _featureItems; - public ImmutableHashSet FeatureItems - => ContextNotInitializedException.ThrowIfNull(_featureItems); + private ImmutableHashSet? _inspections; + public ImmutableHashSet Inspections + => ContextNotInitializedException.ThrowIfNull(_inspections); - public void LoadFeatureItems(IEnumerable items) + private ImmutableHashSet? _quickfixes; + public ImmutableHashSet Quickfixes + => ContextNotInitializedException.ThrowIfNull(_quickfixes); + + private ImmutableHashSet? _annotations; + public ImmutableHashSet Annotations + => ContextNotInitializedException.ThrowIfNull(_annotations); + + + public void LoadInspections(IEnumerable inspections) + { + ContextAlreadyInitializedException.ThrowIfNotNull(_inspections); + _inspections = inspections.ToImmutableHashSet(); + } + + public void LoadQuickFixes(IEnumerable quickfixes) + { + ContextAlreadyInitializedException.ThrowIfNotNull(_quickfixes); + _quickfixes = quickfixes.ToImmutableHashSet(); + } + + public void LoadAnnotations(IEnumerable annotations) { - ContextAlreadyInitializedException.ThrowIfNotNull(_featureItems); - _featureItems = items.ToImmutableHashSet(); + ContextAlreadyInitializedException.ThrowIfNotNull(_annotations); + _annotations = annotations.ToImmutableHashSet(); } private TagGraph? _githubMain; private TagGraph? _githubNext; private ImmutableHashSet? _githubOthers; - public TagGraph GitHubMain + public TagGraph GitHubMain => ContextNotInitializedException.ThrowIfNull(_githubMain); public TagGraph GitHubNext => ContextNotInitializedException.ThrowIfNull(_githubNext); @@ -142,12 +162,12 @@ public static void ThrowIfNullOrEmpty(string paramName, IEnumerable values } } - private InvalidContextParameterException(string paramName, string message) - : base(paramName, message) + private InvalidContextParameterException(string paramName, string message) + : base(paramName, message) { } } -public class ContextNotInitializedException : InvalidOperationException +public class ContextNotInitializedException : InvalidOperationException { public static T ThrowIfNull(T? value) => value ?? throw new ContextNotInitializedException(); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs index 528c951..7d0cf07 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class AccumulateProcessedTagsBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbMainTagGraphBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbMainTagGraphBlock.cs index d4b5cdf..ad7fe23 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbMainTagGraphBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbMainTagGraphBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class AcquireDbMainTagGraphBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbNextTagGraphBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbNextTagGraphBlock.cs index 97989fd..e492f47 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbNextTagGraphBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AcquireDbNextTagGraphBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class AcquireDbNextTagGraphBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastParametersBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastParametersBlock.cs index 4ac09ea..838f15d 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastParametersBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastParametersBlock.cs @@ -1,6 +1,7 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class BroadcastParametersBlock : BroadcastBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastTagsBlock.cs index b09fada..4793a84 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/BroadcastTagsBlock.cs @@ -1,6 +1,7 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class BroadcastTagsBlock : BroadcastBlockBase, SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/GetTagAssetsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/GetTagAssetsBlock.cs index 25871e0..b6a5f8b 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/GetTagAssetsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/GetTagAssetsBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class GetTagAssetsBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbFeatureItemsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbFeatureItemsBlock.cs index 3bb489f..1d6eaeb 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbFeatureItemsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbFeatureItemsBlock.cs @@ -1,21 +1,34 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Model.Entity; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class LoadDbFeatureItemsBlock : ActionBlockBase { private IRubberduckDbService _db; + private readonly IRepository _inspections; + private readonly IRepository _quickfixes; + private readonly IRepository _annotations; - public LoadDbFeatureItemsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, IRubberduckDbService db) + public LoadDbFeatureItemsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, + IRepository inspections, IRepository quickfixes, IRepository annotations) : base(parent, tokenSource, logger) { - _db = db; + _inspections = inspections; + _quickfixes = quickfixes; + _annotations = annotations; } protected override async Task ActionAsync(SyncRequestParameters input) { - var items = await _db.GetXmlDocFeaturesAsync(input.RepositoryId); - Context.LoadFeatureItems(items); + await Task.WhenAll([ + Task.Run(() => _inspections.GetAll()).ContinueWith(t => Context.LoadInspections(t.Result.Select(e => new Inspection(e)))), + Task.Run(() => _quickfixes.GetAll()).ContinueWith(t => Context.LoadQuickFixes(t.Result.Select(e => new QuickFix(e)))), + Task.Run(() => _annotations.GetAll()).ContinueWith(t => Context.LoadAnnotations(t.Result.Select(e => new Annotation(e)))) + ]); } } \ No newline at end of file diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbLatestTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbLatestTagsBlock.cs index 2e3fc39..ef5a082 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbLatestTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadDbLatestTagsBlock.cs @@ -1,11 +1,12 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class LoadDbLatestTagsBlock : TransformBlockBase, SyncContext, SyncContext> { - public LoadDbLatestTagsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public LoadDbLatestTagsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadFeaturesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadFeaturesBlock.cs index afde93c..796bd47 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadFeaturesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadFeaturesBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class LoadFeaturesBlock : ActionBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadGitHubTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadGitHubTagsBlock.cs index b1fc654..d9dfc63 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadGitHubTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadGitHubTagsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class LoadGitHubTagsBlock : TransformBlockBase { @@ -17,7 +18,7 @@ public override async Task TransformAsync(SyncRequestParameters inp { var githubTags = await _github.GetAllTagsAsync(); // does not get the assets var (gitHubMain, gitHubNext, gitHubOthers) = githubTags.GetLatestTags(); - + Context.LoadGitHubTags(gitHubMain, gitHubNext, gitHubOthers); return Context; } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadInspectionDefaultConfigBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadInspectionDefaultConfigBlock.cs index 6109009..14aac87 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadInspectionDefaultConfigBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/LoadInspectionDefaultConfigBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class LoadInspectionDefaultConfigBlock : ActionBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/ReceiveRequestBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/ReceiveRequestBlock.cs index 9840085..7077e58 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/ReceiveRequestBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/ReceiveRequestBlock.cs @@ -1,6 +1,7 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class ReceiveRequestBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubOtherTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubOtherTagsBlock.cs index 057f3e1..fffac39 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubOtherTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubOtherTagsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class StreamGitHubOtherTagsBlock : TransformManyBlockBase, TagGraph, SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubTagsBlock.cs index ec9d6ff..4f4ebfb 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/StreamGitHubTagsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class StreamGitHubTagsBlock : TransformManyBlockBase, TagGraph, SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs index cdc603a..0059209 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs @@ -1,9 +1,10 @@ -using System.Threading.Tasks.Dataflow; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class SyncTagsSection : PipelineSection { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagBufferBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagBufferBlock.cs index 1562a9b..b35964b 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagBufferBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagBufferBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public class TagBufferBlock : BufferBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagExtensions.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagExtensions.cs index 22ebf9f..61a3da0 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagExtensions.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/TagExtensions.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; public static class TagExtensions { @@ -9,9 +9,9 @@ public static (TagGraph main, TagGraph next, IEnumerable others) GetLa var sortedTags = tags.OrderByDescending(tag => tag.DateCreated) .GroupBy(tag => tag.IsPreRelease) .ToDictionary(grouping => grouping.Key, grouping => grouping.AsEnumerable()); - + return ( - sortedTags[false].First(), + sortedTags[false].First(), sortedTags[true].First(), sortedTags[false].Skip(1).Concat(sortedTags[true].Skip(1).ToArray()) ); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs index 200a4fe..b8a9aa3 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Data; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class AccumulateFeatureItemsBlock : ActionBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs index fbe291b..b18a143 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Data; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class AccumulateProcessedFeatureItemsBlock : ActionBlockBase { @@ -14,15 +15,15 @@ protected override void Action(FeatureXmlDoc input) { if (input != null) { - foreach (var featureItem in input.Examples.GroupBy(e => e.FeatureItemId)) - { - var exampleNumber = 1; - foreach (var example in featureItem) - { - example.SortOrder = exampleNumber; - exampleNumber++; - } - } + //foreach (var featureItem in input.Examples.GroupBy(e => e)) + //{ + // var exampleNumber = 1; + // foreach (var example in featureItem) + // { + // example.SortOrder = exampleNumber; + // exampleNumber++; + // } + //} Context.StagingContext.ProcessedFeatureItems.Add(input); } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs index c1f5fed..eb39169 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class BroadcastLatestTagsBlock : TransformManyBlockBase, TagGraph, SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs index c831c83..862c16f 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class BroadcastTagAssetsBlock : TransformManyBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastXDocumentBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastXDocumentBlock.cs index 0fc6f6c..0325955 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastXDocumentBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastXDocumentBlock.cs @@ -1,8 +1,9 @@ -using System.Xml.Linq; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class BroadcastXDocumentBlock : BroadcastBlockBase<(TagAsset, XDocument), SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs index f40d921..664c43f 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class BulkSaveStagingBlock : ActionBlockBase, SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs index 6ff3d26..d17bc71 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class DownloadXmlAssetBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs index 9e254ed..e65a415 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs @@ -1,10 +1,11 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Data; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class FeatureItemBufferBlock : BufferBlockBase { - public FeatureItemBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) - : base(parent, tokenSource, logger){ } + public FeatureItemBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) { } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs index dd3a64e..11e9df9 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class GetAnnotationNodesBlock : GetXElementInfoBlock { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs index 5288d43..d537641 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs @@ -1,8 +1,9 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class GetInspectionNodesBlock : GetXElementInfoBlock { @@ -19,10 +20,10 @@ public GetInspectionNodesBlock(PipelineSection parent, Cancellation } var result = (from node in input.document.Descendants("member").AsParallel() - let fullName = GetNameOrDefault(node, "Inspection") - where !string.IsNullOrWhiteSpace(fullName) - let typeName = fullName.Substring(fullName.LastIndexOf(".", StringComparison.Ordinal) + 1) - select (input.asset, new XElementInfo(typeName, node))) + let fullName = GetNameOrDefault(node, "Inspection") + where !string.IsNullOrWhiteSpace(fullName) + let typeName = fullName.Substring(fullName.LastIndexOf(".", StringComparison.Ordinal) + 1) + select (input.asset, new XElementInfo(typeName, node))) .ToList(); Logger.LogInformation(Context.Parameters, $"{Name} | Extracted {result.Count} inspection nodes from tag asset {input.asset.Name}"); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs index c64c6f2..0548a14 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs @@ -1,8 +1,9 @@ -using System.Xml.Linq; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class GetQuickFixNodesBlock : GetXElementInfoBlock { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetTagAssetBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetTagAssetBlock.cs index 1b98643..766e92c 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetTagAssetBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetTagAssetBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class GetTagAssetBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetXElementInfoBlock.cs index 5556dbe..6bd63ef 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetXElementInfoBlock.cs @@ -1,8 +1,9 @@ -using System.Xml.Linq; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public abstract class GetXElementInfoBlock : TransformManyBlockBase<(TagAsset asset, XDocument document), (TagAsset, XElementInfo), SyncContext> { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadDbTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadDbTagsBlock.cs index 91609f2..c7c4759 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadDbTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadDbTagsBlock.cs @@ -1,15 +1,16 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class AcquireDbTagsBlock : TransformBlockBase, SyncContext> { private readonly IRubberduckDbService _service; public AcquireDbTagsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, - IRubberduckDbService service) + IRubberduckDbService service) : base(parent, tokenSource, logger) { _service = service; diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadFeaturesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadFeaturesBlock.cs index 1fe9180..7424584 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadFeaturesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadFeaturesBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class LoadFeaturesBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadInspectionDefaultConfigBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadInspectionDefaultConfigBlock.cs index b760e7a..a001930 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadInspectionDefaultConfigBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/LoadInspectionDefaultConfigBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class LoadInspectionDefaultConfigBlock : TransformBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs new file mode 100644 index 0000000..36f156b --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs @@ -0,0 +1,48 @@ +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Model; +using System.Collections.Immutable; + +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; + +public class MergeAnnotationsBlock : TransformBlockBase, IEnumerable, SyncContext> +{ + private readonly IXmlDocMerge _service; + + public MergeAnnotationsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, IXmlDocMerge service) + : base(parent, tokenSource, logger) + { + _service = service; + } + + public override IEnumerable Transform(IEnumerable input) + { + try + { + + var main = input + .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) + .ToList(); + + var next = input + .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == e.TagAssetId)) + .ToList(); + + Logger.LogDebug(Context.Parameters, $"Merging annotations. Main x{main.Count} | Next x{next.Count}"); + var dbItems = Context.Annotations.ToDictionary(e => e.Name); + var merged = _service.Merge(dbItems, main, next); + Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); + + Context.StagingContext.UpdatedAnnotations = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); + Context.StagingContext.NewAnnotations = merged.Where(e => e.Id == default).ToImmutableArray(); + + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedAnnotations.Count()} | New: {Context.StagingContext.NewAnnotations.Count()}"); + return merged; + } + finally + { + Block.Complete(); + } + } +} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeFeatureItemsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeFeatureItemsBlock.cs deleted file mode 100644 index 892e255..0000000 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeFeatureItemsBlock.cs +++ /dev/null @@ -1,46 +0,0 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Data; -using System.Collections.Immutable; - -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; - -public class MergeFeatureItemsBlock : TransformBlockBase, IEnumerable, SyncContext> -{ - private readonly IXmlDocMerge _service; - - public MergeFeatureItemsBlock(IXmlDocMerge merge, PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) - : base(parent, tokenSource, logger) - { - _service = merge; - } - - public override IEnumerable Transform(IEnumerable input) - { - try - { - var main = input - .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.TagId == e.TagId && asset.Id == e.TagAssetId)) - .ToList(); - - var next = input - .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.TagId == e.TagId && asset.Id == e.TagAssetId)) - .ToList(); - - Logger.LogDebug(Context.Parameters, $"Merging feature items. Main x{main.Count} | Next x{next.Count}"); - var dbItems = Context.FeatureItems.ToDictionary(e => e.Name); - var merged = _service.Merge(dbItems, main, next); - Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); - - Context.StagingContext.UpdatedFeatureItems = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); - Context.StagingContext.NewFeatureItems = merged.Where(e => e.Id == default).ToImmutableArray(); - - Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedFeatureItems.Count} | New: {Context.StagingContext.NewFeatureItems.Count}"); - return merged; - } - finally - { - Block.Complete(); - } - } -} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs new file mode 100644 index 0000000..235c678 --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs @@ -0,0 +1,48 @@ +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Model; +using System.Collections.Immutable; + +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; + +public class MergeInspectionsBlock : TransformBlockBase, IEnumerable, SyncContext> +{ + private readonly IXmlDocMerge _service; + + public MergeInspectionsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, IXmlDocMerge service) + : base(parent, tokenSource, logger) + { + _service = service; + } + + public override IEnumerable Transform(IEnumerable input) + { + try + { + + var main = input + .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) + .ToList(); + + var next = input + .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == e.TagAssetId)) + .ToList(); + + Logger.LogDebug(Context.Parameters, $"Merging inspections. Main x{main.Count} | Next x{next.Count}"); + var dbItems = Context.Inspections.ToDictionary(e => e.Name); + var merged = _service.Merge(dbItems, main, next); + Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); + + Context.StagingContext.UpdatedInspections = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); + Context.StagingContext.NewInspections = merged.Where(e => e.Id == default).ToImmutableArray(); + + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedInspections.Count()} | New: {Context.StagingContext.NewInspections.Count()}"); + return merged; + } + finally + { + Block.Complete(); + } + } +} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs new file mode 100644 index 0000000..ef0e8b7 --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs @@ -0,0 +1,48 @@ +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Model; +using System.Collections.Immutable; + +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; + +public class MergeQuickFixesBlock : TransformBlockBase, IEnumerable, SyncContext> +{ + private readonly IXmlDocMerge _service; + + public MergeQuickFixesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, IXmlDocMerge service) + : base(parent, tokenSource, logger) + { + _service = service; + } + + public override IEnumerable Transform(IEnumerable input) + { + try + { + + var main = input + .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) + .ToList(); + + var next = input + .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == e.TagAssetId)) + .ToList(); + + Logger.LogDebug(Context.Parameters, $"Merging quickfixes. Main x{main.Count} | Next x{next.Count}"); + var dbItems = Context.Quickfixes.ToDictionary(e => e.Name); + var merged = _service.Merge(dbItems, main, next); + Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); + + Context.StagingContext.UpdatedQuickFixes = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); + Context.StagingContext.NewQuickFixes = merged.Where(e => e.Id == default).ToImmutableArray(); + + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedQuickFixes.Count()} | New: {Context.StagingContext.NewQuickFixes.Count()}"); + return merged; + } + finally + { + Block.Complete(); + } + } +} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs index fce9d47..a6213c4 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs @@ -1,29 +1,25 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class ParseAnnotationXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), FeatureXmlDoc, SyncContext> +public class ParseAnnotationXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), Annotation, SyncContext> { public ParseAnnotationXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } - public override FeatureXmlDoc Transform((TagAsset asset, XElementInfo info) input) + public override Annotation Transform((TagAsset asset, XElementInfo info) input) { - if (input.asset is null) - { - return null; - } - var feature = Context.Features["Annotations"]; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); var parser = new XmlDocAnnotation(input.info.Name, input.info.Element, isPreRelease); var result = parser.Parse(input.asset.Id, feature.Id); - return result; + return result ?? throw new InvalidOperationException("Failed to parse annotation xmldoc"); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs index 812ed19..58b1d77 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs @@ -1,22 +1,23 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class ParseInspectionXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), FeatureXmlDoc, SyncContext> +public class ParseInspectionXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), Inspection, SyncContext> { private readonly IMarkdownFormattingService _markdownService; - public ParseInspectionXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, + public ParseInspectionXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, IMarkdownFormattingService markdownService) : base(parent, tokenSource, logger) { _markdownService = markdownService; } - public override async Task TransformAsync((TagAsset asset, XElementInfo info) input) + public override async Task TransformAsync((TagAsset asset, XElementInfo info) input) { if (input.asset is null) { @@ -24,7 +25,7 @@ public override async Task TransformAsync((TagAsset asset, XEleme } var feature = Context.Features["Inspections"]; - var quickfixes = Context.Features["QuickFixes"].Items; // FIXME not loaded in initial run + var quickfixes = Context.Features["QuickFixes"].QuickFixes; // FIXME not loaded in initial run var config = Context.InspectionDefaultConfig.TryGetValue(input.info.Name, out var value) ? value : null; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); var name = input.info.Element.Attribute("name")!.Value; @@ -34,7 +35,7 @@ public override async Task TransformAsync((TagAsset asset, XEleme var parser = new XmlDocInspection(_markdownService); var result = await parser.ParseAsync(input.asset.Id, tag.Name, feature.Id, quickfixes, name, input.info.Element, config, isPreRelease); - return result with { TagId = tag.Id }; + return result with { TagAssetId = input.asset.Id }; } throw new InvalidOperationException($"[Tag.Id]:{input.asset.TagId} was not loaded or does not exist."); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs index ee393f4..c793f52 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs @@ -1,29 +1,30 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class ParseQuickFixXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), FeatureXmlDoc, SyncContext> +public class ParseQuickFixXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), QuickFix, SyncContext> { public ParseQuickFixXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } - public override FeatureXmlDoc Transform((TagAsset asset, XElementInfo info) input) + public override QuickFix Transform((TagAsset asset, XElementInfo info) input) { if (input.asset is null) { - return null; + return null!; } var feature = Context.Features["QuickFixes"]; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); - var parser = new XmlDocQuickFix(input.info.Name, input.info.Element, isPreRelease); - var result = parser.Parse(input.asset.Id, feature.Id) with { TagAssetId = input.asset.Id }; + var parser = new XmlDocQuickFix(); + var result = parser.Parse(input.info.Name, input.asset.Id, feature.Id, input.info.Element, isPreRelease) with { TagAssetId = input.asset.Id }; - return result; + return result ?? throw new InvalidOperationException("Failed to parse xmldoc"); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs index f6e97f3..860caa9 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs @@ -1,7 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class StreamXmlAssetsBlock : BufferBlockBase { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs index 9cc5f1b..7633840 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs @@ -1,19 +1,25 @@ -using System.Threading.Tasks.Dataflow; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Model.Entity; +using rubberduckvba.Server.Services; +using System.Threading.Tasks.Dataflow; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class SyncXmldocSection : PipelineSection { - public SyncXmldocSection(IPipeline parent, CancellationTokenSource tokenSource, ILogger logger, - IRubberduckDbService content, - IGitHubClientService github, - IXmlDocMerge mergeService, - IStagingServices staging, + public SyncXmldocSection(IPipeline parent, CancellationTokenSource tokenSource, ILogger logger, + IRubberduckDbService content, + IRepository inspections, + IRepository quickfixes, + IRepository annotations, + IGitHubClientService github, + IXmlDocMerge mergeService, + IStagingServices staging, IMarkdownFormattingService markdownService) : base(parent, tokenSource, logger) { @@ -21,7 +27,7 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS BroadcastParameters = new BroadcastParametersBlock(this, tokenSource, logger); LoadInspectionDefaultConfig = new LoadInspectionDefaultConfigBlock(this, tokenSource, github, logger); LoadFeatures = new LoadFeaturesBlock(this, tokenSource, content, logger); - LoadDbFeatureItems = new LoadDbFeatureItemsBlock(this, tokenSource, logger, content); + LoadDbFeatureItems = new LoadDbFeatureItemsBlock(this, tokenSource, logger, inspections, quickfixes, annotations); AcquireDbMainTagGraph = new AcquireDbMainTagGraphBlock(this, tokenSource, content, logger); AcquireDbNextTagGraph = new AcquireDbNextTagGraphBlock(this, tokenSource, content, logger); AcquireDbTags = new AcquireDbTagsBlock(this, tokenSource, logger, content); @@ -40,7 +46,9 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS ParseQuickFixInfo = new ParseQuickFixXElementInfoBlock(this, tokenSource, logger); ParseAnnotationInfo = new ParseAnnotationXElementInfoBlock(this, tokenSource, logger); FeatureItemBuffer = new FeatureItemBufferBlock(this, tokenSource, logger); - MergeItems = new MergeFeatureItemsBlock(mergeService, this, tokenSource, logger); + MergeInspections = new MergeInspectionsBlock(this, tokenSource, logger, mergeService); + MergeQuickFixes = new MergeQuickFixesBlock(this, tokenSource, logger, mergeService); + MergeAnnotations = new MergeAnnotationsBlock(this, tokenSource, logger, mergeService); AccumulateProcessedItems = new AccumulateProcessedFeatureItemsBlock(this, tokenSource, logger); SaveStaging = new BulkSaveStagingBlock(this, tokenSource, staging, logger); } @@ -69,7 +77,9 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS private ParseQuickFixXElementInfoBlock ParseQuickFixInfo { get; } private ParseAnnotationXElementInfoBlock ParseAnnotationInfo { get; } private FeatureItemBufferBlock FeatureItemBuffer { get; } - private MergeFeatureItemsBlock MergeItems { get; } + private MergeInspectionsBlock MergeInspections { get; } + private MergeQuickFixesBlock MergeQuickFixes { get; } + private MergeAnnotationsBlock MergeAnnotations { get; } private AccumulateProcessedFeatureItemsBlock AccumulateProcessedItems { get; } private BulkSaveStagingBlock SaveStaging { get; } @@ -101,7 +111,9 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS [nameof(ParseQuickFixInfo)] = ParseQuickFixInfo.Block, [nameof(ParseAnnotationInfo)] = ParseAnnotationInfo.Block, [nameof(FeatureItemBuffer)] = FeatureItemBuffer.Block, - [nameof(MergeItems)] = MergeItems.Block, + [nameof(MergeInspections)] = MergeInspections.Block, + [nameof(MergeQuickFixes)] = MergeQuickFixes.Block, + [nameof(MergeAnnotations)] = MergeAnnotations.Block, [nameof(AccumulateProcessedItems)] = AccumulateProcessedItems.Block, [nameof(SaveStaging)] = SaveStaging.Block, }; @@ -133,7 +145,7 @@ public override void CreateBlocks() ParseAnnotationInfo.CreateBlock(GetAnnotationNodes); FeatureItemBuffer.CreateBlock(ParseInspectionInfo, ParseQuickFixInfo, ParseAnnotationInfo); AccumulateProcessedItems.CreateBlock(FeatureItemBuffer); - MergeItems.CreateBlock(() => Context.StagingContext.ProcessedFeatureItems, AccumulateProcessedItems.Block.Completion); - SaveStaging.CreateBlock(MergeItems); + MergeInspections.CreateBlock(() => Context.StagingContext.NewInspections, AccumulateProcessedItems.Block.Completion); + SaveStaging.CreateBlock(MergeInspections); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XElementInfo.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XElementInfo.cs index 6f61845..0a8dad8 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XElementInfo.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XElementInfo.cs @@ -1,5 +1,5 @@ using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public record XElementInfo(string Name, XElement Element); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeTagsPipeline.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeTagsPipeline.cs index e135568..e8ed1ba 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeTagsPipeline.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeTagsPipeline.cs @@ -1,9 +1,10 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncTags; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline; public class SynchronizeTagsPipeline : PipelineBase, ISynchronizationPipeline { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs index 33eebf0..b8daaf7 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs @@ -1,9 +1,12 @@ -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model.Entity; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization.Pipeline; +namespace rubberduckvba.Server.ContentSynchronization.Pipeline; public class SynchronizeXmlPipeline : PipelineBase, ISynchronizationPipeline { @@ -12,8 +15,12 @@ public class SynchronizeXmlPipeline : PipelineBase, ISynchron private readonly IXmlDocMerge _merge; private readonly IStagingServices _staging; private readonly IMarkdownFormattingService _markdown; + private readonly IRepository _inspections; + private readonly IRepository _quickfixes; + private readonly IRepository _annotations; - public SynchronizeXmlPipeline(IRequestParameters parameters, ILogger logger, IRubberduckDbService content, IGitHubClientService github, IXmlDocMerge merge, IStagingServices staging, IMarkdownFormattingService markdown, CancellationTokenSource tokenSource) + public SynchronizeXmlPipeline(IRequestParameters parameters, ILogger logger, IRubberduckDbService content, IGitHubClientService github, IXmlDocMerge merge, IStagingServices staging, IMarkdownFormattingService markdown, CancellationTokenSource tokenSource, + IRepository inspections, IRepository quickfixes, IRepository annotations) : base(new SyncContext(parameters), tokenSource, logger) { _content = content; @@ -21,6 +28,9 @@ public SynchronizeXmlPipeline(IRequestParameters parameters, ILogger logger, IRu _merge = merge; _staging = staging; _markdown = markdown; + _inspections = inspections; + _quickfixes = quickfixes; + _annotations = annotations; } public async Task> ExecuteAsync(SyncRequestParameters parameters, CancellationTokenSource tokenSource) @@ -32,7 +42,7 @@ public async Task> ExecuteAsync(SyncRequestParameters para } // 01. Create the pipeline sections - var synchronizeFeatureItems = new SyncXmldocSection(this, tokenSource, Logger, _content, _github, _merge, _staging, _markdown); + var synchronizeFeatureItems = new SyncXmldocSection(this, tokenSource, Logger, _content, _inspections, _quickfixes, _annotations, _github, _merge, _staging, _markdown); // 02. Wire up the pipeline AddSections(parameters, synchronizeFeatureItems); diff --git a/rubberduckvba.Server/ContentSynchronization/SyncRequestParameters.cs b/rubberduckvba.Server/ContentSynchronization/SyncRequestParameters.cs index d27ad93..4571e31 100644 --- a/rubberduckvba.Server/ContentSynchronization/SyncRequestParameters.cs +++ b/rubberduckvba.Server/ContentSynchronization/SyncRequestParameters.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Services; -namespace rubberduckvba.com.Server.ContentSynchronization; +namespace rubberduckvba.Server.ContentSynchronization; public interface IRequestParameters { @@ -18,11 +18,11 @@ public record class SyncRequestParameters : IRequestParameters public string? Token { get; init; } } -public record class XmldocSyncRequestParameters : SyncRequestParameters +public record class XmldocSyncRequestParameters : SyncRequestParameters { } -public record class TagSyncRequestParameters : SyncRequestParameters +public record class TagSyncRequestParameters : SyncRequestParameters { public string? Tag { get; init; } } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocMerge.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocMerge.cs index dbf54e7..a085819 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocMerge.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocMerge.cs @@ -1,8 +1,10 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; public interface IXmlDocMerge { - IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next); + IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next); + IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next); + IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next); } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocParser.cs index 284cedf..5b6cf88 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocParser.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/IXmlDocParser.cs @@ -1,11 +1,14 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; public interface IXmlDocParser { string AssetName { get; } - Task> ParseAsync(TagGraph tag); + IEnumerable ParseInspections(XDocument document); + IEnumerable ParseQuickFixes(XDocument document); + IEnumerable ParseAnnotations(XDocument document); } /// diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/XmlDocParserBase.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/XmlDocParserBase.cs index ff81f51..f2838ec 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/XmlDocParserBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Abstract/XmlDocParserBase.cs @@ -1,7 +1,7 @@ -using System.Xml.Linq; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; public abstract class XmlDocParserBase : IXmlDocParser { @@ -12,11 +12,11 @@ protected XmlDocParserBase(string assetName) public string AssetName { get; } - public async Task> ParseAsync(TagGraph tag) + public async Task GetTagAssetXDocumentAsync(TagGraph tag) { if (tag is null) { - return Enumerable.Empty(); + throw new ArgumentNullException(nameof(tag)); } var asset = tag.Assets.SingleOrDefault(a => a.Name.Contains(AssetName)) @@ -27,34 +27,29 @@ public async Task> ParseAsync(TagGraph tag) throw new UriFormatException($"Unexpected host in download URL '{uri}' from asset ID {asset.Id} (tag ID {tag.Id}, '{tag.Name}')."); } - using (var client = new HttpClient()) - using (var response = await client.GetAsync(uri)) - { - if (response.IsSuccessStatusCode) - { - XDocument document; - using (var stream = await response.Content.ReadAsStreamAsync()) - { - document = XDocument.Load(stream, LoadOptions.None); - } - var items = await ParseAsync(asset.Id, tag.Name, document, tag.IsPreRelease); - return items; - } - } + using var client = new HttpClient(); + using var response = await client.GetAsync(uri); - return Enumerable.Empty(); - } + response.EnsureSuccessStatusCode(); + using var stream = await response.Content.ReadAsStreamAsync(); - protected abstract Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease); + return XDocument.Load(stream, LoadOptions.None); + } - protected static string GetFullTypeNameOrDefault(XElement memberNode, string suffix) + protected static string? GetFullTypeNameOrDefault(XElement memberNode, string suffix) { var name = memberNode.Attribute("name")?.Value; - if (name == null || !name.StartsWith("T:") || !name.EndsWith(suffix)) + if (name is null || !name.StartsWith("T:") || !name.EndsWith(suffix)) { return default; } - return name.Substring(2); + return name[2..]; } + + public virtual IEnumerable ParseInspections(XDocument document) => []; + + public virtual IEnumerable ParseQuickFixes(XDocument document) => []; + + public virtual IEnumerable ParseAnnotations(XDocument document) => []; } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/BeforeAndAfterCodeExample.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/BeforeAndAfterCodeExample.cs index 36101af..9c2f652 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/BeforeAndAfterCodeExample.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/BeforeAndAfterCodeExample.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public class BeforeAndAfterCodeExample { @@ -13,10 +13,11 @@ public BeforeAndAfterCodeExample(IEnumerable modulesBefore, IEnum public IEnumerable ModulesBefore { get; } public IEnumerable ModulesAfter { get; } - public Example AsExample(string description = "", int sortOrder = 0) => new() + public Example AsExample(string description = "", int sortOrder = 0) => new QuickFixExample() { - Properties = description, + Description = description, SortOrder = sortOrder, - Modules = ModulesBefore.Concat(ModulesAfter).ToList() + ModulesBefore = ModulesBefore.ToList(), + ModulesAfter = ModulesAfter.ToList() }; } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs index b88bb84..9e83c37 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs @@ -1,12 +1,11 @@ -using System.Xml.Linq; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; using System.Collections.Concurrent; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; -using RubberduckServices; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public interface ICodeAnalysisXmlDocParserFactory { @@ -49,20 +48,20 @@ public CodeAnalysisXmlDocParser(IRubberduckDbService content, IMarkdownFormattin _inspectionDefaults = inspectionDefaults.ToDictionary(e => e.InspectionName, e => e); } - protected override async Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease) - { - var quickfixesFeatureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "QuickFixes") - ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'QuickFixes' feature."); - var quickFixes = ReadQuickFixes(assetId, tagName, quickfixesFeatureId, document, !isPreRelease); + //protected override async Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease) + //{ + // var quickfixesFeatureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "QuickFixes") + // ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'QuickFixes' feature."); + // var quickFixes = ReadQuickFixes(assetId, tagName, quickfixesFeatureId, document, !isPreRelease); - var inspectionsFeatureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "Inspections") - ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'Inspections' feature."); - var inspections = ReadInspections(assetId, tagName, inspectionsFeatureId, document, !isPreRelease, quickFixes); + // var inspectionsFeatureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "Inspections") + // ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'Inspections' feature."); + // var inspections = ReadInspections(assetId, tagName, inspectionsFeatureId, document, !isPreRelease, quickFixes); - return inspections.Concat(quickFixes); - } + // return inspections.Concat(quickFixes); + //} - private IEnumerable ReadInspections(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased, IEnumerable quickFixes) + private IEnumerable ReadInspections(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased, IEnumerable quickFixes) { var nodes = from node in doc.Descendants("member").AsParallel() let name = GetFullTypeNameOrDefault(node, "Inspection") @@ -71,7 +70,7 @@ private IEnumerable ReadInspections(int assetId, string tagName, let config = _inspectionDefaults.ContainsKey(inspectionName) ? _inspectionDefaults[inspectionName] : default select (name, node, config); - var results = new ConcurrentBag>(); + var results = new ConcurrentBag>(); Parallel.ForEach(nodes, info => { var xmldoc = new XmlDocInspection(_markdownService); @@ -81,18 +80,18 @@ private IEnumerable ReadInspections(int assetId, string tagName, return results.Select(t => t.GetAwaiter().GetResult()); } - private IEnumerable ReadQuickFixes(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased) + private IEnumerable ReadQuickFixes(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased) { var nodes = from node in doc.Descendants("member").AsParallel() let name = GetFullTypeNameOrDefault(node, "QuickFix") where !string.IsNullOrEmpty(name) && node.Descendants(XmlDocSchema.QuickFix.CanFix.ElementName).Any() // this excludes any quickfixes added to main (master) prior to v2.5.0 select (name, node); - var results = new ConcurrentBag(); + var results = new ConcurrentBag(); Parallel.ForEach(nodes, info => { - var xmldoc = new XmlDocQuickFix(info.name, info.node, !hasReleased); - results.Add(xmldoc.Parse(assetId, featureId)); + var xmldoc = new XmlDocQuickFix(); + results.Add(xmldoc.Parse(info.name, assetId, featureId, info.node, !hasReleased)); }); return results; diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs index 5041a45..7961262 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs @@ -1,10 +1,10 @@ -using System.Xml.Linq; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; using System.Collections.Concurrent; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public class ParsingXmlDocParser : XmlDocParserBase, IParsingXmlDocParser { @@ -16,21 +16,21 @@ public ParsingXmlDocParser(IRubberduckDbService content) _content = content; } - protected override async Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease) - { - var featureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "Annotations") - ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'Annotations' feature."); - return await Task.FromResult(ReadAnnotations(assetId, tagName, featureId, document, !isPreRelease)); - } + //protected override async Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease) + //{ + // var featureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "Annotations") + // ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'Annotations' feature."); + // return await Task.FromResult(ReadAnnotations(assetId, tagName, featureId, document, !isPreRelease)); + //} - private IEnumerable ReadAnnotations(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased) + private IEnumerable ReadAnnotations(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased) { var nodes = from node in doc.Descendants("member").AsParallel() let name = GetFullTypeNameOrDefault(node, "Annotation") where !string.IsNullOrWhiteSpace(name) select (name, node); - var results = new ConcurrentBag(); + var results = new ConcurrentBag(); Parallel.ForEach(nodes, info => { var xmldoc = new XmlDocAnnotation(info.name, info.node, !hasReleased); diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs index 31564cc..4fbc934 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Schema; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; public static class XmlDocSchema { diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs index 762f116..3917613 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs @@ -1,10 +1,10 @@ using Newtonsoft.Json; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; using System.Reflection; using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public class AnnotationProperties { @@ -31,7 +31,7 @@ public XmlDocAnnotation(string name, XElement node, bool isPreRelease) Properties = JsonConvert.SerializeObject(Parameters); - Examples = ParseExamples(node).ToArray(); + Examples = []; } public string SourceObject { get; } @@ -45,110 +45,104 @@ public XmlDocAnnotation(string name, XElement node, bool isPreRelease) public IReadOnlyList Parameters { get; } public IReadOnlyList Examples { get; } - public FeatureXmlDoc Parse(int assetId, int featureId) + public Annotation Parse(int assetId, int featureId) { var parameters = new AnnotationProperties { Parameters = Parameters.ToArray() }; - return new FeatureXmlDoc + return new Annotation { FeatureId = featureId, Name = AnnotationName, IsNew = IsPreRelease, - Title = $"@{AnnotationName}", - Summary = Summary, TagAssetId = assetId, SourceUrl = SourceObject, - Serialized = JsonConvert.SerializeObject(parameters, Formatting.None), - Examples = Examples.Select((e, i) => e.AsExample(string.Empty, i)).ToList() + Examples = [] }; } - private BeforeAndAfterCodeExample[] ParseExamples(XElement node) + private AnnotationExample[] ParseExamples(XElement node) { - try - { - var examples = new List(); - var exampleNodes = node.Elements(XmlDocSchema.Annotation.Example.ElementName); - foreach (var example in exampleNodes) - { - /* - * - * - * - */ - var modules = example.Elements(XmlDocSchema.Annotation.Example.Module.ElementName).AsParallel(); - var simpleExamples = modules.Where(m => m.Nodes().OfType().Any()) - .Select((e, i) => new BeforeAndAfterCodeExample([ExtractCodeModule(e, i)], modulesAfter: [])) - .ToArray(); - if (simpleExamples.Length > 0) - { - examples.AddRange(simpleExamples.ToArray()); - continue; - } - - IEnumerable before = Enumerable.Empty(); - IEnumerable? after = null; - - if (modules.Any()) - { - /* - * - * - * - * - * - * - * - */ - before = modules.Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Module.Before.ElementName)!, i, "(code pane)")); - after = modules.Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Module.After.ElementName)!, i, "(synchronized, hidden attributes shown)")); - } - - if (example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName).Any()) - { - /* - * - * - * - * - * - * - * - * - * - */ - before = example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName) - .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Before.Module.ElementName)!, i, "(code pane)")); - after = example.Elements(XmlDocSchema.Annotation.Example.After.ElementName) - .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.After.Module.ElementName)!, i, "(synchronized, hidden attributes shown)")); - } - - if (before.Any() && after.Any()) - { - examples.Add(new BeforeAndAfterCodeExample(before, after)); - } - } - return examples.ToArray(); - } - catch (Exception) - { - var errorExample = new[] { ExampleModule.ParseError("AnnotationExample") }; - return new[] { new BeforeAndAfterCodeExample(errorExample, errorExample) }; - } + //try + //{ + // var examples = new List(); + // var exampleNodes = node.Elements(XmlDocSchema.Annotation.Example.ElementName); + // foreach (var example in exampleNodes) + // { + // /* + // * + // * + // * + // */ + // var modules = example.Elements(XmlDocSchema.Annotation.Example.Module.ElementName).AsParallel(); + // var simpleExamples = modules.Where(m => m.Nodes().OfType().Any()) + // .Select((e, i) => new AnnotationExample { Modules = [ExtractCodeModule(e, i)] }) + // .ToArray(); + // if (simpleExamples.Length > 0) + // { + // examples.AddRange(simpleExamples.ToArray()); + // continue; + // } + + // IEnumerable before = Enumerable.Empty(); + // IEnumerable? after = null; + + // if (modules.Any()) + // { + // /* + // * + // * + // * + // * + // * + // * + // * + // */ + // before = modules.Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Module.Before.ElementName)!, i, "(code pane)")); + // } + + // if (example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName).Any()) + // { + // /* + // * + // * + // * + // * + // * + // * + // * + // * + // * + // */ + // before = example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName) + // .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Before.Module.ElementName)!, i, "(code pane)")); + // } + + // if (before.Any() && after.Any()) + // { + // examples.Add(new BeforeAndAfterCodeExample(before, after)); + // } + // } + return []; + //} + //catch (Exception) + //{ + // var errorExample = new[] { ExampleModule.ParseError("AnnotationExample") }; + // return [new AnnotationExample { Modules = errorExample }]; + //} } private static readonly IDictionary ModuleTypes = @@ -185,7 +179,7 @@ private ExampleModule ExtractCodeModule(XElement cdataParent, int index, string? { ModuleName = name, ModuleType = moduleType, - Properties = $"\"Description\": \"{description}\"".Replace(" ", " "), + Description = description, HtmlContent = code.Trim().Replace(" ", " ") }; diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs index 7ca4812..bcd95d2 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs @@ -1,13 +1,12 @@ -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.com.Server.Data; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Reflection; -using System.Text.Json; using System.Xml.Linq; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public record class InspectionProperties { @@ -33,31 +32,12 @@ public XmlDocInspection(IMarkdownFormattingService markdownService) _markdownService = markdownService; } - public string Properties { get; private set; } - - public string SourceObject { get; } - public bool IsPreRelease { get; } - - public bool IsHidden { get; } - public string TypeName { get; } - public string InspectionName { get; } - public string Summary { get; } - public string[] References { get; } - public string HostApp { get; } - public string Reasoning { get; } - public string Remarks { get; } - public string InspectionType { get; } - public string DefaultSeverity { get; } - - public Example[] Examples { get; } - - public async Task ParseAsync(int assetId, string tagName, int featureId, IEnumerable quickFixes, string name, XElement node, InspectionDefaultConfig? config, bool isPreRelease) + public async Task ParseAsync(int assetId, string tagName, int featureId, IEnumerable quickFixes, string name, XElement node, InspectionDefaultConfig? config, bool isPreRelease) { var typeName = name.Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1); var inspectionName = typeName.Replace("Inspection", string.Empty).Trim(); - var fixes = quickFixes.Select(e => (e.Name, e.Serialized)); - var fixesByName = fixes.ToLookup(e => e.Name, e => JsonSerializer.Deserialize(e.Serialized, new JsonSerializerOptions { PropertyNameCaseInsensitive = true })?.Inspections); + var fixesByName = quickFixes.ToLookup(e => e.Name, e => e.Inspections); var filteredFixes = quickFixes.Where(fix => fixesByName[fix.Name].FirstOrDefault()?.Contains(inspectionName) ?? false).ToList(); var sourceObject = name.Substring(2).Replace(".", "/").Replace("Rubberduck/CodeAnalysis/", "Rubberduck.CodeAnalysis/"); @@ -75,7 +55,7 @@ public async Task ParseAsync(int assetId, string tagName, int fea var defaultSeverity = config?.DefaultSeverity ?? _defaultSeverity; var inspectionType = config?.InspectionType ?? _defaultInspectionType; - if (Enum.TryParse(InspectionType, out var enumInspectionType)) + if (Enum.TryParse(inspectionType, out var enumInspectionType)) { inspectionType = InspectionTypes[enumInspectionType]; } @@ -83,24 +63,9 @@ public async Task ParseAsync(int assetId, string tagName, int fea var (summary, reasoning, remarks) = (await summaryTask, await reasoningTask, await remarksTask); - var properties = new InspectionProperties - { - Reasoning = reasoning, - Summary = summary, - Remarks = remarks, - HostApp = hostApp, - DefaultSeverity = defaultSeverity, - InspectionType = inspectionType, - QuickFixes = filteredFixes.Select(e => e.Name).ToArray(), - References = references, - Examples = examples - }; - - return new FeatureXmlDoc + return new Inspection { FeatureId = featureId, - FeatureName = "Inspections", - FeatureTitle = "Inspections", Id = default, DateTimeInserted = DateTime.UtcNow, @@ -108,16 +73,20 @@ public async Task ParseAsync(int assetId, string tagName, int fea TagAssetId = assetId, SourceUrl = sourceObject, - Name = inspectionName, - Title = inspectionName, - Summary = summary, - IsHidden = isHidden, IsNew = isPreRelease, IsDiscontinued = default, - Examples = examples, - Serialized = JsonSerializer.Serialize(properties) + Name = inspectionName, + Summary = summary, + Reasoning = reasoning, + Remarks = remarks, + HostApp = hostApp, + DefaultSeverity = defaultSeverity, + InspectionType = inspectionType, + QuickFixes = filteredFixes.Select(e => e.Name).ToArray(), + References = references, + Examples = examples }; } @@ -147,15 +116,14 @@ private enum CodeInspectionType Performance, } - private IEnumerable ParseExamples(XElement node) + private IEnumerable ParseExamples(XElement node) { return node.Elements(XmlDocSchema.Inspection.Example.ElementName).AsParallel() .Select((e, i) => { - var hasResult = e.Attributes().Any(a => string.Equals(a.Name.LocalName, XmlDocSchema.Inspection.Example.HasResultAttribute, StringComparison.InvariantCultureIgnoreCase) && bool.TryParse(a.Value, out var value) && value); - var example = new Example + var example = new InspectionExample { - Properties = $"{{\"HasResult\":\"{hasResult}\"}}", + HasResult = e.Attributes().Any(a => string.Equals(a.Name.LocalName, XmlDocSchema.Inspection.Example.HasResultAttribute, StringComparison.InvariantCultureIgnoreCase) && bool.TryParse(a.Value, out var value) && value), SortOrder = i, Modules = e.Elements(XmlDocSchema.Inspection.Example.Module.ElementName) .Select(async m => diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs index 0bc6a13..e8f6a7d 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs @@ -1,28 +1,24 @@ -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public class XmlDocMerge(ILogger logger) : IXmlDocMerge { - - public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) + public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) { var mainBranch = main.ToHashSet(); var nextBranch = (next.Any() ? next : main).ToHashSet(); - var isInitialLoad = !dbItems.Any(); - - var comparer = new XmlDocBranchIntersectComparer(); + var merged = new HashSet(); var timestamp = TimeProvider.System.GetUtcNow().DateTime; - var merged = new HashSet(); - - var updatedItems = new HashSet( + var updatedItems = new HashSet( from item in nextBranch where dbItems.ContainsKey(item.Name) let dbItem = dbItems[item.Name] - where dbItem.Serialized != item.Serialized + where dbItem.GetContentHash() != item.GetContentHash() select item with { Id = dbItem.Id, @@ -32,8 +28,9 @@ select item with } ); - var insertItems = new HashSet( - from item in nextBranch.Intersect(mainBranch, comparer) + var comparer = new XmlDocBranchIntersectComparer(); + var insertItems = new HashSet( + from item in nextBranch//.Intersect(mainBranch, comparer) where !dbItems.ContainsKey(item.Name) select item with { @@ -43,8 +40,59 @@ select item with } ); - merged.UnionWith(updatedItems); - merged.UnionWith(insertItems); return merged; } + + + //public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) + //{ + // var mainBranch = main.ToHashSet(); + // var nextBranch = (next.Any() ? next : main).ToHashSet(); + + // var isInitialLoad = !dbItems.Any(); + + // var comparer = new XmlDocBranchIntersectComparer(); + // var timestamp = TimeProvider.System.GetUtcNow().DateTime; + + // var merged = new HashSet(); + + // var updatedItems = new HashSet( + // from item in nextBranch + // where dbItems.ContainsKey(item.Name) + // let dbItem = dbItems[item.Name] + // where dbItem.Serialized != item.Serialized + // select item with + // { + // Id = dbItem.Id, + // IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + // IsDiscontinued = dbItem.IsDiscontinued || !nextBranch.Any(a => a.Name == item.Name), + // DateTimeUpdated = timestamp + // } + // ); + + // var insertItems = new HashSet( + // from item in nextBranch//.Intersect(mainBranch, comparer) + // where !dbItems.ContainsKey(item.Name) + // select item with + // { + // IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + // IsDiscontinued = !nextBranch.Any(a => a.Name == item.Name), + // DateTimeInserted = timestamp + // } + // ); + + // merged.UnionWith(updatedItems); + // merged.UnionWith(insertItems); + // return merged; + //} + + public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) + { + throw new NotImplementedException(); + } + + public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) + { + throw new NotImplementedException(); + } } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs index 517a6ee..491ffb0 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs @@ -1,10 +1,9 @@ -using System.Reflection; -using System.Text.Json; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; +using System.Reflection; using System.Xml.Linq; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.com.Server.Data; -namespace rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public class QuickFixProperties { @@ -18,71 +17,48 @@ public class QuickFixProperties public class XmlDocQuickFix : IEquatable { - public XmlDocQuickFix() { } - public XmlDocQuickFix(string name, XElement node, bool isPreRelease) + public QuickFix Parse(string name, int assetId, int featureId, XElement node, bool isPreRelease) { - SourceObject = name; - TypeName = name/*.Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1)/*.Replace("QuickFix", string.Empty)*/; + var sourceObject = name; + var typeName = name/*.Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1)/*.Replace("QuickFix", string.Empty)*/; - SourceObject = node.Attribute("name")?.Value.Substring(2) ?? string.Empty; - QuickFixName = name; + sourceObject = node.Attribute("name")?.Value.Substring(2) ?? string.Empty; - Summary = node.Element(XmlDocSchema.QuickFix.Summary.ElementName)?.Value.Trim().Replace(" ", " ") ?? string.Empty; - Remarks = node.Element(XmlDocSchema.QuickFix.Remarks.ElementName)?.Value.Trim().Replace(" ", " ") ?? string.Empty; - IsPreRelease = isPreRelease; + var summary = node.Element(XmlDocSchema.QuickFix.Summary.ElementName)?.Value.Trim().Replace(" ", " ") ?? string.Empty; + var remarks = node.Element(XmlDocSchema.QuickFix.Remarks.ElementName)?.Value.Trim().Replace(" ", " ") ?? string.Empty; var canFixNode = node.Element(XmlDocSchema.QuickFix.CanFix.ElementName); - CanFixInProcedure = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ProcedureAttribute)?.Value ?? true.ToString()); - CanFixInModule = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ModuleAttribute)?.Value ?? true.ToString()); - CanFixInProject = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ProjectAttribute)?.Value ?? true.ToString()); + var canFixInProcedure = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ProcedureAttribute)?.Value ?? true.ToString()); + var canFixInModule = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ModuleAttribute)?.Value ?? true.ToString()); + var canFixInProject = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ProjectAttribute)?.Value ?? true.ToString()); var nodes = node.Element(XmlDocSchema.QuickFix.Inspections.ElementName)? .Elements(XmlDocSchema.QuickFix.Inspections.Inspection.ElementName); - if (nodes is IEnumerable inspectionNodes) + string[] inspections = []; + if (nodes is IEnumerable quickfixNodes) { - Inspections = inspectionNodes + inspections = quickfixNodes .Select(e => e.Attribute(XmlDocSchema.QuickFix.Inspections.Inspection.NameAttribute)?.Value.Replace("Inspection", string.Empty)) .OfType() .ToArray(); } - Info = new XmlDocQuickFixInfo - { - Summary = Summary, - Remarks = Remarks, - CanFixInProcedure = CanFixInProcedure, - CanFixInModule = CanFixInModule, - CanFixInProject = CanFixInProject, - Inspections = Inspections?.ToArray() ?? [], - }; - - Examples = ParseExamples(node).ToArray(); - } - - public XmlDocQuickFixInfo Info { get; init; } - - public FeatureXmlDoc Parse(int assetId, int featureId) - { - return new FeatureXmlDoc + return new QuickFix { FeatureId = featureId, - Name = QuickFixName, + Name = name, IsHidden = false, - IsNew = IsPreRelease, - Title = QuickFixName, - Summary = Summary.Trim().Replace(" ", " "), + IsNew = isPreRelease, + + Summary = summary.Trim().Replace(" ", " "), TagAssetId = assetId, - SourceUrl = SourceObject, - Info = Info, - Examples = Examples.Select((e, i) => e.AsExample(string.Empty, i)).ToList(), - Serialized = JsonSerializer.Serialize(Info) + SourceUrl = sourceObject, + Examples = ParseExamples(node).ToArray(), }; } - public IEnumerable Inspections { get; } = Enumerable.Empty(); - public string SourceObject { get; init; } public string TypeName { get; init; } @@ -110,9 +86,9 @@ public FeatureXmlDoc Parse(int assetId, int featureId) .Where(m => m.Description != null) .ToDictionary(m => m.Description, m => (ExampleModuleType)Enum.Parse(typeof(ExampleModuleType), m.Name, true)); - private IEnumerable ParseExamples(XElement node) + private IEnumerable ParseExamples(XElement node) { - var results = new List(); + var results = new List(); foreach (var exampleNode in node.Elements(XmlDocSchema.QuickFix.Example.ElementName)) { var before = exampleNode.Element(XmlDocSchema.QuickFix.Example.Before.ElementName)? @@ -120,7 +96,6 @@ private IEnumerable ParseExamples(XElement node) new ExampleModule { ModuleName = m.Attribute(XmlDocSchema.QuickFix.Example.Before.Module.ModuleNameAttribute)?.Value ?? string.Empty, - Properties = $"{{\"IsBefore\":\"true\"}}", ModuleType = ModuleTypes.TryGetValue(m.Attribute(XmlDocSchema.QuickFix.Example.Before.Module.ModuleTypeAttribute)?.Value ?? string.Empty, out var type) ? type : ExampleModuleType.Any, HtmlContent = m.Nodes().OfType().Single().Value.Trim().Replace(" ", " ") }) @@ -128,7 +103,6 @@ private IEnumerable ParseExamples(XElement node) new ExampleModule { ModuleName = "Module1", - Properties = $"{{\"IsBefore\":\"true\"}}", ModuleType = ExampleModuleType.Any, HtmlContent = x.Value.Trim().Replace(" ", " ") }) ?? []); @@ -138,7 +112,6 @@ private IEnumerable ParseExamples(XElement node) new ExampleModule { ModuleName = m.Attribute(XmlDocSchema.QuickFix.Example.After.Module.ModuleNameAttribute)?.Value ?? string.Empty, - Properties = $"{{\"IsBefore\":\"false\"}}", ModuleType = ModuleTypes.TryGetValue(m.Attribute(XmlDocSchema.QuickFix.Example.After.Module.ModuleTypeAttribute)?.Value ?? string.Empty, out var type) ? type : ExampleModuleType.Any, HtmlContent = m.Nodes().OfType().Single().Value.Trim().Replace(" ", " ") }) @@ -146,14 +119,13 @@ private IEnumerable ParseExamples(XElement node) new ExampleModule { ModuleName = "Module1", - Properties = $"{{\"IsBefore\":\"false\"}}", ModuleType = ExampleModuleType.Any, HtmlContent = x.Value.Trim().Replace(" ", " ") }) ?? []); if (before != null && after != null) { - results.Add(new BeforeAndAfterCodeExample(before, after)); + results.Add(new QuickFixExample { ModulesBefore = before.ToList(), ModulesAfter = after.ToList() }); } else { diff --git a/rubberduckvba.Server/Data/AnnotationsRepository.cs b/rubberduckvba.Server/Data/AnnotationsRepository.cs new file mode 100644 index 0000000..30fff64 --- /dev/null +++ b/rubberduckvba.Server/Data/AnnotationsRepository.cs @@ -0,0 +1,55 @@ +using Microsoft.Extensions.Options; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Data; + +public class AnnotationsRepository : Repository +{ + public AnnotationsRepository(IOptions settings) + : base(settings) { } + + protected override string TableName { get; } = "Annotations"; + protected override string SelectSql { get; } = @" +SELECT + [Id], + [DateTimeInserted], + [DateTimeUpdated], + [FeatureId], + [TagAssetId], + [SourceUrl], + [Name], + [Remarks], + [JsonParameters], + [JsonExamples] +FROM [dbo].[Annotations]"; + + protected override string InsertSql { get; } = @" +INSERT INTO [dbo].[Annotations] ( + [DateTimeInserted], + [FeatureId], + [TagAssetId], + [SourceUrl], + [Name], + [Remarks], + [JsonParameters], + [JsonExamples]) +VALUES ( + GETDATE(), + @featureId, + @tagAssetId, + @sourceUrl, + @name, + @remarks, + @jsonParameters, + @jsonExamples)"; + + protected override string UpdateSql { get; } = @" +UPDATE [dbo].[Annotations] +SET [DateTimeUpdated]=GETDATE(), + [TagAssetId]=@tagAssetId, + [Remarks]=@remarks, + [JsonParameters]=@jsonParameters, + [JsonExamples]=@jsonExamples +WHERE [Id]=@id"; + +} \ No newline at end of file diff --git a/rubberduckvba.Server/Data/DTO.cs b/rubberduckvba.Server/Data/DTO.cs deleted file mode 100644 index 96120f1..0000000 --- a/rubberduckvba.Server/Data/DTO.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.ComponentModel; - -namespace rubberduckvba.com.Server.Data; - -public enum ExampleModuleType -{ - None = 0, - [Description("(Any)")] Any, - [Description("Class Module")] ClassModule, - [Description("Document Module")] DocumentModule, - [Description("Interface Module")] InterfaceModule, - [Description("Predeclared Class")] PredeclaredClass, - [Description("Standard Module")] StandardModule, - [Description("UserForm Module")] UserFormModule -} - -public record class ExampleModule -{ - public static ExampleModule ParseError(string name) => new() - { - ModuleName = name, - HtmlContent = "(error parsing code example from source xmldoc)" - }; - - public int ExampleId { get; init; } - public int SortOrder { get; init; } - public string ModuleName { get; init; } = default!; - public ExampleModuleType ModuleType { get; init; } - public string ModuleTypeName { get; init; } - public string Properties { get; init; } = default!; - public string HtmlContent { get; init; } = default!; - - public Example Example { get; init; } = default!; -} - -public record class Example -{ - public int FeatureItemId { get; init; } - public int SortOrder { get; set; } - public string Properties { get; init; } = default!; - - public FeatureXmlDoc FeatureItem { get; init; } = default!; - public ICollection Modules { get; init; } = []; -} diff --git a/rubberduckvba.Server/Data/DataModel.cs b/rubberduckvba.Server/Data/DataModel.cs index 27e3481..8411b07 100644 --- a/rubberduckvba.Server/Data/DataModel.cs +++ b/rubberduckvba.Server/Data/DataModel.cs @@ -1,90 +1,90 @@ -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; +using rubberduckvba.Server.Model; using System.Diagnostics.CodeAnalysis; -namespace rubberduckvba.com.Server.Data; - -public record class Tag -{ - public int Id { get; init; } - public DateTime DateTimeInserted { get; init; } - public DateTime? DateTimeUpdated { get; init; } - public long ReleaseId { get; init; } - public string Name { get; init; } = default!; - public DateTime DateCreated { get; init; } - public string InstallerDownloadUrl { get; init; } = default!; - public int InstallerDownloads { get; init; } - public bool IsPreRelease { get; init; } -} - -public record class TagAsset -{ - public int Id { get; init; } - public DateTime DateTimeInserted { get; init; } - public DateTime? DateTimeUpdated { get; init; } - public int TagId { get; init; } - public string Name { get; init; } = default!; - public string DownloadUrl { get; init; } = default!; -} - - -public record class TagGraph : Tag -{ - public IEnumerable Assets { get; init; } = []; -} - -public record class Feature -{ - public int Id { get; init; } - public int? ParentId { get; init; } - public DateTime DateTimeInserted { get; init; } - public DateTime? DateTimeUpdated { get; init; } - public int RepositoryId { get; init; } - public string Name { get; init; } = default!; - public string Title { get; init; } = default!; - public string ShortDescription { get; init; } = default!; - public string Description { get; init; } = default!; - public bool IsHidden { get; init; } - public bool IsNew { get; init; } - public bool HasImage { get; init; } -} - -public record class FeatureGraph : Feature -{ - public static FeatureGraph FromFeature(Feature feature) => new() - { - Id = feature.Id, - DateTimeInserted = feature.DateTimeInserted, - DateTimeUpdated = feature.DateTimeUpdated, - RepositoryId = feature.RepositoryId, - ParentId = feature.ParentId, - Name = feature.Name, - Title = feature.Title, - ShortDescription = feature.ShortDescription, - Description = feature.Description, - IsHidden = feature.IsHidden, - IsNew = feature.IsNew, - }; - - public string ParentName { get; init; } = default!; - public string ParentTitle { get; init; } = default!; - - public IEnumerable Features { get; init; } = []; - public IEnumerable Items { get; init; } = []; - - public IEnumerable Inspections { get; init; } = []; -} +namespace rubberduckvba.Server.Data; + +//public record class Tag +//{ +// public int Id { get; init; } +// public DateTime DateTimeInserted { get; init; } +// public DateTime? DateTimeUpdated { get; init; } +// public long ReleaseId { get; init; } +// public string Name { get; init; } = default!; +// public DateTime DateCreated { get; init; } +// public string InstallerDownloadUrl { get; init; } = default!; +// public int InstallerDownloads { get; init; } +// public bool IsPreRelease { get; init; } +//} + +//public record class TagAsset +//{ +// public int Id { get; init; } +// public DateTime DateTimeInserted { get; init; } +// public DateTime? DateTimeUpdated { get; init; } +// public int TagId { get; init; } +// public string Name { get; init; } = default!; +// public string DownloadUrl { get; init; } = default!; +//} + + +//public record class TagGraph : Tag +//{ +// public IEnumerable Assets { get; init; } = []; +//} + +//public record class Feature +//{ +// public int Id { get; init; } +// public int? ParentId { get; init; } +// public DateTime DateTimeInserted { get; init; } +// public DateTime? DateTimeUpdated { get; init; } +// public int RepositoryId { get; init; } +// public string Name { get; init; } = default!; +// public string Title { get; init; } = default!; +// public string ShortDescription { get; init; } = default!; +// public string Description { get; init; } = default!; +// public bool IsHidden { get; init; } +// public bool IsNew { get; init; } +// public bool HasImage { get; init; } +//} + +//public record class FeatureGraph : Feature +//{ +// public static FeatureGraph FromFeature(Feature feature) => new() +// { +// Id = feature.Id, +// DateTimeInserted = feature.DateTimeInserted, +// DateTimeUpdated = feature.DateTimeUpdated, +// RepositoryId = feature.RepositoryId, +// ParentId = feature.ParentId, +// Name = feature.Name, +// Title = feature.Title, +// ShortDescription = feature.ShortDescription, +// Description = feature.Description, +// IsHidden = feature.IsHidden, +// IsNew = feature.IsNew, +// }; + +// public string ParentName { get; init; } = default!; +// public string ParentTitle { get; init; } = default!; + +// public IEnumerable Features { get; init; } = []; +// public IEnumerable Items { get; init; } = []; + +// public IEnumerable Inspections { get; init; } = []; +//} public record class FeatureXmlDoc : FeatureXmlDoc { public TInfo? Info { get; init; } = default!; } -public record class FeatureXmlDoc +public record class FeatureXmlDoc { public int Id { get; init; } public DateTime DateTimeInserted { get; init; } public DateTime? DateTimeUpdated { get; init; } - + public int FeatureId { get; init; } public string FeatureName { get; init; } public string FeatureTitle { get; init; } @@ -101,7 +101,7 @@ public record class FeatureXmlDoc public int TagId { get; init; } public string SourceUrl { get; init; } = default!; - + public string Serialized { get; init; } = default!; public string TagName { get; init; } = default!; @@ -112,17 +112,17 @@ public class XmlDocBranchIntersectComparer : EqualityComparer { public override bool Equals(FeatureXmlDoc? x, FeatureXmlDoc? y) { - if (x is null && y is null) + if (x is null && y is null) { return true; } - if (x is null || y is null) + if (x is null || y is null) { return false; } - if (ReferenceEquals(x, y)) + if (ReferenceEquals(x, y)) { return true; } @@ -185,7 +185,7 @@ public record class SynchronizationRequest public string JobId { get; init; } = default!; public DateTime UtcDateTimeStarted { get; init; } = default!; public DateTime? UtcDateTimeEnded { get; init; } = default!; - public SyncStatus Status { get; init; } = default!; + public SyncStatus Status { get; init; } = default!; public string Message { get; init; } = default!; } @@ -199,4 +199,4 @@ public static class SynchronizationMessage SyncStatus.Error => "Synchronization failed.", _ => "(unknown status)" }; -} \ No newline at end of file +} diff --git a/rubberduckvba.Server/Data/FeaturesRepository.cs b/rubberduckvba.Server/Data/FeaturesRepository.cs new file mode 100644 index 0000000..181cf1f --- /dev/null +++ b/rubberduckvba.Server/Data/FeaturesRepository.cs @@ -0,0 +1,65 @@ +using Microsoft.Extensions.Options; +using rubberduckvba.Server; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Data; + +public abstract class FeaturesRepository : Repository +{ + public FeaturesRepository(IOptions settings) + : base(settings) { } + + protected override string TableName { get; } = "Features"; + + protected override string SelectSql { get; } = @" +SELECT + [Id], + [DateTimeInserted], + [DateTimeUpdated], + [RepositoryId], + [Name], + [Title], + [ShortDescription], + [IsNew], + [HasImage] +FROM [dbo].[Features]"; + + protected override string InsertSql { get; } = @" +INSERT INTO [dbo].[Features] ( + [DateTimeInserted], + [RepositoryId], + [ParentId], + [Name], + [Title], + [ShortDescription], + [Description], + [IsHidden], + [IsNew], + [HasImage]) +VALUES ( + GETDATE(), + @repositoryId, + @parentId, + @name, + @title, + @shortDescription, + @description, + @isHidden, + @isNew, + @hasImage)"; + + protected override string UpdateSql { get; } = @" +UPDATE [dbo].[Features] SET + [DateTimeUpdated]=GETDATE(), + [RepositoryId]=@repositoryId, + [ParentId]=@parentId, + [Name]=@name, + [Title]=@title, + [ShortDescription]=@shortDescription, + [Description]=@description, + [IsHidden]=@isHidden, + [IsNew]=@isNew, + [HasImage]=@hasImage +WHERE [Id]=@id"; + +} diff --git a/rubberduckvba.Server/Data/InspectionsRepository.cs b/rubberduckvba.Server/Data/InspectionsRepository.cs new file mode 100644 index 0000000..ed39076 --- /dev/null +++ b/rubberduckvba.Server/Data/InspectionsRepository.cs @@ -0,0 +1,79 @@ +using Microsoft.Extensions.Options; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Data; + +public class InspectionsRepository : Repository +{ + public InspectionsRepository(IOptions settings) + : base(settings) { } + + protected override string TableName { get; } = "Inspections"; + protected override string SelectSql { get; } = @" +SELECT + [Id], + [DateTimeInserted], + [DateTimeUpdated], + [FeatureId], + [TagAssetId], + [SourceUrl], + [Name], + [InspectionType], + [DefaultSeverity], + [Summary], + [Reasoning], + [Remarks], + [HostApp], + [References], + [QuickFixes], + [JsonExamples] +FROM [dbo].[Inspections]"; + + protected override string InsertSql { get; } = @" +INSERT INTO [dbo].[Inspections] ( + [DateTimeInserted], + [FeatureId], + [TagAssetId], + [SourceUrl], + [Name], + [InspectionType], + [DefaultSeverity], + [Summary], + [Reasoning], + [Remarks], + [HostApp], + [References], + [QuickFixes], + [JsonExamples]) +VALUES ( + GETDATE(), + @featureId, + @tagAssetId, + @sourceUrl, + @name, + @inspectionType, + @defaultSeverity, + @summary, + @reasoning, + @remarks, + @hostApp, + @references, + @quickfixes, + @jsonExamples)"; + + protected override string UpdateSql { get; } = @" +UPDATE [dbo].[Inspections] +SET [DateTimeUpdated]=GETDATE(), + [TagAssetId]=@tagAssetId, + [InspectionType]=@inspectionType, + [DefaultSeverity]=@defaultSeverity, + [Summary]=@summary, + [Reasoning]=@reasoning, + [Remarks]=@remarks, + [HostApp]=@hostApp, + [References]=@references, + [QuickFixes]=@quickFixes, + [JsonExamples]=@jsonExamples +WHERE [Id]=@id"; + +} diff --git a/rubberduckvba.Server/Data/QuickFixRepository.cs b/rubberduckvba.Server/Data/QuickFixRepository.cs new file mode 100644 index 0000000..62cb39d --- /dev/null +++ b/rubberduckvba.Server/Data/QuickFixRepository.cs @@ -0,0 +1,78 @@ +using Microsoft.Extensions.Options; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Data; + +public class QuickFixRepository : Repository +{ + public QuickFixRepository(IOptions settings) + : base(settings) { } + protected override string TableName { get; } = "QuickFixes"; + + protected override string SelectSql { get; } = @" +SELECT + [Id], + [DateTimeInserted], + [DateTimeUpdated], + [FeatureId], + [TagAssetId], + [SourceUrl], + [Name], + [Summary], + [Remarks], + [CanFixMultiple], + [CanFixProcedure], + [CanFixModule], + [CanFixProject], + [CanFixAll], + [Inspections], + [JsonExamples] +FROM [dbo].[QuickFixes]"; + + protected override string InsertSql { get; } = @" +INSERT INTO [dbo].[QuickFixes] ( + [DateTimeInserted], + [FeatureId], + [TagAssetId], + [SourceUrl], + [Name], + [Summary], + [Remarks], + [CanFixMultiple], + [CanFixProcedure], + [CanFixModule], + [CanFixProject], + [CanFixAll], + [Inspections], + [JsonExamples] +VALUES ( + GETDATE(), + @featureId, + @tagAssetId, + @sourceUrl, + @name, + @summary, + @remarks, + @canFixMultiple, + @canFixProcedure, + @canFixModule, + @canFixProject, + @canFixAll, + @inspections, + @jsonExamples)"; + + protected override string UpdateSql { get; } = @" +UPDATE [dbo].[QuickFixes] +SET [DateTimeUpdated]=GETDATE(), + [TagAssetId]=@tagAssetId, + [Summary]=@summary, + [Remarks]=@remarks, + [CanFixMultiple]=@canFixMultiple, + [CanFixProcedure]=@canFixProcedure, + [CanFixModule]=@canFixModule, + [CanFixProject]=@canFixProject, + [CanFixAll]=@canFixAll, + [JsonExamples]=@jsonExamples +WHERE [Id]=@id"; + +} \ No newline at end of file diff --git a/rubberduckvba.Server/Data/Repository.cs b/rubberduckvba.Server/Data/Repository.cs new file mode 100644 index 0000000..81c48e3 --- /dev/null +++ b/rubberduckvba.Server/Data/Repository.cs @@ -0,0 +1,95 @@ +using Dapper; +using Microsoft.Data.SqlClient; +using Microsoft.Extensions.Options; +using rubberduckvba.Server.Model.Entity; +using System.Data; + +namespace rubberduckvba.Server.Data; + +public interface IRepository where TEntity : Entity +{ + int GetId(string name); + TEntity GetById(int id); + IEnumerable GetAll(int? parentId = default); + TEntity Insert(TEntity entity); + IEnumerable Insert(IEnumerable entities); + void Update(TEntity entity); + void Update(IEnumerable entities); +} + +public abstract class Repository : IRepository where TEntity : Entity +{ + private readonly string _connectionString; + + protected Repository(IOptions settings) + { + _connectionString = settings.Value.RubberduckDb ?? throw new InvalidOperationException(); + } + + protected IEnumerable Query(Func> query) + { + using var db = new SqlConnection(_connectionString); + db.Open(); + return query(db); + } + + protected T Get(Func query) + { + using var db = new SqlConnection(_connectionString); + db.Open(); + return query(db); + } + + protected void Execute(Action action) + { + using var db = new SqlConnection(_connectionString); + db.Open(); + action(db); + } + + protected abstract string TableName { get; } + protected abstract string SelectSql { get; } + protected abstract string InsertSql { get; } + protected abstract string UpdateSql { get; } + + protected virtual string? ParentFKColumnName => "ParentFKColumnName"; + + public virtual int GetId(string name) => Get(db => db.QuerySingle($"SELECT [Id] FROM [dbo].[{TableName}] WHERE [Name]=@name", new { name })); + public virtual TEntity GetById(int id) => Get(db => db.QuerySingle(SelectSql + " WHERE [Id]=@id", new { id })); + public virtual IEnumerable GetAll(int? parentId = default) => + ParentFKColumnName is null || !parentId.HasValue + ? Query(db => db.Query(SelectSql)) + : Query(db => db.Query($"{SelectSql} WHERE [{ParentFKColumnName}]=@parentId", new { parentId })); + public virtual TEntity Insert(TEntity entity) => Insert([entity]).Single(); + public virtual IEnumerable Insert(IEnumerable entities) + { + using var db = new SqlConnection(_connectionString); + db.Open(); + + using var transaction = db.BeginTransaction(); + var inserts = new List(); + foreach (var entity in entities) + { + var id = db.ExecuteScalar(InsertSql + "; SELECT SCOPE_IDENTITY()", entity, transaction); + inserts.Add(entity with { Id = id }); + } + + transaction.Commit(); + return inserts; + } + + public virtual void Update(TEntity entity) => Update([entity]); + public virtual void Update(IEnumerable entities) + { + using var db = new SqlConnection(_connectionString); + db.Open(); + + using var transaction = db.BeginTransaction(); + foreach (var entity in entities) + { + db.Execute(UpdateSql, entity, transaction); + } + + transaction.Commit(); + } +} diff --git a/rubberduckvba.Server/Data/TagAssetsRepository.cs b/rubberduckvba.Server/Data/TagAssetsRepository.cs new file mode 100644 index 0000000..0e36264 --- /dev/null +++ b/rubberduckvba.Server/Data/TagAssetsRepository.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Options; +using rubberduckvba.Server; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Data; + +public class TagAssetsRepository : Repository +{ + public TagAssetsRepository(IOptions settings) + : base(settings) { } + + protected override string TableName { get; } = "TagAssets"; + protected override string? ParentFKColumnName => "TagId"; + + protected override string SelectSql { get; } = @" +SELECT + [Id], + [DateTimeInserted], + [DateTimeUpdated], + [TagId], + [Name], + [DownloadUrl] +FROM [dbo].[TagAssets]"; + + protected override string InsertSql { get; } = @" +INSERT INTO [dbo].[TagAssets] ( + [DateTimeInserted], + [TagId], + [Name], + [DownloadUrl]) +VALUES ( + GETDATE(), + @tagId, + @name, + @downloadUrl);"; + + protected override string UpdateSql => throw new NotImplementedException(); +} \ No newline at end of file diff --git a/rubberduckvba.Server/Data/TagsRepository.cs b/rubberduckvba.Server/Data/TagsRepository.cs new file mode 100644 index 0000000..f847f96 --- /dev/null +++ b/rubberduckvba.Server/Data/TagsRepository.cs @@ -0,0 +1,50 @@ +using Microsoft.Extensions.Options; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Data; + +public class TagsRepository : Repository +{ + public TagsRepository(IOptions settings) + : base(settings) { } + + protected override string TableName { get; } = "Tags"; + protected override string SelectSql { get; } = @" +SELECT + [Id], + [DateTimeInserted], + [DateTimeUpdated], + [RepositoryId], + [ReleaseId], + [Name], + [DateCreated], + [InstallerDownloadUrl], + [InstallerDownloads], + [IsPreRelease] +FROM [dbo].[Tags]"; + + protected override string InsertSql { get; } = @" +INSERT INTO [Tags] ( + [DateTimeInserted], + [RepositoryId], + [Name], + [DateCreated], + [InstallerDownloadUrl], + [InstallerDownloads], + [IsPreRelease]) +VALUES ( + GETDATE(), + @repositoryId, + @name, + @dateCreated, + @installerDownloadUrl, + @installerDownloads, + @isPreRelease)"; + + protected override string UpdateSql { get; } = @" +UPDATE [dbo].[Tags] +SET [DateTimeUpdated]=GETDATE(), + [InstallerDownloads]=@installerDownloads +WHERE [Id]=@id"; + +} diff --git a/rubberduckvba.Server/GitHubAuthenticationHandler.cs b/rubberduckvba.Server/GitHubAuthenticationHandler.cs index 1c6aae0..5e0a85e 100644 --- a/rubberduckvba.Server/GitHubAuthenticationHandler.cs +++ b/rubberduckvba.Server/GitHubAuthenticationHandler.cs @@ -1,18 +1,18 @@  using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Options; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Services; using System.Security.Claims; using System.Text.Encodings.Web; -namespace rubberduckvba.com.Server; +namespace rubberduckvba.Server; public class GitHubAuthenticationHandler : AuthenticationHandler { private readonly IGitHubClientService _github; public GitHubAuthenticationHandler(IGitHubClientService github, - IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) + IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) : base(options, logger, encoder) { _github = github; @@ -23,7 +23,7 @@ protected async override Task HandleAuthenticateAsync() var token = Context.Request.Headers["X-ACCESS-TOKEN"].SingleOrDefault(); if (token is null) { - return AuthenticateResult.Fail("No token was provided"); + return AuthenticateResult.NoResult(); } var principal = await _github.ValidateTokenAsync(token); diff --git a/rubberduckvba.Server/GitHubSettings.cs b/rubberduckvba.Server/GitHubSettings.cs index 0c35240..fc941b6 100644 --- a/rubberduckvba.Server/GitHubSettings.cs +++ b/rubberduckvba.Server/GitHubSettings.cs @@ -1,6 +1,6 @@ using Hangfire; -namespace rubberduckvba.com.Server; +namespace rubberduckvba.Server; public record class ApiSettings { diff --git a/rubberduckvba.Server/Hangfire/DockerDashboardFilter.cs b/rubberduckvba.Server/Hangfire/DockerDashboardFilter.cs index b724224..3239f15 100644 --- a/rubberduckvba.Server/Hangfire/DockerDashboardFilter.cs +++ b/rubberduckvba.Server/Hangfire/DockerDashboardFilter.cs @@ -1,7 +1,7 @@ using Hangfire.Annotations; using Hangfire.Dashboard; -namespace rubberduckvba.com.Server.Hangfire; +namespace rubberduckvba.Server.Hangfire; public class DockerDashboardFilter : IDashboardAuthorizationFilter { diff --git a/rubberduckvba.Server/Hangfire/HangfireConstants.cs b/rubberduckvba.Server/Hangfire/HangfireConstants.cs index b07f62e..ac6c08b 100644 --- a/rubberduckvba.Server/Hangfire/HangfireConstants.cs +++ b/rubberduckvba.Server/Hangfire/HangfireConstants.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.Hangfire; +namespace rubberduckvba.Server.Hangfire; public static class HangfireConstants { diff --git a/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs b/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs index 589e544..5e6fc8d 100644 --- a/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs +++ b/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs @@ -4,15 +4,15 @@ using NLog.Extensions.Logging; using NLog.Targets; using RubberduckServices; -using rubberduckvba.com.Server.ContentSynchronization; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.ContentSynchronization; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Services; using System.Diagnostics; -namespace rubberduckvba.com.Server.Hangfire; +namespace rubberduckvba.Server.Hangfire; public static class QueuedUpdateOrchestrator { @@ -97,7 +97,6 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton, SynchronizationPipelineFactory>(); services.AddSingleton(); diff --git a/rubberduckvba.Server/Model/Annotation.cs b/rubberduckvba.Server/Model/Annotation.cs new file mode 100644 index 0000000..18ad001 --- /dev/null +++ b/rubberduckvba.Server/Model/Annotation.cs @@ -0,0 +1,46 @@ +using rubberduckvba.Server.Model.Entity; +using System.Text.Json; + +namespace rubberduckvba.Server.Model; + +public record class Annotation() +{ + public Annotation(AnnotationEntity entity) : this() + { + Id = entity.Id; + DateTimeInserted = entity.DateTimeInserted; + DateTimeUpdated = entity.DateTimeUpdated; + FeatureId = entity.FeatureId; + TagAssetId = entity.TagAssetId; + SourceUrl = entity.SourceUrl; + Name = entity.Name; + Parameters = entity.JsonParameters is null ? [] : JsonSerializer.Deserialize(entity.JsonParameters) ?? []; + Examples = entity.JsonExamples is null ? [] : JsonSerializer.Deserialize(entity.JsonExamples) ?? []; + } + + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public int FeatureId { get; init; } + public int TagAssetId { get; init; } + public string SourceUrl { get; init; } = string.Empty; + public bool IsNew { get; init; } + public bool IsDiscontinued { get; init; } + public bool IsHidden { get; init; } + public string Name { get; init; } = string.Empty; + public AnnotationParameter[] Parameters { get; init; } = []; + public AnnotationExample[] Examples { get; init; } = []; + + internal AnnotationEntity ToEntity() => new() + { + Id = Id, + DateTimeInserted = DateTimeInserted, + DateTimeUpdated = DateTimeUpdated, + FeatureId = FeatureId, + TagAssetId = TagAssetId, + SourceUrl = SourceUrl, + Name = Name, + JsonParameters = JsonSerializer.Serialize(Parameters), + JsonExamples = JsonSerializer.Serialize(Examples), + }; +} diff --git a/rubberduckvba.Server/Model/AnnotationParameter.cs b/rubberduckvba.Server/Model/AnnotationParameter.cs new file mode 100644 index 0000000..05c50eb --- /dev/null +++ b/rubberduckvba.Server/Model/AnnotationParameter.cs @@ -0,0 +1,9 @@ +namespace rubberduckvba.Server.Model; + +public record class AnnotationParameter +{ + public string Name { get; init; } = string.Empty; + public string Type { get; init; } = string.Empty; + public bool Required { get; init; } + public string Description { get; init; } = string.Empty; +} diff --git a/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs b/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs new file mode 100644 index 0000000..8087369 --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs @@ -0,0 +1,11 @@ +namespace rubberduckvba.Server.Model.Entity; + +public record class AnnotationEntity : Entity +{ + public int FeatureId { get; init; } + public int TagAssetId { get; init; } + public string SourceUrl { get; init; } = string.Empty; + public string? JsonParameters { get; init; } + public string? JsonExamples { get; init; } + +} diff --git a/rubberduckvba.Server/Model/Entity/Entity.cs b/rubberduckvba.Server/Model/Entity/Entity.cs new file mode 100644 index 0000000..cbee48a --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/Entity.cs @@ -0,0 +1,9 @@ +namespace rubberduckvba.Server.Model.Entity; + +public abstract record class Entity +{ + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public string Name { get; init; } = string.Empty; +} diff --git a/rubberduckvba.Server/Model/Entity/FeatureEntity.cs b/rubberduckvba.Server/Model/Entity/FeatureEntity.cs new file mode 100644 index 0000000..85db719 --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/FeatureEntity.cs @@ -0,0 +1,13 @@ +namespace rubberduckvba.Server.Model.Entity; + +public record class FeatureEntity : Entity +{ + public int? ParentId { get; init; } + public int RepositoryId { get; init; } + public string Title { get; init; } = default!; + public string ShortDescription { get; init; } = default!; + public string Description { get; init; } = default!; + public bool IsHidden { get; init; } + public bool IsNew { get; init; } + public bool HasImage { get; init; } +} diff --git a/rubberduckvba.Server/Model/Entity/InspectionEntity.cs b/rubberduckvba.Server/Model/Entity/InspectionEntity.cs new file mode 100644 index 0000000..ae207dd --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/InspectionEntity.cs @@ -0,0 +1,20 @@ +namespace rubberduckvba.Server.Model.Entity; + +public record class InspectionEntity : Entity +{ + public int FeatureId { get; init; } + public int TagAssetId { get; init; } + public string SourceUrl { get; init; } = string.Empty; + public string InspectionType { get; init; } = string.Empty; + public string DefaultSeverity { get; init; } = string.Empty; + public string Summary { get; init; } = string.Empty; + public string Reasoning { get; init; } = string.Empty; + public string? Remarks { get; init; } + public string? HostApp { get; init; } + public bool IsNew { get; init; } + public bool IsDiscontinued { get; init; } + public bool IsHidden { get; init; } + public string? References { get; init; } + public string? QuickFixes { get; init; } + public string? JsonExamples { get; init; } +} diff --git a/rubberduckvba.Server/Model/Entity/QuickFixEntity.cs b/rubberduckvba.Server/Model/Entity/QuickFixEntity.cs new file mode 100644 index 0000000..afc4d3e --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/QuickFixEntity.cs @@ -0,0 +1,20 @@ +namespace rubberduckvba.Server.Model.Entity; + +public record class QuickFixEntity : Entity +{ + public int FeatureId { get; init; } + public int TagAssetId { get; init; } + public string SourceUrl { get; init; } = string.Empty; + public bool IsNew { get; init; } + public bool IsDiscontinued { get; init; } + public bool IsHidden { get; init; } + public string Summary { get; init; } = string.Empty; + public string? Remarks { get; init; } + public bool CanFixMultiple { get; init; } + public bool CanFixProcedure { get; init; } + public bool CanFixModule { get; init; } + public bool CanFixProject { get; init; } + public bool CanFixAll { get; init; } + public string Inspections { get; init; } = string.Empty; + public string? JsonExamples { get; init; } +} diff --git a/rubberduckvba.Server/Model/Entity/TagAssetEntity.cs b/rubberduckvba.Server/Model/Entity/TagAssetEntity.cs new file mode 100644 index 0000000..3d610f1 --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/TagAssetEntity.cs @@ -0,0 +1,7 @@ +namespace rubberduckvba.Server.Model.Entity; + +public record class TagAssetEntity : Entity +{ + public int TagId { get; init; } + public string DownloadUrl { get; init; } = default!; +} diff --git a/rubberduckvba.Server/Model/Entity/TagEntity.cs b/rubberduckvba.Server/Model/Entity/TagEntity.cs new file mode 100644 index 0000000..d656e65 --- /dev/null +++ b/rubberduckvba.Server/Model/Entity/TagEntity.cs @@ -0,0 +1,10 @@ +namespace rubberduckvba.Server.Model.Entity; + +public record class TagEntity : Entity +{ + public long ReleaseId { get; init; } + public DateTime DateCreated { get; init; } + public string InstallerDownloadUrl { get; init; } = default!; + public int InstallerDownloads { get; init; } + public bool IsPreRelease { get; init; } +} diff --git a/rubberduckvba.Server/Model/Example.cs b/rubberduckvba.Server/Model/Example.cs new file mode 100644 index 0000000..7035d0d --- /dev/null +++ b/rubberduckvba.Server/Model/Example.cs @@ -0,0 +1,33 @@ +namespace rubberduckvba.Server.Model; + +public record class Example +{ + public string Description { get; init; } = default!; + public int SortOrder { get; init; } +} + +public record class InspectionExample : Example +{ + /// + /// True if the example depicts code a situation that would make an inspection issue a result. + /// + public bool HasResult { get; init; } + public ICollection Modules { get; init; } = []; +} + +public record class QuickFixExample : Example +{ + /// + /// The code modules before the quickfix is applied. + /// + public ICollection ModulesBefore { get; init; } = []; + /// + /// The code modules after the quickfix is applied. + /// + public ICollection ModulesAfter { get; init; } = []; +} + +public record class AnnotationExample : Example +{ + public ICollection Modules { get; init; } = []; +} diff --git a/rubberduckvba.Server/Model/ExampleModule.cs b/rubberduckvba.Server/Model/ExampleModule.cs new file mode 100644 index 0000000..a6446ab --- /dev/null +++ b/rubberduckvba.Server/Model/ExampleModule.cs @@ -0,0 +1,26 @@ +using System.Reflection; + +namespace rubberduckvba.Server.Model; + +public record class ExampleModule +{ + private static readonly IDictionary ModuleTypes = + typeof(ExampleModuleType) + .GetMembers() + .Select(m => (m.Name, m.GetCustomAttributes().OfType().SingleOrDefault()?.Description)) + .Where(m => m.Description != null) + .ToDictionary(m => (ExampleModuleType)Enum.Parse(typeof(ExampleModuleType), m.Name, true), m => m.Description!); + + public static ExampleModule ParseError(string name) => new() + { + ModuleName = name, + HtmlContent = "(error parsing code example from source xmldoc)" + }; + + public string ModuleName { get; init; } = default!; + public ExampleModuleType ModuleType { get; init; } + public string ModuleTypeName => ModuleTypes[ModuleType]; + + public string HtmlContent { get; init; } = default!; + public string? Description { get; init; } = default!; +} diff --git a/rubberduckvba.Server/Model/ExampleModuleType.cs b/rubberduckvba.Server/Model/ExampleModuleType.cs new file mode 100644 index 0000000..9a78bf9 --- /dev/null +++ b/rubberduckvba.Server/Model/ExampleModuleType.cs @@ -0,0 +1,15 @@ +using System.ComponentModel; + +namespace rubberduckvba.Server.Model; + +public enum ExampleModuleType +{ + None = 0, + [Description("(Any)")] Any, + [Description("Class Module")] ClassModule, + [Description("Document Module")] DocumentModule, + [Description("Interface Module")] InterfaceModule, + [Description("Predeclared Class")] PredeclaredClass, + [Description("Standard Module")] StandardModule, + [Description("UserForm Module")] UserFormModule +} diff --git a/rubberduckvba.Server/Model/Feature.cs b/rubberduckvba.Server/Model/Feature.cs new file mode 100644 index 0000000..72cbe64 --- /dev/null +++ b/rubberduckvba.Server/Model/Feature.cs @@ -0,0 +1,65 @@ +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Model; + +public record class Feature() +{ + public Feature(FeatureEntity entity) : this() + { + Id = entity.Id; + DateTimeInserted = entity.DateTimeInserted; + DateTimeUpdated = entity.DateTimeUpdated; + Name = entity.Name; + ParentId = entity.ParentId; + RepositoryId = (Services.RepositoryId)entity.RepositoryId; + Title = entity.Title; + ShortDescription = entity.ShortDescription; + Description = entity.Description; + IsHidden = entity.IsHidden; + IsNew = entity.IsNew; + HasImage = entity.HasImage; + } + + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public string Name { get; init; } = string.Empty; + + public int? ParentId { get; init; } + public Services.RepositoryId RepositoryId { get; init; } = Services.RepositoryId.Rubberduck; + public string Title { get; init; } = string.Empty; + public string ShortDescription { get; init; } = string.Empty; + public string Description { get; init; } = string.Empty; + public bool IsHidden { get; init; } + public bool IsNew { get; init; } + public bool HasImage { get; init; } + + public FeatureEntity ToEntity() => new() + { + Id = Id, + DateTimeInserted = DateTimeInserted, + DateTimeUpdated = DateTimeUpdated, + Description = Description, + HasImage = HasImage, + IsHidden = IsHidden, + IsNew = IsNew, + Name = Name, + ShortDescription = ShortDescription, + ParentId = ParentId, + RepositoryId = (int)Services.RepositoryId.Rubberduck, + Title = Title, + }; +} + +public record class FeatureGraph : Feature +{ + public FeatureGraph(FeatureEntity entity) : base(entity) { } + + public string? ParentName { get; init; } + public string? ParentTitle { get; init; } + + public IEnumerable Features { get; init; } = []; + public IEnumerable Inspections { get; init; } = []; + public IEnumerable QuickFixes { get; init; } = []; + public IEnumerable Annotations { get; init; } = []; +} \ No newline at end of file diff --git a/rubberduckvba.Server/Model/Inspection.cs b/rubberduckvba.Server/Model/Inspection.cs new file mode 100644 index 0000000..ffbb53c --- /dev/null +++ b/rubberduckvba.Server/Model/Inspection.cs @@ -0,0 +1,93 @@ +using rubberduckvba.Server.Model.Entity; +using System.Text.Json; + +namespace rubberduckvba.Server.Model; + +public record class Inspection() +{ + public Inspection(InspectionEntity entity) : this() + { + Id = entity.Id; + DateTimeInserted = entity.DateTimeInserted; + DateTimeUpdated = entity.DateTimeUpdated; + FeatureId = entity.FeatureId; + TagAssetId = entity.TagAssetId; + SourceUrl = entity.SourceUrl; + + IsNew = entity.IsNew; + IsDiscontinued = entity.IsDiscontinued; + IsHidden = entity.IsHidden; + + Name = entity.Name; + InspectionType = entity.InspectionType; + DefaultSeverity = entity.DefaultSeverity; + Summary = entity.Summary; + Reasoning = entity.Reasoning; + Remarks = entity.Remarks; + HostApp = entity.HostApp; + References = entity.References?.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? []; + QuickFixes = entity.QuickFixes?.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? []; + Examples = entity.JsonExamples is null ? [] : JsonSerializer.Deserialize(entity.JsonExamples) ?? []; + } + + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public int FeatureId { get; init; } + public int TagAssetId { get; init; } + public string SourceUrl { get; init; } = string.Empty; + + public bool IsNew { get; init; } + public bool IsDiscontinued { get; init; } + public bool IsHidden { get; init; } + + public string Name { get; init; } = string.Empty; + public string InspectionType { get; init; } = string.Empty; + public string DefaultSeverity { get; init; } = string.Empty; + public string Summary { get; init; } = string.Empty; + public string Reasoning { get; init; } = string.Empty; + public string? Remarks { get; init; } + public string? HostApp { get; init; } + public string[] References { get; init; } = []; + public string[] QuickFixes { get; init; } = []; + public InspectionExample[] Examples { get; init; } = []; + + public InspectionEntity ToEntity() => new() + { + Id = Id, + FeatureId = FeatureId, + DateTimeInserted = DateTimeInserted, + DateTimeUpdated = DateTimeUpdated, + TagAssetId = TagAssetId, + SourceUrl = SourceUrl, + IsNew = IsNew, + IsDiscontinued = IsDiscontinued, + IsHidden = IsHidden, + Name = Name, + InspectionType = InspectionType, + DefaultSeverity = DefaultSeverity, + Summary = Summary, + Reasoning = Reasoning, + Remarks = Remarks, + HostApp = HostApp, + JsonExamples = JsonSerializer.Serialize(Examples), + QuickFixes = string.Join(',', QuickFixes), + References = string.Join(',', References), + }; + + public int GetContentHash() + { + var hash = new HashCode(); + hash.Add(DefaultSeverity); + hash.Add(Summary); + hash.Add(Reasoning); + hash.Add(Remarks); + hash.Add(HostApp); + hash.Add(Name); + hash.Add(InspectionType); + hash.Add(JsonSerializer.Serialize(Examples)); + hash.Add(string.Join(',', QuickFixes)); + hash.Add(string.Join(',', References)); + return hash.ToHashCode(); + } +} diff --git a/rubberduckvba.Server/Model/QuickFix.cs b/rubberduckvba.Server/Model/QuickFix.cs new file mode 100644 index 0000000..e78ba59 --- /dev/null +++ b/rubberduckvba.Server/Model/QuickFix.cs @@ -0,0 +1,73 @@ +using rubberduckvba.Server.Model.Entity; +using System.Text.Json; + +namespace rubberduckvba.Server.Model; + +public record class QuickFix() +{ + public QuickFix(QuickFixEntity entity) : this() + { + Id = entity.Id; + DateTimeInserted = entity.DateTimeInserted; + DateTimeUpdated = entity.DateTimeUpdated; + FeatureId = entity.FeatureId; + TagAssetId = entity.TagAssetId; + SourceUrl = entity.SourceUrl; + IsNew = entity.IsNew; + IsDiscontinued = entity.IsDiscontinued; + IsHidden = entity.IsHidden; + Name = entity.Name; + Summary = entity.Summary; + Remarks = entity.Remarks; + CanFixMultiple = entity.CanFixMultiple; + CanFixProcedure = entity.CanFixProcedure; + CanFixModule = entity.CanFixModule; + CanFixProject = entity.CanFixProject; + CanFixAll = entity.CanFixAll; + Inspections = entity.Inspections.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) ?? []; + Examples = entity.JsonExamples is null ? [] : JsonSerializer.Deserialize(entity.JsonExamples) ?? []; + } + + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public int FeatureId { get; init; } + public int TagAssetId { get; init; } + public string SourceUrl { get; init; } = string.Empty; + public bool IsNew { get; init; } + public bool IsDiscontinued { get; init; } + public bool IsHidden { get; init; } + public string Name { get; init; } = string.Empty; + public string Summary { get; init; } = string.Empty; + public string? Remarks { get; init; } + public bool CanFixMultiple { get; init; } + public bool CanFixProcedure { get; init; } + public bool CanFixModule { get; init; } + public bool CanFixProject { get; init; } + public bool CanFixAll { get; init; } + public string[] Inspections { get; init; } = []; + public QuickFixExample[] Examples { get; init; } = []; + + public QuickFixEntity ToEntity() => new() + { + Id = Id, + DateTimeInserted = DateTimeInserted, + DateTimeUpdated = DateTimeUpdated, + FeatureId = FeatureId, + SourceUrl = SourceUrl, + IsNew = IsNew, + IsDiscontinued = IsDiscontinued, + IsHidden = IsHidden, + Name = Name, + Summary = Summary, + Remarks = Remarks, + CanFixMultiple = CanFixMultiple, + CanFixProcedure = CanFixProcedure, + CanFixModule = CanFixModule, + CanFixProject = CanFixProject, + CanFixAll = CanFixAll, + TagAssetId = TagAssetId, + JsonExamples = JsonSerializer.Serialize(Examples), + Inspections = string.Join(',', Inspections), + }; +} \ No newline at end of file diff --git a/rubberduckvba.Server/Model/Tag.cs b/rubberduckvba.Server/Model/Tag.cs new file mode 100644 index 0000000..c1bfffd --- /dev/null +++ b/rubberduckvba.Server/Model/Tag.cs @@ -0,0 +1,54 @@ +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Model; + +public record class Tag +{ + public Tag(TagEntity entity) + { + Id = entity.Id; + DateTimeInserted = entity.DateTimeInserted; + DateTimeUpdated = entity.DateTimeUpdated; + Name = entity.Name; + ReleaseId = entity.ReleaseId; + DateCreated = entity.DateCreated; + InstallerDownloadUrl = entity.InstallerDownloadUrl; + InstallerDownloads = entity.InstallerDownloads; + IsPreRelease = entity.IsPreRelease; + } + + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public string Name { get; init; } = string.Empty; + public long ReleaseId { get; init; } + public DateTime DateCreated { get; init; } + public string InstallerDownloadUrl { get; init; } = string.Empty; + public int InstallerDownloads { get; init; } + public bool IsPreRelease { get; init; } + + public TagEntity ToEntity() => new() + { + Id = Id, + DateTimeInserted = DateTimeInserted, + DateTimeUpdated = DateTimeUpdated, + Name = Name, + ReleaseId = ReleaseId, + DateCreated = DateCreated, + InstallerDownloadUrl = InstallerDownloadUrl, + InstallerDownloads = InstallerDownloads, + IsPreRelease = IsPreRelease, + }; +} + +public record class TagGraph : Tag +{ + public TagGraph() : this(null!) { } + public TagGraph(TagEntity tag, IEnumerable assets) + : base(tag) + { + Assets = assets.Select(e => new TagAsset(e)); + } + + public IEnumerable Assets { get; init; } = []; +} \ No newline at end of file diff --git a/rubberduckvba.Server/Model/TagAsset.cs b/rubberduckvba.Server/Model/TagAsset.cs new file mode 100644 index 0000000..95890cf --- /dev/null +++ b/rubberduckvba.Server/Model/TagAsset.cs @@ -0,0 +1,33 @@ +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Model; + +public record class TagAsset() +{ + public TagAsset(TagAssetEntity entity) : this() + { + Id = entity.Id; + DateTimeInserted = entity.DateTimeInserted; + DateTimeUpdated = entity.DateTimeUpdated; + Name = entity.Name; + TagId = entity.TagId; + DownloadUrl = entity.DownloadUrl; + } + + public int Id { get; init; } + public DateTime DateTimeInserted { get; init; } + public DateTime? DateTimeUpdated { get; init; } + public string Name { get; init; } = string.Empty; + public int TagId { get; init; } + public string DownloadUrl { get; init; } = string.Empty; + + public TagAssetEntity ToEntity() => new() + { + Id = Id, + DateTimeInserted = DateTimeInserted, + DateTimeUpdated = DateTimeUpdated, + Name = Name, + DownloadUrl = DownloadUrl, + TagId = TagId + }; +} \ No newline at end of file diff --git a/rubberduckvba.Server/Program.cs b/rubberduckvba.Server/Program.cs index f379a97..f3efe5a 100644 --- a/rubberduckvba.Server/Program.cs +++ b/rubberduckvba.Server/Program.cs @@ -8,18 +8,18 @@ using NLog.Extensions.Logging; using NLog.Targets; using RubberduckServices; -using rubberduckvba.com.Server.Api.Admin; -using rubberduckvba.com.Server.ContentSynchronization; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.com.Server.Hangfire; -using rubberduckvba.com.Server.Services; +using rubberduckvba.Server.Api.Admin; +using rubberduckvba.Server.ContentSynchronization; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Hangfire; +using rubberduckvba.Server.Services; using System.Diagnostics; using System.Reflection; -namespace rubberduckvba.com.Server; +namespace rubberduckvba.Server; public class HangfireAuthenticationFilter : IDashboardAuthorizationFilter { @@ -149,7 +149,7 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); + //services.AddSingleton(); services.AddSingleton(); services.AddSingleton, InstallerDownloadStatsOrchestrator>(); services.AddSingleton, XmldocContentOrchestrator>(); diff --git a/rubberduckvba.Server/Services/ContentCacheService.cs b/rubberduckvba.Server/Services/ContentCacheService.cs index 003f939..084e49a 100644 --- a/rubberduckvba.Server/Services/ContentCacheService.cs +++ b/rubberduckvba.Server/Services/ContentCacheService.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Diagnostics; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public interface IContentCacheService : IDisposable { diff --git a/rubberduckvba.Server/Services/DateTimeExtensions.cs b/rubberduckvba.Server/Services/DateTimeExtensions.cs index ce9f630..e24c612 100644 --- a/rubberduckvba.Server/Services/DateTimeExtensions.cs +++ b/rubberduckvba.Server/Services/DateTimeExtensions.cs @@ -1,4 +1,4 @@ -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public static class DateTimeExtensions { diff --git a/rubberduckvba.Server/Services/DistributedCacheService.cs b/rubberduckvba.Server/Services/DistributedCacheService.cs index fea248d..b1c80c1 100644 --- a/rubberduckvba.Server/Services/DistributedCacheService.cs +++ b/rubberduckvba.Server/Services/DistributedCacheService.cs @@ -3,7 +3,7 @@ using System.Text; using System.Text.Json; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public interface ICacheService { diff --git a/rubberduckvba.Server/Services/GitHubClientService.cs b/rubberduckvba.Server/Services/GitHubClientService.cs index cf42165..f855546 100644 --- a/rubberduckvba.Server/Services/GitHubClientService.cs +++ b/rubberduckvba.Server/Services/GitHubClientService.cs @@ -1,16 +1,17 @@ using Microsoft.Extensions.Options; using Octokit; using Octokit.Internal; -using rubberduckvba.com.Server.ContentSynchronization; -using rubberduckvba.com.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.com.Server.Data; +using rubberduckvba.Server; +using rubberduckvba.Server.ContentSynchronization; +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; using System.Collections.Immutable; using System.Security.Claims; using System.Text; using System.Web; using System.Xml.Linq; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public interface IGitHubClientService { @@ -55,23 +56,23 @@ public async Task> GetAllTagsAsync() var releases = await client.Repository.Release.GetAll(config.OwnerOrg, config.Rubberduck, new ApiOptions { PageCount = 1, PageSize = 10 }); return (from release in releases - let installer = release.Assets.SingleOrDefault(asset => asset.Name.EndsWith(".exe") && asset.Name.StartsWith("Rubberduck.Setup")) - select new TagGraph - { - ReleaseId = release.Id, - Name = release.TagName, - DateCreated = release.CreatedAt.Date, - IsPreRelease = release.Prerelease, - InstallerDownloads = installer?.DownloadCount ?? 0, - InstallerDownloadUrl = installer?.BrowserDownloadUrl ?? string.Empty, - Assets = (from asset in release.Assets - where asset.Name.EndsWith(".xml") - select new TagAsset - { - Name = asset.Name, - DownloadUrl = asset.BrowserDownloadUrl - }).ToImmutableArray() - }).ToImmutableArray(); + let installer = release.Assets.SingleOrDefault(asset => asset.Name.EndsWith(".exe") && asset.Name.StartsWith("Rubberduck.Setup")) + select new TagGraph + { + ReleaseId = release.Id, + Name = release.TagName, + DateCreated = release.CreatedAt.Date, + IsPreRelease = release.Prerelease, + InstallerDownloads = installer?.DownloadCount ?? 0, + InstallerDownloadUrl = installer?.BrowserDownloadUrl ?? string.Empty, + Assets = (from asset in release.Assets + where asset.Name.EndsWith(".xml") + select new TagAsset + { + Name = asset.Name, + DownloadUrl = asset.BrowserDownloadUrl + }).ToImmutableArray() + }).ToImmutableArray(); } public async Task GetTagAsync(string token, string name) @@ -164,7 +165,7 @@ private XDocument ParseCodeInspectionSettings(byte[] rawContent) var length = endIndex - startIndex + encodedTagClose.Length; var encodedDocument = encoded.Substring(startIndex, length); var decoded = HttpUtility.HtmlDecode(encodedDocument); - + var document = XDocument.Parse(decoded); return document; } diff --git a/rubberduckvba.Server/Services/IContentOrchestrator.cs b/rubberduckvba.Server/Services/IContentOrchestrator.cs index 291700f..e9ce9e5 100644 --- a/rubberduckvba.Server/Services/IContentOrchestrator.cs +++ b/rubberduckvba.Server/Services/IContentOrchestrator.cs @@ -1,6 +1,6 @@ -using rubberduckvba.com.Server.ContentSynchronization; +using rubberduckvba.Server.ContentSynchronization; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public interface IContentOrchestrator where TRequest : SyncRequestParameters { diff --git a/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs b/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs index e2b1f45..50b2adf 100644 --- a/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs +++ b/rubberduckvba.Server/Services/InstallerDownloadStatsOrchestrator.cs @@ -1,8 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public class InstallerDownloadStatsOrchestrator(ISynchronizationPipelineFactory factory) : IContentOrchestrator { diff --git a/rubberduckvba.Server/Services/MarkdownFormattingService.cs b/rubberduckvba.Server/Services/MarkdownFormattingService.cs index 85aa69a..745ae81 100644 --- a/rubberduckvba.Server/Services/MarkdownFormattingService.cs +++ b/rubberduckvba.Server/Services/MarkdownFormattingService.cs @@ -2,7 +2,7 @@ using MarkdownSharp; using RubberduckServices; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public interface IMarkdownFormattingService { diff --git a/rubberduckvba.Server/Services/RubberduckDbService.cs b/rubberduckvba.Server/Services/RubberduckDbService.cs index ec24661..df8131d 100644 --- a/rubberduckvba.Server/Services/RubberduckDbService.cs +++ b/rubberduckvba.Server/Services/RubberduckDbService.cs @@ -1,43 +1,37 @@ -using Dapper; -using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient; using Microsoft.Extensions.Options; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline; -using rubberduckvba.com.Server.Data; -using System.Collections.Immutable; -using System.Diagnostics; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services.rubberduckdb; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public interface IStagingServices { Task StageAsync(StagingContext staging, CancellationToken token); } -public class StagingServices(IRubberduckDbService service) : IStagingServices +public class StagingServices(IRubberduckDbService service, TagServices tagService, FeatureServices featureServices) : IStagingServices { public async Task StageAsync(StagingContext context, CancellationToken token) { token.ThrowIfCancellationRequested(); var updatedTags = context.ProcessedTags.Where(e => e.Id != default); - await service.UpdateAsync(updatedTags); + tagService.Update(updatedTags); token.ThrowIfCancellationRequested(); var newTags = context.ProcessedTags.Where(e => e.Id == default); - await service.CreateAsync(newTags, context.Parameters.RepositoryId); + tagService.Create(newTags); - token.ThrowIfCancellationRequested(); - await service.UpdateAsync(context.UpdatedFeatureItems); + //token.ThrowIfCancellationRequested(); + //featureServices.Update(context.UpdatedFeatureItems); + //await service.UpdateAsync(context.UpdatedFeatureItems); - token.ThrowIfCancellationRequested(); - await service.CreateAsync(context.NewFeatureItems); + //token.ThrowIfCancellationRequested(); + //await service.CreateAsync(context.NewFeatureItems); } } -public interface ISynchronizationService -{ - Task LogAsync(SynchronizationRequest synchronization); -} - public enum RepositoryId { Rubberduck = 1, @@ -47,85 +41,31 @@ public enum RepositoryId public interface IRubberduckDbService { Task> GetAllTagsAsync(); - Task> GetLatestTagsAsync(RepositoryId repositoryId); Task GetLatestTagAsync(RepositoryId repositoryId, bool includePreRelease); - Task UpdateAsync(IEnumerable tags); - Task UpdateAsync(IEnumerable featureItems); - Task CreateAsync(IEnumerable tags, RepositoryId repositoryId); - Task CreateAsync(IEnumerable featureItems); Task> GetTopLevelFeatures(RepositoryId? repositoryId = default); Task ResolveFeature(RepositoryId repositoryId, string name); Task GetFeatureId(RepositoryId repositoryId, string name); - Task> GetXmlDocFeaturesAsync(RepositoryId repositoryId); Task SaveFeature(Feature feature); } -public class SynchronizationDbService : ISynchronizationService -{ - private readonly string _connectionString; - - public SynchronizationDbService(IOptions settings, ILogger logger) - { - _connectionString = settings.Value.RubberduckDb ?? throw new InvalidOperationException(); - Logger = logger; - } - - private ILogger Logger { get; } - - public async Task LogAsync(SynchronizationRequest synchronization) - { - const string insertSql = @" -INSERT INTO [SynchronizationRequests] ([DateTimeInserted],[RequestId],[Status],[Message]) -VALUES (@ts, @requestId, @status, @message);"; - const string updateSql = @" -UPDATE [SynchronizationRequests] SET - [DateTimeUpdated]=@ts, - [UtcDateTimeStarted]=@utcStart, - [UtcDateTimeEnded]=@utcEnd, - [Status]=@status, - [Message]=@message -WHERE [RequestId]=@requestId; -"; - using var db = new SqlConnection(_connectionString); - await db.OpenAsync(); - - using var transaction = await db.BeginTransactionAsync(); - - if (synchronization.Status == default) - { - await db.ExecuteAsync(insertSql, new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - requestId = synchronization.RequestId, - status = (int)synchronization.Status, - message = synchronization.Message, - }, transaction); - } - else - { - await db.ExecuteAsync(updateSql, new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - requestId = synchronization.RequestId, - }, transaction); - } - - await transaction.CommitAsync(); - } -} - public class RubberduckDbService : IRubberduckDbService { private readonly string _connectionString; + private readonly TagServices _tagServices; + private readonly FeatureServices _featureServices; - public RubberduckDbService(IOptions settings, ILogger logger) + public RubberduckDbService(IOptions settings, ILogger logger, + TagServices tagServices, FeatureServices featureServices) { _connectionString = settings.Value.RubberduckDb ?? throw new InvalidOperationException("ConnectionString 'RubberduckDb' could not be retrieved."); Logger = logger; + + _tagServices = tagServices; + _featureServices = featureServices; } private ILogger Logger { get; } @@ -140,501 +80,228 @@ private async Task GetDbConnection() public async Task> GetAllTagsAsync() { - const string sql = @" -SELECT - [Id], - [DateTimeInserted], - [DateTimeUpdated], - [RepositoryId], - [ReleaseId], - [Name], - [DateCreated], - [InstallerDownloadUrl], - [InstallerDownloads], - [IsPreRelease] -FROM [Tags] -"; - using var db = await GetDbConnection(); - - var sw = Stopwatch.StartNew(); - var result = (await db.QueryAsync(sql)).ToArray(); - sw.Stop(); - - Logger.LogInformation(nameof(GetAllTagsAsync) + " | SELECT operation completed ({results}) | ⏱️ {elapsed}", result.Length, sw.Elapsed); - return result; + return _tagServices.GetAllTags(); + // const string sql = @" + //SELECT + // [Id], + // [DateTimeInserted], + // [DateTimeUpdated], + // [RepositoryId], + // [ReleaseId], + // [Name], + // [DateCreated], + // [InstallerDownloadUrl], + // [InstallerDownloads], + // [IsPreRelease] + //FROM [Tags] + //"; + // using var db = await GetDbConnection(); + + // var sw = Stopwatch.StartNew(); + // var result = (await db.QueryAsync(sql)).ToArray(); + // sw.Stop(); + + // Logger.LogInformation(nameof(GetAllTagsAsync) + " | SELECT operation completed ({results}) | ⏱️ {elapsed}", result.Length, sw.Elapsed); + // return result; } public async Task> GetTopLevelFeatures(RepositoryId? repositoryId = default) { - const string sql = @" -SELECT - [Id], - [DateTimeInserted], - [DateTimeUpdated], - [RepositoryId], - [Name], - [Title], - [ShortDescription], - [IsNew], - [HasImage] -FROM [Features] -WHERE [RepositoryId]=ISNULL(@repositoryId,[RepositoryId]) -AND [ParentId] IS NULL -AND [IsHidden]=0; -"; - using var db = await GetDbConnection(); - var parameters = new { repositoryId = (int)(repositoryId ?? RepositoryId.Rubberduck) }; - - var sw = Stopwatch.StartNew(); - var result = (await db.QueryAsync(sql, parameters)).ToArray(); - sw.Stop(); - - Logger.LogInformation(nameof(GetTopLevelFeatures) + " | SELECT operation completed ({results}) | ⏱️ {elapsed}", result.Length, sw.Elapsed); - return result; + return _featureServices.Get(topLevelOnly: true); + // const string sql = @" + //SELECT + // [Id], + // [DateTimeInserted], + // [DateTimeUpdated], + // [RepositoryId], + // [Name], + // [Title], + // [ShortDescription], + // [IsNew], + // [HasImage] + //FROM [Features] + //WHERE [RepositoryId]=ISNULL(@repositoryId,[RepositoryId]) + //AND [ParentId] IS NULL + //AND [IsHidden]=0; + //"; + // using var db = await GetDbConnection(); + // var parameters = new { repositoryId = (int)(repositoryId ?? RepositoryId.Rubberduck) }; + + // var sw = Stopwatch.StartNew(); + // var result = (await db.QueryAsync(sql, parameters)).ToArray(); + // sw.Stop(); + + // Logger.LogInformation(nameof(GetTopLevelFeatures) + " | SELECT operation completed ({results}) | ⏱️ {elapsed}", result.Length, sw.Elapsed); + // return result; } public async Task ResolveFeature(RepositoryId repositoryId, string name) { - const string featureSql = @" -WITH feature AS ( - SELECT [Id] - FROM [Features] - WHERE [RepositoryId]=@repositoryId AND LOWER([Name])=LOWER(@name) -) -SELECT - src.[Id], - src.[ParentId], - src.[DateTimeInserted], - src.[DateTimeUpdated], - src.[Name], - src.[Title], - src.[ShortDescription], - src.[Description], - src.[IsNew], - src.[HasImage] -FROM [Features] src -INNER JOIN feature ON src.[Id]=feature.[Id] OR src.[ParentId]=feature.[Id]; -"; - const string itemSql = @" -WITH feature AS ( - SELECT [Id] - FROM [Features] - WHERE [RepositoryId]=@repositoryId AND LOWER([Name])=LOWER(@name) -) -SELECT - src.[Id], - src.[DateTimeInserted], - src.[DateTimeUpdated], - src.[FeatureId], - f.[Name] AS [FeatureName], - f.[Title] AS [FeatureTitle], - src.[Name], - src.[Title], - src.[Description] AS [Summary], - src.[IsNew], - src.[IsDiscontinued], - src.[IsHidden], - src.[TagAssetId], - t.[Id] AS [TagId], - src.[SourceUrl], - src.[Serialized], - t.[Name] AS [TagName] -FROM [FeatureXmlDoc] src -INNER JOIN feature ON src.[FeatureId]=feature.[Id] -INNER JOIN [Features] f ON feature.[Id]=f.[Id] -INNER JOIN [TagAssets] a ON src.[TagAssetId]=a.[Id] -INNER JOIN [Tags] t ON a.[TagId]=t.[Id] -ORDER BY src.[IsNew] DESC, src.[IsDiscontinued] DESC, src.[Name]; -"; - - using var db = await GetDbConnection(); - var sw = Stopwatch.StartNew(); - - var parameters = new { repositoryId, name }; - var features = await db.QueryAsync(featureSql, parameters); - var materialized = features.ToArray(); - - var items = await db.QueryAsync(itemSql, parameters); - - var graph = materialized.Where(e => e.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)) - .Select(e => FeatureGraph.FromFeature(e) with - { - Features = materialized.Where(f => f.ParentId == e.Id).ToImmutableArray(), - Items = items.ToImmutableArray() - }).Single(); - sw.Stop(); - - Logger.LogInformation(nameof(ResolveFeature) + " | All SELECT operations completed | ⏱️ {elapsed}", sw.Elapsed); - return graph; + return _featureServices.Get(name); + // const string featureSql = @" + //WITH feature AS ( + // SELECT [Id] + // FROM [Features] + // WHERE [RepositoryId]=@repositoryId AND LOWER([Name])=LOWER(@name) + //) + //SELECT + // src.[Id], + // src.[ParentId], + // src.[DateTimeInserted], + // src.[DateTimeUpdated], + // src.[Name], + // src.[Title], + // src.[ShortDescription], + // src.[Description], + // src.[IsNew], + // src.[HasImage] + //FROM [Features] src + //INNER JOIN feature ON src.[Id]=feature.[Id] OR src.[ParentId]=feature.[Id]; + //"; + // const string itemSql = @" + //WITH feature AS ( + // SELECT [Id] + // FROM [Features] + // WHERE [RepositoryId]=@repositoryId AND LOWER([Name])=LOWER(@name) + //) + //SELECT + // src.[Id], + // src.[DateTimeInserted], + // src.[DateTimeUpdated], + // src.[FeatureId], + // f.[Name] AS [FeatureName], + // f.[Title] AS [FeatureTitle], + // src.[Name], + // src.[Title], + // src.[Description] AS [Summary], + // src.[IsNew], + // src.[IsDiscontinued], + // src.[IsHidden], + // src.[TagAssetId], + // t.[Id] AS [TagId], + // src.[SourceUrl], + // src.[Serialized], + // t.[Name] AS [TagName] + //FROM [FeatureXmlDoc] src + //INNER JOIN feature ON src.[FeatureId]=feature.[Id] + //INNER JOIN [Features] f ON feature.[Id]=f.[Id] + //INNER JOIN [TagAssets] a ON src.[TagAssetId]=a.[Id] + //INNER JOIN [Tags] t ON a.[TagId]=t.[Id] + //ORDER BY src.[IsNew] DESC, src.[IsDiscontinued] DESC, src.[Name]; + //"; + + // using var db = await GetDbConnection(); + // var sw = Stopwatch.StartNew(); + + // var parameters = new { repositoryId, name }; + // var features = await db.QueryAsync(featureSql, parameters); + // var materialized = features.ToArray(); + + // var items = await db.QueryAsync(itemSql, parameters); + + // var graph = materialized.Where(e => e.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)) + // .Select(e => new FeatureGraph(e.ToEntity()) with + // { + // Features = materialized.Where(f => f.ParentId == e.Id).ToImmutableArray(), + // Items = items.ToImmutableArray() + // }).Single(); + // sw.Stop(); + + // Logger.LogInformation(nameof(ResolveFeature) + " | All SELECT operations completed | ⏱️ {elapsed}", sw.Elapsed); + // return graph; } public async Task SaveFeature(Feature feature) { - const string insertSql = @" -INSERT INTO [Features] ([DateTimeInserted],[RepositoryId],[ParentId],[Name],[Title],[ShortDescription],[Description],[IsHidden],[IsNew],[HasImage]) -VALUES (@ts,@repositoryId,@parentId,@name,@title,@shortDescription,@description,@isHidden,@isNew,@hasImage) -RETURNING [Id]; -"; - const string updateSql = @" -UPDATE [Features] SET - [DateTimeUpdated]=@ts, - [RepositoryId]=@repositoryId, - [ParentId]=@parentId, - [Name]=@name, - [Title]=@title, - [ShortDescription]=@shortDescription, - [Description]=@description, - [IsHidden]=@isHidden, - [IsNew]=@isNew, - [HasImage]=@hasImage -WHERE [Id]=@id; -"; - Feature result; - - using var db = await GetDbConnection(); - using var transaction = await db.BeginTransactionAsync(); - if (feature.Id == default) { - var parameters = new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - repositoryId = feature.RepositoryId, - parentId = feature.ParentId, - name = feature.Name, - shortDescription = feature.ShortDescription, - description = feature.Description, - isHidden = feature.IsHidden, - isNew = feature.IsNew, - hasImage = feature.HasImage, - }; - var id = await db.ExecuteAsync(insertSql, parameters, transaction); - result = feature with { Id = id }; + _featureServices.Insert(new FeatureGraph(feature.ToEntity())); } else { - var parameters = new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - repositoryId = feature.RepositoryId, - parentId = feature.ParentId, - name = feature.Name, - shortDescription = feature.ShortDescription, - description = feature.Description, - isHidden = feature.IsHidden, - isNew = feature.IsNew, - hasImage = feature.HasImage, - id = feature.Id - }; - await db.ExecuteAsync(updateSql, parameters, transaction); - result = feature; + _featureServices.Update(new FeatureGraph(feature.ToEntity())); } - - var trx = Stopwatch.StartNew(); - await transaction.CommitAsync(); - trx.Stop(); - Logger.LogInformation(nameof(SaveFeature) + " | Transaction committed | ⏱️ {elapsed}", trx.Elapsed); - return result; + // TODO return with id + return feature; + // const string insertSql = @" + //INSERT INTO [Features] ([DateTimeInserted],[RepositoryId],[ParentId],[Name],[Title],[ShortDescription],[Description],[IsHidden],[IsNew],[HasImage]) + //VALUES (@ts,@repositoryId,@parentId,@name,@title,@shortDescription,@description,@isHidden,@isNew,@hasImage) + //RETURNING [Id]; + //"; + // const string updateSql = @" + //UPDATE [Features] SET + // [DateTimeUpdated]=@ts, + // [RepositoryId]=@repositoryId, + // [ParentId]=@parentId, + // [Name]=@name, + // [Title]=@title, + // [ShortDescription]=@shortDescription, + // [Description]=@description, + // [IsHidden]=@isHidden, + // [IsNew]=@isNew, + // [HasImage]=@hasImage + //WHERE [Id]=@id; + //"; + // Feature result; + + // using var db = await GetDbConnection(); + // using var transaction = await db.BeginTransactionAsync(); + + // if (feature.Id == default) + // { + // var parameters = new + // { + // ts = TimeProvider.System.GetUtcNow().ToTimestampString(), + // repositoryId = feature.RepositoryId, + // parentId = feature.ParentId, + // name = feature.Name, + // shortDescription = feature.ShortDescription, + // description = feature.Description, + // isHidden = feature.IsHidden, + // isNew = feature.IsNew, + // hasImage = feature.HasImage, + // }; + // var id = await db.ExecuteAsync(insertSql, parameters, transaction); + // result = feature with { Id = id }; + // } + // else + // { + // var parameters = new + // { + // ts = TimeProvider.System.GetUtcNow().ToTimestampString(), + // repositoryId = feature.RepositoryId, + // parentId = feature.ParentId, + // name = feature.Name, + // shortDescription = feature.ShortDescription, + // description = feature.Description, + // isHidden = feature.IsHidden, + // isNew = feature.IsNew, + // hasImage = feature.HasImage, + // id = feature.Id + // }; + // await db.ExecuteAsync(updateSql, parameters, transaction); + // result = feature; + // } + + // var trx = Stopwatch.StartNew(); + // await transaction.CommitAsync(); + // trx.Stop(); + // Logger.LogInformation(nameof(SaveFeature) + " | Transaction committed | ⏱️ {elapsed}", trx.Elapsed); + // return result; } public async Task CreateAsync(IEnumerable tags, RepositoryId repositoryId) - { - if (!tags.Any()) - { - return; - } - - const string tagSql = @" -INSERT INTO [Tags] ([DateTimeInserted],[RepositoryId],[Name],[DateCreated],[InstallerDownloadUrl],[InstallerDownloads],[IsPreRelease]) -VALUES (@ts, @repositoryId, @name, @dateCreated, @installerDownloadUrl, @installerDownloads, @isPreRelease) -RETURNING [Id];"; - - const string assetSql = @" -INSERT INTO [TagAssets] ([DateTimeInserted],[TagId],[Name],[DownloadUrl]) -VALUES (@ts, @tagId, @name, @downloadUrl); -"; - - using var db = await GetDbConnection(); - using var transaction = db.BeginTransaction(); - - foreach (var tag in tags) - { - var tagInfo = new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - repositoryId = (int)repositoryId, - name = tag.Name, - dateCreated = tag.DateCreated, - installerDownloadUrl = tag.InstallerDownloadUrl, - installerDownloads = tag.InstallerDownloads, - isPreRelease = tag.IsPreRelease - }; - await db.ExecuteAsync(tagSql, tagInfo, transaction); - var id = await db.ExecuteScalarAsync("SELECT [Id] FROM [Tags] WHERE [Name]=@name;", new { name = tag.Name }); - - foreach (var asset in tag.Assets) - { - var assetInfo = new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - tagId = id, - name = asset.Name, - downloadUrl = asset.DownloadUrl - }; - await db.ExecuteAsync(assetSql, assetInfo, transaction); - } - } - - var trx = Stopwatch.StartNew(); - await transaction.CommitAsync(); - trx.Stop(); - Logger.LogInformation(nameof(CreateAsync) + " (" + nameof(TagGraph) + ") | Transaction committed | ⏱️ {elapsed}", trx.Elapsed); - } + => _tagServices.Create(tags); public async Task> GetLatestTagsAsync(RepositoryId repositoryId) - { - const string sql = @" -WITH t AS ( - SELECT [Id], RANK() OVER (PARTITION BY src.[IsPreRelease] ORDER BY src.[DateCreated] DESC) AS [Rank] - FROM [Tags] src - WHERE [RepositoryId]=@repositoryId -) -SELECT - src.[Id], - src.[DateTimeInserted], - src.[DateTimeUpdated], - src.[Name], - src.[DateCreated], - src.[InstallerDownloadUrl], - src.[InstallerDownloads], - src.[IsPreRelease] -FROM [Tags] src -INNER JOIN t ON src.[Id]=t.[Id] -WHERE t.[Rank]=1;"; - - using var db = await GetDbConnection(); - var sw = Stopwatch.StartNew(); - var results = await db.QueryAsync(sql, new { repositoryId = (int)repositoryId }); - - Logger.LogInformation(nameof(GetLatestTagsAsync) + " | SELECT operation completed | ⏱️ {elapsed}", sw.Elapsed); - return results; - } + => _tagServices.GetLatestTags(); public async Task GetLatestTagAsync(RepositoryId repositoryId, bool preRelease) - { - const string tagSql = @" -WITH t AS ( - SELECT [Id], RANK() OVER (PARTITION BY src.[IsPreRelease] ORDER BY src.[DateCreated] DESC) AS [Rank] - FROM [Tags] src - WHERE [RepositoryId]=@repositoryId -) -SELECT - src.[Id], - src.[DateTimeInserted], - src.[DateTimeUpdated], - src.[Name], - src.[DateCreated], - src.[InstallerDownloadUrl], - src.[InstallerDownloads], - src.[IsPreRelease] -FROM [Tags] src -INNER JOIN t ON src.[Id]=t.[Id] -WHERE t.[Rank]=1 AND src.[IsPreRelease]=@pre -"; - const string assetsSql = @" -SELECT - src.[Id], - src.[DateTimeInserted], - src.[DateTimeUpdated], - src.[TagId], - src.[Name], - src.[DownloadUrl] -FROM [TagAssets] src -WHERE src.[TagId]=@id -"; - - using var db = await GetDbConnection(); - var sw = Stopwatch.StartNew(); - - var tag = await db.QuerySingleAsync(tagSql, new { repositoryId = (int)repositoryId, pre = preRelease }); - var assets = await db.QueryAsync(assetsSql, new { id = tag.Id }); - - Logger.LogInformation(nameof(GetLatestTagAsync) + " | All SELECT operations completed | ⏱️ {elapsed}", sw.Elapsed); - - return new TagGraph - { - Id = tag.Id, - DateTimeInserted = tag.DateTimeInserted, - DateTimeUpdated = tag.DateTimeUpdated, - DateCreated = tag.DateCreated, - ReleaseId = tag.ReleaseId, - IsPreRelease = tag.IsPreRelease, - Name = tag.Name, - InstallerDownloadUrl = tag.InstallerDownloadUrl, - InstallerDownloads = tag.InstallerDownloads, - Assets = assets - }; - } + => _tagServices.GetLatestTag(preRelease); public async Task UpdateAsync(IEnumerable tags) - { - if (!tags.Any()) - { - return; - } - - const string sql = @" -UPDATE [Tags] SET - [DateTimeUpdated]=@ts, - [InstallerDownloads]=@installerDownloads -WHERE [Id]=@id;"; - - using var db = await GetDbConnection(); - var sw = Stopwatch.StartNew(); - using var transaction = await db.BeginTransactionAsync(); - - foreach (var tag in tags) - { - var args = new - { - ts = TimeProvider.System.GetUtcNow().ToTimestampString(), - id = tag.Id, - installerDownloads = tag.InstallerDownloads - }; - await db.ExecuteAsync(sql, args, transaction); - } - - await transaction.CommitAsync(); - sw.Stop(); - - Logger.LogInformation(nameof(UpdateAsync) + "(" + nameof(Tag) + ") | Transaction committed; all UPDATE operations completed | ⏱️ {elapsed}", sw.Elapsed); - } + => _tagServices.Update(tags); public async Task GetFeatureId(RepositoryId repositoryId, string name) - { - const string sql = "SELECT [Id] FROM [Features] WHERE [RepositoryId]=@repositoryId AND [Name]=@name;"; - - using var db = await GetDbConnection(); - var sw = Stopwatch.StartNew(); - - var id = await db.ExecuteScalarAsync(sql, new { repositoryId, name }); - Logger.LogInformation(nameof(GetFeatureId) + " | SELECT operation completed | ⏱️ {elapsed}", sw.Elapsed); - - return id; - } - - public async Task> GetXmlDocFeaturesAsync(RepositoryId repositoryId) - { - const string sql = @" -SELECT - x.[Id], - x.[DateTimeInserted], - x.[DateTimeUpdated], - x.[FeatureId], - x.[Name], - x.[Title], - x.[Description], - x.[IsNew], - x.[IsDiscontinued], - x.[IsHidden], - x.[TagAssetId], - x.[SourceUrl], - x.[Serialized] -FROM [FeatureXmlDoc] AS x -INNER JOIN [Features] AS f ON x.[FeatureId]=f.[Id] -WHERE f.[RepositoryId]=@repositoryId"; - - using var db = await GetDbConnection(); - var sw = Stopwatch.StartNew(); - - var result = await db.QueryAsync(sql, new { repositoryId }); - Logger.LogInformation(nameof(GetXmlDocFeaturesAsync) + " | SELECT operation completed | ⏱️ {elapsed}", sw.Elapsed); - - return result; - } - - public async Task UpdateAsync(IEnumerable featureItems) - { - const string updateSql = @" -UPDATE [FeatureXmlDoc] -SET [DateTimeUpdated]=@ts, - [Title]=@title, - [Description]=@description, - [IsNew]=@isNew, - [IsDiscontinued]=@isDiscontinued, - [IsHidden]=@isHidden, - [TagAssetId]=@tagAssetId, - [SourceUrl]=@sourceUrl, - [Serialized]=@serialized -WHERE [Id]=@id"; - - if (!featureItems.Any()) - { - return; - } - - using var db = await GetDbConnection(); - using var transaction = db.BeginTransaction(); - var sw = Stopwatch.StartNew(); - - var timestamp = TimeProvider.System.GetUtcNow().ToTimestampString(); - foreach (var update in featureItems) - { - await db.ExecuteAsync(updateSql, new - { - ts = timestamp, - title = update.Title, - description = update.Summary, - isNew = update.IsNew, - isDiscontinued = update.IsDiscontinued, - isHidden = update.IsHidden, - tagAssetId = update.TagAssetId, - sourceUrl = update.SourceUrl, - serialized = update.Serialized, - id = update.Id, - }, transaction); - } - - await transaction.CommitAsync(); - Logger.LogInformation(nameof(UpdateAsync) + "(" + nameof(FeatureXmlDoc) + ") | Transaction committed; all UPDATE operations completed | ⏱️ {elapsed}", sw.Elapsed); - } - - public async Task CreateAsync(IEnumerable featureItems) - { - const string insertSql = @" -INSERT INTO [FeatureXmlDoc] ([DateTimeInserted],[FeatureId],[Name],[Title],[Description],[IsNew],[IsDiscontinued],[IsHidden],[TagAssetId],[SourceUrl],[Serialized]) -VALUES (@ts,@featureId,@name,@title,@description,@isNew,@isDiscontinued,@isHidden,@tagAssetId,@sourceUrl,@serialized); -"; - - if (!featureItems.Any()) - { - return; - } - - using var db = await GetDbConnection(); - using var transaction = db.BeginTransaction(); - var sw = Stopwatch.StartNew(); - - var timestamp = TimeProvider.System.GetUtcNow().ToTimestampString(); - foreach (var insert in featureItems) - { - await db.ExecuteAsync(insertSql, new - { - ts = timestamp, - featureId = insert.FeatureId, - name = insert.Name, - title = insert.Title, - description = insert.Summary, - isNew = insert.IsNew, - isDiscontinued = insert.IsDiscontinued, - isHidden = insert.IsHidden, - tagAssetId = insert.TagAssetId, - sourceUrl = insert.SourceUrl, - serialized = insert.Serialized - }, transaction); - } - - await transaction.CommitAsync(); - Logger.LogInformation(nameof(CreateAsync) + "(" + nameof(FeatureXmlDoc) + ") | Transaction committed; all INSERT operations completed | ⏱️ {elapsed}", sw.Elapsed); - } + => _featureServices.GetId(name); } \ No newline at end of file diff --git a/rubberduckvba.Server/Services/ServiceLogger.cs b/rubberduckvba.Server/Services/ServiceLogger.cs index 52bfc87..0aa5884 100644 --- a/rubberduckvba.Server/Services/ServiceLogger.cs +++ b/rubberduckvba.Server/Services/ServiceLogger.cs @@ -1,3 +1,3 @@ -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public class ServiceLogger { } \ No newline at end of file diff --git a/rubberduckvba.Server/Services/XmldocContentOrchestrator.cs b/rubberduckvba.Server/Services/XmldocContentOrchestrator.cs index 15b16a4..8c16049 100644 --- a/rubberduckvba.Server/Services/XmldocContentOrchestrator.cs +++ b/rubberduckvba.Server/Services/XmldocContentOrchestrator.cs @@ -1,8 +1,8 @@ -using rubberduckvba.com.Server.ContentSynchronization; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline; -using rubberduckvba.com.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -namespace rubberduckvba.com.Server.Services; +namespace rubberduckvba.Server.Services; public class XmldocContentOrchestrator(ISynchronizationPipelineFactory factory) : IContentOrchestrator { diff --git a/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs b/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs new file mode 100644 index 0000000..ec5b1af --- /dev/null +++ b/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs @@ -0,0 +1,62 @@ +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Services.rubberduckdb; + +public class FeatureServices( + IRepository featureRepository, + IRepository inspectionRepository, + IRepository quickfixRepository, + IRepository annotationRepository) +{ + public int GetId(string name) => featureRepository.GetId(name); + public IEnumerable Get(bool topLevelOnly = true) + { + return featureRepository.GetAll() + .Where(e => !topLevelOnly || e.ParentId is null) + .Select(e => new Feature(e)); + } + + public FeatureGraph Get(string name) + { + var id = featureRepository.GetId(name); + var feature = featureRepository.GetById(id); + + IEnumerable inspections = []; + IEnumerable quickfixes = []; + IEnumerable annotations = []; + + if (string.Equals(name, "inspections", StringComparison.InvariantCultureIgnoreCase)) + { + inspections = inspectionRepository.GetAll().Select(e => new Inspection(e)).ToList(); + } + else if (string.Equals(name, "quickfixes", StringComparison.InvariantCultureIgnoreCase)) + { + quickfixes = quickfixRepository.GetAll().Select(e => new QuickFix(e)).ToList(); + } + else if (string.Equals(name, "annotations", StringComparison.InvariantCultureIgnoreCase)) + { + annotations = annotationRepository.GetAll().Select(e => new Annotation(e)).ToList(); + } + + return new FeatureGraph(feature) + { + Annotations = annotations, + QuickFixes = quickfixes, + Inspections = inspections, + }; + } + + public void Update(IEnumerable features) => featureRepository.Update(features.Select(feature => feature.ToEntity())); + public void Update(FeatureGraph feature) => Update([feature]); + public void Update(IEnumerable inspections) => inspectionRepository.Update(inspections.Select(inspection => inspection.ToEntity())); + public void Update(IEnumerable quickFixes) => quickfixRepository.Update(quickFixes.Select(quickfix => quickfix.ToEntity())); + public void Update(IEnumerable annotations) => annotationRepository.Update(annotations.Select(annotation => annotation.ToEntity())); + + public void Insert(IEnumerable features) => featureRepository.Insert(features.Select(feature => feature.ToEntity())); + public void Insert(FeatureGraph feature) => Insert([feature]); + public void Insert(IEnumerable inspections) => inspectionRepository.Insert(inspections.Select(inspection => inspection.ToEntity())); + public void Insert(IEnumerable quickFixes) => quickfixRepository.Insert(quickFixes.Select(quickfix => quickfix.ToEntity())); + public void Insert(IEnumerable annotations) => annotationRepository.Insert(annotations.Select(annotation => annotation.ToEntity())); +} diff --git a/rubberduckvba.Server/Services/rubberduckdb/TagServices.cs b/rubberduckvba.Server/Services/rubberduckdb/TagServices.cs new file mode 100644 index 0000000..8d8abcf --- /dev/null +++ b/rubberduckvba.Server/Services/rubberduckdb/TagServices.cs @@ -0,0 +1,91 @@ +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Model.Entity; + +namespace rubberduckvba.Server.Services.rubberduckdb; + +public class TagServices(IRepository tagsRepository, IRepository tagAssetsRepository) +{ + private IEnumerable _allAssets = []; + private IEnumerable _allTags = []; + private IEnumerable _latestTags = []; + private TagGraph? _main; + private TagGraph? _next; + private bool _mustInvalidate = true; + + public IEnumerable GetAllTags() + { + if (_mustInvalidate || !_allTags.Any()) + { + _allTags = tagsRepository.GetAll().ToList(); + _latestTags = _allTags + .GroupBy(tag => tag.IsPreRelease) + .Select(tags => tags.OrderByDescending(tag => tag.DateCreated)) + .SelectMany(tags => tags.Take(1)) + .ToList(); + _mustInvalidate = false; + } + + return _allTags.Select(e => new Tag(e)); + } + + public IEnumerable GetLatestTags() + { + if (_mustInvalidate || !_latestTags.Any()) + { + _ = GetAllTags(); + } + + return _latestTags.Select(e => new Tag(e)); + } + + public TagGraph GetLatestTag(bool isPreRelease) + { + var mustInvalidate = _mustInvalidate; + if (mustInvalidate || !_latestTags.Any()) + { + _ = GetAllTags(); // _mustInvalidate => false + } + + if (!mustInvalidate && !isPreRelease && _main != null) + { + return _main; + } + if (!mustInvalidate && isPreRelease && _next != null) + { + return _next; + } + + var mainTag = _latestTags.First(e => !e.IsPreRelease); + var mainAssets = tagAssetsRepository.GetAll(mainTag.Id); + _main = new TagGraph(mainTag, mainAssets); + + var nextTag = _latestTags.First(e => e.IsPreRelease); + var nextAssets = tagAssetsRepository.GetAll(nextTag.Id); + _next = new TagGraph(nextTag, nextAssets); + + return isPreRelease ? _next : _main; + } + + public void Create(IEnumerable tags) + { + var tagsByName = tags.ToDictionary(tag => tag.Name); + var tagEntities = tagsRepository.Insert(tags.Select(tag => tag.ToEntity())); + + var assets = new List(); + foreach (var tagEntity in tagEntities) + { + var tag = tagsByName[tagEntity.Name]; + assets.AddRange(tag.Assets.Select(asset => (asset with { TagId = tag.Id }).ToEntity())); + } + + _ = tagAssetsRepository.Insert(assets); + _mustInvalidate = true; + } + + public void Update(IEnumerable tags) + { + tagsRepository.Update(tags.Select(tag => tag.ToEntity())); + _mustInvalidate = true; + } +} \ No newline at end of file diff --git a/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html b/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html index bdf81ab..645fff3 100644 --- a/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html +++ b/rubberduckvba.client/src/app/components/feature-box/feature-box.component.html @@ -1,33 +1,32 @@ -
+
-
-
+
+

{{feature.title}}

-
-
- + Details ▸ +
-
+

{{feature.title}}

-
- - Details ▸ - -
-
+
{{feature.title}}
+
+ + Details ▸ + +
@@ -51,7 +50,6 @@

{{feature.title}}

-
diff --git a/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html b/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html index 46599b3..7059838 100644 --- a/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html +++ b/rubberduckvba.client/src/app/components/feature-info/feature-info.component.html @@ -18,11 +18,9 @@

{{feature?.title}}

-
    -
  • - -
    • -
+
+ +
diff --git a/rubberduckvba.client/src/app/model/feature.model.ts b/rubberduckvba.client/src/app/model/feature.model.ts index 0a28821..2f654f7 100644 --- a/rubberduckvba.client/src/app/model/feature.model.ts +++ b/rubberduckvba.client/src/app/model/feature.model.ts @@ -288,6 +288,8 @@ export interface PaginatedFeature { } export class FeatureViewModel { + parentId: number|null = null; + description: string; features: FeatureViewModel[] = []; diff --git a/rubberduckvba.client/src/styles.css b/rubberduckvba.client/src/styles.css index 94cb109..978bc50 100644 --- a/rubberduckvba.client/src/styles.css +++ b/rubberduckvba.client/src/styles.css @@ -7,7 +7,7 @@ body { } h1, h2, h3, h4, h5, h6 { - font-family: 'Ink Free'; + font-family: 'Ink Free', 'Acme'; font-weight: bold; } @@ -20,7 +20,7 @@ h1, h2, h3, h4, h5, h6 { } .modal-header { - font-family: 'Ink Free'; + font-family: 'Ink Free', 'Acme'; font-weight: bold; } @@ -71,3 +71,4 @@ a { color: midnightblue; background-color: #1e90ff1b; } + diff --git a/rubberduckvba.database/Tables/Annotations.sql b/rubberduckvba.database/Tables/Annotations.sql new file mode 100644 index 0000000..021a113 --- /dev/null +++ b/rubberduckvba.database/Tables/Annotations.sql @@ -0,0 +1,17 @@ +CREATE TABLE [dbo].[Annotations] +( + [Id] INT NOT NULL IDENTITY, + [DateTimeInserted] DATETIME2 NOT NULL, + [DateTimeUpdated] DATETIME2 NULL, + [FeatureId] INT NOT NULL, + [TagAssetId] INT NOT NULL, + [SourceUrl] NVARCHAR(1023) NOT NULL, + [Name] NVARCHAR(255) NOT NULL, + [Remarks] NVARCHAR(MAX) NOT NULL, + [JsonParameters] NVARCHAR(MAX) NULL, + [JsonExamples] NVARCHAR(MAX) NULL, + CONSTRAINT [PK_Annotations] PRIMARY KEY CLUSTERED ([Id]), + CONSTRAINT [NK_Annotations] UNIQUE ([Name]), + CONSTRAINT [FK_Annotations_Features] FOREIGN KEY ([FeatureId]) REFERENCES [dbo].[Features] ([Id]), + CONSTRAINT [FK_Annotations_TagAssets] FOREIGN KEY ([TagAssetId]) REFERENCES [dbo].[TagAssets] ([Id]) +) diff --git a/rubberduckvba.database/Tables/FeatureXmlDoc.sql b/rubberduckvba.database/Tables/FeatureXmlDoc.sql deleted file mode 100644 index 9a19735..0000000 --- a/rubberduckvba.database/Tables/FeatureXmlDoc.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE [dbo].[FeatureXmlDoc] -( - [Id] INT NOT NULL IDENTITY, - [DateTimeInserted] DATETIME2 NOT NULL, - [DateTimeUpdated] DATETIME2 NULL, - [FeatureId] INT NOT NULL, - [Name] NVARCHAR(255) NOT NULL, - [Title] NVARCHAR(255) NOT NULL, - [Description] NVARCHAR(MAX) NOT NULL, - [IsNew] BIT NOT NULL , - [IsDiscontinued] BIT NOT NULL, - [IsHidden] BIT NOT NULL, - [TagAssetId] INT NOT NULL, - [SourceUrl] NVARCHAR(1023) NOT NULL, - [Serialized] NVARCHAR(MAX) NOT NULL, - CONSTRAINT [PK_FeatureXmlDoc] PRIMARY KEY CLUSTERED ([Id]), - CONSTRAINT [FK_FeatureXmlDoc_Features] FOREIGN KEY ([FeatureId]) REFERENCES [dbo].[Features] ([Id]), - CONSTRAINT [FK_FeatureXmlDoc_TagAssets] FOREIGN KEY ([TagAssetId]) REFERENCES [dbo].[TagAssets] ([Id]) -) diff --git a/rubberduckvba.database/Tables/Inspections.sql b/rubberduckvba.database/Tables/Inspections.sql new file mode 100644 index 0000000..6aed520 --- /dev/null +++ b/rubberduckvba.database/Tables/Inspections.sql @@ -0,0 +1,23 @@ +CREATE TABLE [dbo].[Inspections] +( + [Id] INT NOT NULL IDENTITY, + [DateTimeInserted] DATETIME2 NOT NULL, + [DateTimeUpdated] DATETIME2 NULL, + [FeatureId] INT NOT NULL, + [TagAssetId] INT NOT NULL, + [SourceUrl] NVARCHAR(1023) NOT NULL, + [Name] NVARCHAR(255) NOT NULL, + [InspectionType] NVARCHAR(255) NOT NULL, + [DefaultSeverity] NVARCHAR(255) NOT NULL, + [Summary] NVARCHAR(MAX) NOT NULL, + [Reasoning] NVARCHAR(MAX) NOT NULL, + [Remarks] NVARCHAR(MAX) NULL, + [HostApp] NVARCHAR(MAX) NULL, + [References] NVARCHAR(MAX) NULL, + [QuickFixes] NVARCHAR(MAX) NULL, + [JsonExamples] NVARCHAR(MAX) NULL, + CONSTRAINT [PK_Inspections] PRIMARY KEY CLUSTERED ([Id]), + CONSTRAINT [NK_Inspections] UNIQUE ([Name]), + CONSTRAINT [FK_Inspections_Features] FOREIGN KEY ([FeatureId]) REFERENCES [dbo].[Features] ([Id]), + CONSTRAINT [FK_Inspections_TagAssets] FOREIGN KEY ([TagAssetId]) REFERENCES [dbo].[TagAssets] ([Id]) +) diff --git a/rubberduckvba.database/Tables/QuickFixes.sql b/rubberduckvba.database/Tables/QuickFixes.sql new file mode 100644 index 0000000..b1841e3 --- /dev/null +++ b/rubberduckvba.database/Tables/QuickFixes.sql @@ -0,0 +1,23 @@ +CREATE TABLE [dbo].[QuickFixes] +( + [Id] INT NOT NULL IDENTITY, + [DateTimeInserted] DATETIME2 NOT NULL, + [DateTimeUpdated] DATETIME2 NULL, + [FeatureId] INT NOT NULL, + [TagAssetId] INT NOT NULL, + [SourceUrl] NVARCHAR(1023) NOT NULL, + [Name] NVARCHAR(255) NOT NULL, + [Summary] NVARCHAR(MAX) NOT NULL, + [Remarks] NVARCHAR(MAX) NULL, + [CanFixMultiple] BIT NOT NULL, + [CanFixProcedure] BIT NOT NULL, + [CanFixModule] BIT NOT NULL, + [CanFixProject] BIT NOT NULL, + [CanFixAll] BIT NOT NULL, + [Inspections] NVARCHAR(MAX) NOT NULL, + [JsonExamples] NVARCHAR(MAX) NULL, + CONSTRAINT [PK_QuickFixes] PRIMARY KEY CLUSTERED ([Id]), + CONSTRAINT [NK_QuickFixes] UNIQUE ([Name]), + CONSTRAINT [FK_QuickFixes_Features] FOREIGN KEY ([FeatureId]) REFERENCES [dbo].[Features] ([Id]), + CONSTRAINT [FK_QuickFixes_TagAssets] FOREIGN KEY ([TagAssetId]) REFERENCES [dbo].[TagAssets] ([Id]) +) diff --git a/rubberduckvba.database/rubberduckvba.database.sqlproj b/rubberduckvba.database/rubberduckvba.database.sqlproj index 406a3ff..6887309 100644 --- a/rubberduckvba.database/rubberduckvba.database.sqlproj +++ b/rubberduckvba.database/rubberduckvba.database.sqlproj @@ -61,9 +61,11 @@ - + + + From e3afaaa8be2601ebc179a79c09e260419e4a9d3e Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Thu, 7 Nov 2024 23:46:45 -0500 Subject: [PATCH 08/11] fix DI and configuration, adjust tags pipeline --- .../Api/Admin/AdminController.cs | 2 +- .../Sections/Context/StagingContext.cs | 20 ++++--------------- .../Sections/SyncTags/SyncTagsSection.cs | 2 +- .../Sections/SyncXmldoc/SyncXmldocSection.cs | 4 +--- .../Data/AnnotationsRepository.cs | 2 +- .../Data/FeaturesRepository.cs | 3 +-- .../Data/InspectionsRepository.cs | 2 +- .../Data/QuickFixRepository.cs | 2 +- rubberduckvba.Server/Data/Repository.cs | 2 +- .../Hangfire/QueuedUpdateOrchestrator.cs | 15 +++++++++++++- rubberduckvba.Server/Model/Tag.cs | 6 +++++- rubberduckvba.Server/Program.cs | 17 ++++++++++++---- .../Services/GitHubClientService.cs | 13 ++++++++---- .../src/environments/environment.prod.ts | 2 +- .../src/environments/environment.ts | 2 +- 15 files changed, 55 insertions(+), 39 deletions(-) diff --git a/rubberduckvba.Server/Api/Admin/AdminController.cs b/rubberduckvba.Server/Api/Admin/AdminController.cs index 26261aa..1c56ba9 100644 --- a/rubberduckvba.Server/Api/Admin/AdminController.cs +++ b/rubberduckvba.Server/Api/Admin/AdminController.cs @@ -10,7 +10,6 @@ namespace rubberduckvba.Server.Api.Admin; -[Authorize("github")] [ApiController] public class AdminController(ConfigurationOptions options, IBackgroundJobClient backgroundJob, ILogger logger) : ControllerBase { @@ -53,6 +52,7 @@ public async ValueTask Config() public record class ConfigurationOptions( IOptions ConnectionOptions, + IOptions GitHubOptions, IOptions HangfireOptions) { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs index e6e2301..a03fc4b 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs @@ -12,21 +12,9 @@ public StagingContext(SyncRequestParameters parameters) Parameters = parameters; } - public ConcurrentBag ProcessedTags { get; } = []; - public ICollection NewTags { get; set; } = []; - public ICollection UpdatedTags { get; set; } = []; + public ConcurrentBag Tags { get; } = []; - public ConcurrentBag ProcessedFeatureItems { get; } = []; - public ICollection NewFeatureItems { get; set; } = []; - public ICollection UpdatedFeatureItems { get; set; } = []; - - - public IEnumerable NewInspections { get; set; } = []; - public IEnumerable UpdatedInspections { get; set; } = []; - - public IEnumerable NewQuickFixes { get; set; } = []; - public IEnumerable UpdatedQuickFixes { get; set; } = []; - - public IEnumerable NewAnnotations { get; set; } = []; - public IEnumerable UpdatedAnnotations { get; set; } = []; + public IEnumerable Inspections { get; set; } = []; + public IEnumerable QuickFixes { get; set; } = []; + public IEnumerable Annotations { get; set; } = []; } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs index 0059209..143576b 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/SyncTagsSection.cs @@ -44,7 +44,7 @@ public SyncTagsSection(IPipeline parent, CancellationTokenSou private BulkSaveStagingBlock SaveTags { get; } public ITargetBlock InputBlock => ReceiveRequest.Block; - public Task OutputTask => AccumulateProcessedTags.Block.Completion; + public Task OutputTask => SaveTags.Block.Completion; protected override IReadOnlyDictionary Blocks => new Dictionary { diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs index 7633840..60c46ea 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs @@ -45,7 +45,6 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS ParseInspectionInfo = new ParseInspectionXElementInfoBlock(this, tokenSource, logger, markdownService); ParseQuickFixInfo = new ParseQuickFixXElementInfoBlock(this, tokenSource, logger); ParseAnnotationInfo = new ParseAnnotationXElementInfoBlock(this, tokenSource, logger); - FeatureItemBuffer = new FeatureItemBufferBlock(this, tokenSource, logger); MergeInspections = new MergeInspectionsBlock(this, tokenSource, logger, mergeService); MergeQuickFixes = new MergeQuickFixesBlock(this, tokenSource, logger, mergeService); MergeAnnotations = new MergeAnnotationsBlock(this, tokenSource, logger, mergeService); @@ -76,7 +75,6 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS private ParseInspectionXElementInfoBlock ParseInspectionInfo { get; } private ParseQuickFixXElementInfoBlock ParseQuickFixInfo { get; } private ParseAnnotationXElementInfoBlock ParseAnnotationInfo { get; } - private FeatureItemBufferBlock FeatureItemBuffer { get; } private MergeInspectionsBlock MergeInspections { get; } private MergeQuickFixesBlock MergeQuickFixes { get; } private MergeAnnotationsBlock MergeAnnotations { get; } @@ -110,7 +108,6 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS [nameof(ParseInspectionInfo)] = ParseInspectionInfo.Block, [nameof(ParseQuickFixInfo)] = ParseQuickFixInfo.Block, [nameof(ParseAnnotationInfo)] = ParseAnnotationInfo.Block, - [nameof(FeatureItemBuffer)] = FeatureItemBuffer.Block, [nameof(MergeInspections)] = MergeInspections.Block, [nameof(MergeQuickFixes)] = MergeQuickFixes.Block, [nameof(MergeAnnotations)] = MergeAnnotations.Block, @@ -146,6 +143,7 @@ public override void CreateBlocks() FeatureItemBuffer.CreateBlock(ParseInspectionInfo, ParseQuickFixInfo, ParseAnnotationInfo); AccumulateProcessedItems.CreateBlock(FeatureItemBuffer); MergeInspections.CreateBlock(() => Context.StagingContext.NewInspections, AccumulateProcessedItems.Block.Completion); + MergeQuickFixes.CreateBlock(() => Context.StagingContext.NewQuickFixes) SaveStaging.CreateBlock(MergeInspections); } } diff --git a/rubberduckvba.Server/Data/AnnotationsRepository.cs b/rubberduckvba.Server/Data/AnnotationsRepository.cs index 30fff64..37d7d87 100644 --- a/rubberduckvba.Server/Data/AnnotationsRepository.cs +++ b/rubberduckvba.Server/Data/AnnotationsRepository.cs @@ -3,7 +3,7 @@ namespace rubberduckvba.Server.Data; -public class AnnotationsRepository : Repository +public class AnnotationsRepository : Repository, IRepository { public AnnotationsRepository(IOptions settings) : base(settings) { } diff --git a/rubberduckvba.Server/Data/FeaturesRepository.cs b/rubberduckvba.Server/Data/FeaturesRepository.cs index 181cf1f..888c6ea 100644 --- a/rubberduckvba.Server/Data/FeaturesRepository.cs +++ b/rubberduckvba.Server/Data/FeaturesRepository.cs @@ -1,10 +1,9 @@ using Microsoft.Extensions.Options; -using rubberduckvba.Server; using rubberduckvba.Server.Model.Entity; namespace rubberduckvba.Server.Data; -public abstract class FeaturesRepository : Repository +public class FeaturesRepository : Repository, IRepository { public FeaturesRepository(IOptions settings) : base(settings) { } diff --git a/rubberduckvba.Server/Data/InspectionsRepository.cs b/rubberduckvba.Server/Data/InspectionsRepository.cs index ed39076..8e3a3aa 100644 --- a/rubberduckvba.Server/Data/InspectionsRepository.cs +++ b/rubberduckvba.Server/Data/InspectionsRepository.cs @@ -3,7 +3,7 @@ namespace rubberduckvba.Server.Data; -public class InspectionsRepository : Repository +public class InspectionsRepository : Repository, IRepository { public InspectionsRepository(IOptions settings) : base(settings) { } diff --git a/rubberduckvba.Server/Data/QuickFixRepository.cs b/rubberduckvba.Server/Data/QuickFixRepository.cs index 62cb39d..0c2b0cb 100644 --- a/rubberduckvba.Server/Data/QuickFixRepository.cs +++ b/rubberduckvba.Server/Data/QuickFixRepository.cs @@ -3,7 +3,7 @@ namespace rubberduckvba.Server.Data; -public class QuickFixRepository : Repository +public class QuickFixRepository : Repository, IRepository { public QuickFixRepository(IOptions settings) : base(settings) { } diff --git a/rubberduckvba.Server/Data/Repository.cs b/rubberduckvba.Server/Data/Repository.cs index 81c48e3..c884b64 100644 --- a/rubberduckvba.Server/Data/Repository.cs +++ b/rubberduckvba.Server/Data/Repository.cs @@ -52,7 +52,7 @@ protected void Execute(Action action) protected abstract string InsertSql { get; } protected abstract string UpdateSql { get; } - protected virtual string? ParentFKColumnName => "ParentFKColumnName"; + protected virtual string? ParentFKColumnName => null; public virtual int GetId(string name) => Get(db => db.QuerySingle($"SELECT [Id] FROM [dbo].[{TableName}] WHERE [Name]=@name", new { name })); public virtual TEntity GetById(int id) => Get(db => db.QuerySingle(SelectSql + " WHERE [Id]=@id", new { id })); diff --git a/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs b/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs index 5e6fc8d..f55a179 100644 --- a/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs +++ b/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs @@ -9,8 +9,12 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.XmlDoc; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Data; +using rubberduckvba.Server.Model.Entity; using rubberduckvba.Server.Services; +using rubberduckvba.Server.Services.rubberduckdb; using System.Diagnostics; +using System.Reflection; namespace rubberduckvba.Server.Hangfire; @@ -29,7 +33,7 @@ private static IServiceCollection Configure() var services = new ServiceCollection(); var configuration = new ConfigurationBuilder() .AddJsonFile("appsettings.json") - //.AddUserSecrets(Assembly.GetExecutingAssembly()) + .AddUserSecrets(Assembly.GetExecutingAssembly()) .Build(); @@ -97,6 +101,15 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton, TagsRepository>(); + services.AddSingleton, TagAssetsRepository>(); + services.AddSingleton, FeaturesRepository>(); + services.AddSingleton, InspectionsRepository>(); + services.AddSingleton, QuickFixRepository>(); + services.AddSingleton, AnnotationsRepository>(); + services.AddSingleton(); services.AddSingleton, SynchronizationPipelineFactory>(); services.AddSingleton(); diff --git a/rubberduckvba.Server/Model/Tag.cs b/rubberduckvba.Server/Model/Tag.cs index c1bfffd..6394100 100644 --- a/rubberduckvba.Server/Model/Tag.cs +++ b/rubberduckvba.Server/Model/Tag.cs @@ -4,6 +4,10 @@ namespace rubberduckvba.Server.Model; public record class Tag { + public Tag() + { + } + public Tag(TagEntity entity) { Id = entity.Id; @@ -43,7 +47,7 @@ public Tag(TagEntity entity) public record class TagGraph : Tag { - public TagGraph() : this(null!) { } + public TagGraph() : base() { } public TagGraph(TagEntity tag, IEnumerable assets) : base(tag) { diff --git a/rubberduckvba.Server/Program.cs b/rubberduckvba.Server/Program.cs index f3efe5a..3a2225f 100644 --- a/rubberduckvba.Server/Program.cs +++ b/rubberduckvba.Server/Program.cs @@ -14,8 +14,11 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.XmlDoc; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; +using rubberduckvba.Server.Data; using rubberduckvba.Server.Hangfire; +using rubberduckvba.Server.Model.Entity; using rubberduckvba.Server.Services; +using rubberduckvba.Server.Services.rubberduckdb; using System.Diagnostics; using System.Reflection; @@ -32,10 +35,6 @@ public static void Main(string[] args) { var builder = WebApplication.CreateBuilder(args); builder.Configuration.AddJsonFile("appsettings.json"); - builder.Configuration.AddEnvironmentVariables("ConnectionStrings"); - builder.Configuration.AddEnvironmentVariables("GitHub"); - builder.Configuration.AddEnvironmentVariables("Api"); - builder.Configuration.AddUserSecrets(Assembly.GetExecutingAssembly()); builder.Services.Configure(options => builder.Configuration.GetSection("ConnectionStrings").Bind(options)); @@ -43,6 +42,7 @@ public static void Main(string[] args) builder.Services.Configure(options => builder.Configuration.GetSection("Api").Bind(options)); builder.Services.Configure(options => builder.Configuration.GetSection("Hangfire").Bind(options)); + builder.Services.AddAuthentication(options => { options.RequireAuthenticatedSignIn = false; @@ -149,6 +149,15 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton, TagsRepository>(); + services.AddSingleton, TagAssetsRepository>(); + services.AddSingleton, FeaturesRepository>(); + services.AddSingleton, InspectionsRepository>(); + services.AddSingleton, QuickFixRepository>(); + services.AddSingleton, AnnotationsRepository>(); + //services.AddSingleton(); services.AddSingleton(); services.AddSingleton, InstallerDownloadStatsOrchestrator>(); diff --git a/rubberduckvba.Server/Services/GitHubClientService.cs b/rubberduckvba.Server/Services/GitHubClientService.cs index f855546..80e6f49 100644 --- a/rubberduckvba.Server/Services/GitHubClientService.cs +++ b/rubberduckvba.Server/Services/GitHubClientService.cs @@ -17,14 +17,19 @@ public interface IGitHubClientService { Task ValidateTokenAsync(string token); Task> GetAllTagsAsync(); - Task GetTagAsync(string token, string name); + Task GetTagAsync(string? token, string name); Task> GetCodeAnalysisDefaultsConfigAsync(); } public class GitHubClientService(IOptions configuration, ILogger logger) : IGitHubClientService { - public async Task ValidateTokenAsync(string token) + public async Task ValidateTokenAsync(string? token) { + if (token is null) + { + return null; + } + var config = configuration.Value; var credentials = new Credentials(token); var client = new GitHubClient(new ProductHeaderValue(config.UserAgent), new InMemoryCredentialStore(credentials)); @@ -75,10 +80,10 @@ where asset.Name.EndsWith(".xml") }).ToImmutableArray(); } - public async Task GetTagAsync(string token, string name) + public async Task GetTagAsync(string? token, string name) { var config = configuration.Value; - var credentials = new Credentials(config.OrgToken); + var credentials = new Credentials(token ?? config.OrgToken); var client = new GitHubClient(new ProductHeaderValue(config.UserAgent), new InMemoryCredentialStore(credentials)); var release = await client.Repository.Release.Get(config.OwnerOrg, config.Rubberduck, name); diff --git a/rubberduckvba.client/src/environments/environment.prod.ts b/rubberduckvba.client/src/environments/environment.prod.ts index 26d101a..e95e3c7 100644 --- a/rubberduckvba.client/src/environments/environment.prod.ts +++ b/rubberduckvba.client/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { production: true, - apiBaseUrl: 'https://test.api.rubberduckvba.com/' + apiBaseUrl: 'https://localhost:44314/' }; diff --git a/rubberduckvba.client/src/environments/environment.ts b/rubberduckvba.client/src/environments/environment.ts index ddc0b2d..0fd806b 100644 --- a/rubberduckvba.client/src/environments/environment.ts +++ b/rubberduckvba.client/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiBaseUrl: 'https://test.api.rubberduckvba.com/' + apiBaseUrl: 'https://localhost:44314/' }; /* From 2432f5d136ff3f4bff13b94e1c08cf51e65570b1 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Sat, 9 Nov 2024 14:19:21 -0500 Subject: [PATCH 09/11] refactor pipeline --- README.md | 2 +- .../SyntaxHighlighterService.cs | 27 ++- .../Api/Features/FeaturesController.cs | 20 +- .../SynchronizationPipelineFactory.cs | 17 +- .../Sections/Context/StagingContext.cs | 6 +- .../SyncTags/AccumulateProcessedTagsBlock.cs | 2 +- .../SyncXmldoc/AccumulateFeatureItemsBlock.cs | 21 -- .../AccumulateProcessedFeatureItemsBlock.cs | 31 --- .../AccumulateProcessedInspectionsBlock.cs | 59 ++++++ .../SyncXmldoc/BroadcastQuickFixesBlock.cs | 14 ++ .../SyncXmldoc/BulkSaveStagingBlock.cs | 7 +- ...etBlock.cs => DownloadXmlTagAssetBlock.cs} | 4 +- .../SyncXmldoc/MergeAnnotationsBlock.cs | 6 +- .../SyncXmldoc/MergeInspectionsBlock.cs | 7 +- .../SyncXmldoc/MergeQuickFixesBlock.cs | 6 +- .../ParseAnnotationXElementInfoBlock.cs | 8 +- .../ParseInspectionXElementInfoBlock.cs | 20 +- .../ParseQuickFixXElementInfoBlock.cs | 10 +- ...Block.cs => StreamAnnotationNodesBlock.cs} | 4 +- ...Block.cs => StreamInspectionNodesBlock.cs} | 4 +- ...tTagsBlock.cs => StreamLatestTagsBlock.cs} | 4 +- ...esBlock.cs => StreamQuickFixNodesBlock.cs} | 4 +- ...AssetsBlock.cs => StreamTagAssetsBlock.cs} | 4 +- .../Sections/SyncXmldoc/SyncXmldocSection.cs | 133 +++++++----- ...setsBlock.cs => XmlTagAssetBufferBlock.cs} | 4 +- .../Pipeline/SynchronizeXmlPipeline.cs | 13 +- .../XmlDoc/CodeAnalysisXmlDocParser.cs | 99 --------- .../XmlDoc/ParsingXmlDocParser.cs | 43 ---- .../XmlDoc/Schema/XmlDocSchema.cs | 5 + .../XmlDoc/XmlDocAnnotation.cs | 195 ------------------ .../XmlDoc/XmlDocAnnotationParser.cs | 178 ++++++++++++++++ .../XmlDoc/XmlDocInspection.cs | 150 -------------- .../XmlDoc/XmlDocInspectionParser.cs | 124 +++++++++++ .../XmlDoc/XmlDocMerge.cs | 147 +++++++++---- ...DocQuickFix.cs => XmlDocQuickFixParser.cs} | 67 +++--- rubberduckvba.Server/Data/DataModel.cs | 6 +- rubberduckvba.Server/Model/Annotation.cs | 17 +- .../Model/Entity/AnnotationEntity.cs | 3 +- rubberduckvba.Server/Model/Example.cs | 23 ++- rubberduckvba.Server/Model/Feature.cs | 19 +- rubberduckvba.Server/Model/Inspection.cs | 2 +- rubberduckvba.Server/Model/QuickFix.cs | 18 +- .../Services/MarkdownFormattingService.cs | 20 +- .../Services/RubberduckDbService.cs | 33 ++- 44 files changed, 791 insertions(+), 795 deletions(-) delete mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs delete mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedInspectionsBlock.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{DownloadXmlAssetBlock.cs => DownloadXmlTagAssetBlock.cs} (88%) rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{GetAnnotationNodesBlock.cs => StreamAnnotationNodesBlock.cs} (86%) rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{GetInspectionNodesBlock.cs => StreamInspectionNodesBlock.cs} (85%) rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{BroadcastLatestTagsBlock.cs => StreamLatestTagsBlock.cs} (65%) rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{GetQuickFixNodesBlock.cs => StreamQuickFixNodesBlock.cs} (86%) rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{BroadcastTagAssetsBlock.cs => StreamTagAssetsBlock.cs} (65%) rename rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/{StreamXmlAssetsBlock.cs => XmlTagAssetBufferBlock.cs} (61%) delete mode 100644 rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs delete mode 100644 rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs delete mode 100644 rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs delete mode 100644 rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspectionParser.cs rename rubberduckvba.Server/ContentSynchronization/XmlDoc/{XmlDocQuickFix.cs => XmlDocQuickFixParser.cs} (75%) diff --git a/README.md b/README.md index 7c80217..8d2c9e3 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ The task can be launched manually from the back-end API with an authenticated PO ## Update XmlDoc content Similarly, this job creates a TPL DataFlow pipeline that can be documented as follows: -![diagram](https://github.com/user-attachments/assets/519e1d61-514f-4186-a694-4db69d7e8da9) +![diagram](https://github.com/user-attachments/assets/dac3020c-9335-4573-b1ef-f4984cdf56b4) This pipeline hits GitHub to download the code inspections' default configuration from the **rubberduck-vba/Rubberduck** repository, fetches the current-latest tags from the database to compare against the current-latest tags from GitHub, then downloads the .xml assets and parses them into "feature items" and proceeds to merge the contents: - Items that exist in **next** but not **main** are considered/marked as NEW diff --git a/RubberduckServices/SyntaxHighlighterService.cs b/RubberduckServices/SyntaxHighlighterService.cs index 03ed507..d49d454 100644 --- a/RubberduckServices/SyntaxHighlighterService.cs +++ b/RubberduckServices/SyntaxHighlighterService.cs @@ -18,7 +18,7 @@ public interface ISyntaxHighlighterService /// /// A fragment of VBA code that can be parsed by Rubberduck. /// The provided code, syntax-formatted. - Task FormatAsync(string code); + string Format(string code); } public class SyntaxHighlighterService : ISyntaxHighlighterService @@ -52,7 +52,7 @@ public SyntaxHighlighterService( _attributeValueClass = cssAttributeValues; } - public async Task FormatAsync(string code) + public string Format(string code) { var indenter = new SimpleIndenter(); @@ -96,11 +96,10 @@ public async Task FormatAsync(string code) var lines = builder.ToString().Split("\n").ToArray(); var indent = lines.LastOrDefault()?.TakeWhile(char.IsWhiteSpace)?.Count() ?? 0; var formattedLines = from line in lines - let trimmed = line.Substring(indent) + let trimmed = line[indent..] select FormatIndents(trimmed); - var reconstructed = string.Join("
", formattedLines); - return await Task.FromResult(reconstructed); + return string.Join("
", formattedLines); } private void FormatTokens(StringBuilder builder, ITokenStream tokens, IntervalListener[] listeners) @@ -120,13 +119,13 @@ private void FormatTokens(StringBuilder builder, ITokenStream tokens, IntervalLi builder.Append($"{tokens.GetText(listener.Interval)}"); i = listener.Interval.b; } - else if (listener is NewLineListener) - { - if (token.Type == VBAParser.NEWLINE) - { - builder.Append(Environment.NewLine); - } - } + //else if (listener is NewLineListener) + //{ + // if (token.Type == VBAParser.NEWLINE) + // { + // builder.Append(Environment.NewLine); + // } + //} else { if (TokenKinds.StringLiterals.Contains(token.Type)) @@ -149,7 +148,7 @@ private void FormatTokens(StringBuilder builder, ITokenStream tokens, IntervalLi } } - private static ITokenStream Tokenize(string code) + private static CommonTokenStream Tokenize(string code) { AntlrInputStream input; using (var reader = new StringReader(code)) @@ -166,7 +165,7 @@ private static string FormatIndents(string line) var indent = line.TakeWhile(char.IsWhiteSpace).Count(); if (indent > 0) { - formatted = line.Substring(0, indent).Replace(" ", " ") + line.Substring(indent); + formatted = string.Concat(line[..indent].Replace(" ", " "), line.AsSpan(indent)); } return formatted; } diff --git a/rubberduckvba.Server/Api/Features/FeaturesController.cs b/rubberduckvba.Server/Api/Features/FeaturesController.cs index 5fe7258..6c5aacb 100644 --- a/rubberduckvba.Server/Api/Features/FeaturesController.cs +++ b/rubberduckvba.Server/Api/Features/FeaturesController.cs @@ -66,8 +66,8 @@ public async Task> Info([FromRoute] string name) var model = new FeatureViewModel(feature with { - Description = await md.FormatMarkdownDocument(feature.Description, true), - ShortDescription = await md.FormatMarkdownDocument(feature.ShortDescription), + Description = md.FormatMarkdownDocument(feature.Description, true), + ShortDescription = md.FormatMarkdownDocument(feature.ShortDescription), ParentId = feature.Id, ParentName = feature.Name, @@ -75,8 +75,8 @@ public async Task> Info([FromRoute] string name) Features = feature.Features.Select(subFeature => subFeature with { - Description = md.FormatMarkdownDocument(subFeature.Description).ConfigureAwait(false).GetAwaiter().GetResult(), - ShortDescription = md.FormatMarkdownDocument(subFeature.ShortDescription).ConfigureAwait(false).GetAwaiter().GetResult() + Description = md.FormatMarkdownDocument(subFeature.Description), + ShortDescription = md.FormatMarkdownDocument(subFeature.ShortDescription) }).ToArray(), Inspections = feature.Inspections, @@ -93,12 +93,12 @@ public async Task> Info([FromRoute] string name) public async Task Resolve([FromQuery] RepositoryId repository, [FromQuery] string name) { var graph = await db.ResolveFeature(repository, name); - var markdown = await md.FormatMarkdownDocument(graph.Description, withSyntaxHighlighting: true); + var markdown = md.FormatMarkdownDocument(graph.Description, withSyntaxHighlighting: true); return Ok(graph with { Description = markdown }); } [HttpGet("features/create")] - //[Authorize("github")] + [Authorize("github")] public async Task> Create([FromQuery] RepositoryId repository = RepositoryId.Rubberduck, [FromQuery] int? parentId = default) { var features = await GetFeatureOptions(repository); @@ -109,7 +109,7 @@ public async Task> Create([FromQuery] Reposit } [HttpPost("create")] - //[Authorize("github")] + [Authorize("github")] public async Task> Create([FromBody] FeatureEditViewModel model) { if (model.Id.HasValue || string.IsNullOrWhiteSpace(model.Name) || model.Name.Trim().Length < 3) @@ -131,7 +131,7 @@ public async Task> Create([FromBody] FeatureE } [HttpPost("features/update")] - //[Authorize("github")] + [Authorize("github")] public async Task> Update([FromBody] FeatureEditViewModel model) { if (model.Id.GetValueOrDefault() == default) @@ -152,8 +152,8 @@ public async Task> Update([FromBody] FeatureE } [HttpPost("features/markdown")] - public async Task FormatMarkdown([FromBody] MarkdownFormattingRequestViewModel model) + public IActionResult FormatMarkdown([FromBody] MarkdownFormattingRequestViewModel model) { - return Ok(await md.FormatMarkdownDocument(model.MarkdownContent, model.WithVbeCodeBlocks)); + return Ok(md.FormatMarkdownDocument(model.MarkdownContent, model.WithVbeCodeBlocks)); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs index cbe73ad..ca01999 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/SynchronizationPipelineFactory.cs @@ -1,5 +1,6 @@ using Hangfire; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.Server.Data; using rubberduckvba.Server.Model.Entity; @@ -19,8 +20,13 @@ public class SynchronizationPipelineFactory : ISynchronizationPipelineFactory _quickfixes; private readonly IRepository _annotations; + private readonly XmlDocAnnotationParser _annotationParser; + private readonly XmlDocQuickFixParser _quickFixParser; + private readonly XmlDocInspectionParser _inspectionParser; + public SynchronizationPipelineFactory(ILogger logger, IRubberduckDbService content, IGitHubClientService github, IXmlDocMerge merge, IStagingServices staging, IMarkdownFormattingService markdown, - IRepository inspections, IRepository quickfixes, IRepository annotations) + IRepository inspections, IRepository quickfixes, IRepository annotations, + XmlDocAnnotationParser xmlAnnotationParser, XmlDocQuickFixParser xmlQuickFixParser, XmlDocInspectionParser xmlInspectionParser) { _logger = logger; _content = content; @@ -31,20 +37,23 @@ public SynchronizationPipelineFactory(ILogger logger, IRubberduc _inspections = inspections; _quickfixes = quickfixes; _annotations = annotations; + + _annotationParser = xmlAnnotationParser; + _quickFixParser = xmlQuickFixParser; + _inspectionParser = xmlInspectionParser; } public ISynchronizationPipeline Create(TParameters parameters, CancellationTokenSource tokenSource) where TParameters : IRequestParameters { return parameters switch { - XmldocSyncRequestParameters => new SynchronizeXmlPipeline(parameters, _logger, _content, _github, _merge, _staging, _markdown, tokenSource, _inspections, _quickfixes, _annotations), + XmldocSyncRequestParameters => new SynchronizeXmlPipeline(parameters, _logger, _content, _github, _merge, _staging, _markdown, tokenSource, _inspections, _quickfixes, _annotations, _annotationParser, _quickFixParser, _inspectionParser), TagSyncRequestParameters => new SynchronizeTagsPipeline(parameters, _logger, _content, _github, _merge, _staging, tokenSource), _ => throw new NotSupportedException(), }; } } - public class HangfireTokenSource(IJobCancellationToken token) : CancellationTokenSource { public void ThrowIfCancellationRequested() => token.ThrowIfCancellationRequested(); -} \ No newline at end of file +} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs index a03fc4b..3cae870 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/StagingContext.cs @@ -14,7 +14,7 @@ public StagingContext(SyncRequestParameters parameters) public ConcurrentBag Tags { get; } = []; - public IEnumerable Inspections { get; set; } = []; - public IEnumerable QuickFixes { get; set; } = []; - public IEnumerable Annotations { get; set; } = []; + public ConcurrentBag Inspections { get; set; } = []; + public ConcurrentBag QuickFixes { get; set; } = []; + public ConcurrentBag Annotations { get; set; } = []; } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs index 7d0cf07..5bd4a50 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncTags/AccumulateProcessedTagsBlock.cs @@ -14,7 +14,7 @@ public AccumulateProcessedTagsBlock(PipelineSection parent, Cancell public override SyncContext Transform(TagGraph input) { - Context.StagingContext.ProcessedTags.Add(input); + Context.StagingContext.Tags.Add(input); return Context; } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs deleted file mode 100644 index b8a9aa3..0000000 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateFeatureItemsBlock.cs +++ /dev/null @@ -1,21 +0,0 @@ -using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -using rubberduckvba.Server.Data; - -namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; - -public class AccumulateFeatureItemsBlock : ActionBlockBase -{ - public AccumulateFeatureItemsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) - : base(parent, tokenSource, logger) - { - } - - protected override void Action(FeatureXmlDoc input) - { - if (input != null) - { - Context.StagingContext.ProcessedFeatureItems.Add(input); - } - } -} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs deleted file mode 100644 index b18a143..0000000 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedFeatureItemsBlock.cs +++ /dev/null @@ -1,31 +0,0 @@ -using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -using rubberduckvba.Server.Data; - -namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; - -public class AccumulateProcessedFeatureItemsBlock : ActionBlockBase -{ - public AccumulateProcessedFeatureItemsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) - : base(parent, tokenSource, logger) - { - } - - protected override void Action(FeatureXmlDoc input) - { - if (input != null) - { - //foreach (var featureItem in input.Examples.GroupBy(e => e)) - //{ - // var exampleNumber = 1; - // foreach (var example in featureItem) - // { - // example.SortOrder = exampleNumber; - // exampleNumber++; - // } - //} - - Context.StagingContext.ProcessedFeatureItems.Add(input); - } - } -} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedInspectionsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedInspectionsBlock.cs new file mode 100644 index 0000000..b7365aa --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/AccumulateProcessedInspectionsBlock.cs @@ -0,0 +1,59 @@ +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; + +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; + +public class AccumulateProcessedInspectionsBlock : ActionBlockBase +{ + public AccumulateProcessedInspectionsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } + + protected override void Action(Inspection input) + { + if (input is null) + { + return; + } + + Context.StagingContext.Inspections.Add(input); + } +} + +public class AccumulateProcessedQuickFixesBlock : ActionBlockBase +{ + public AccumulateProcessedQuickFixesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } + + protected override void Action(QuickFix input) + { + if (input is null) + { + return; + } + + Context.StagingContext.QuickFixes.Add(input); + } +} + +public class AccumulateProcessedAnnotationsBlock : ActionBlockBase +{ + public AccumulateProcessedAnnotationsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } + + protected override void Action(Annotation input) + { + if (input is null) + { + return; + } + + Context.StagingContext.Annotations.Add(input); + } +} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs new file mode 100644 index 0000000..7cd4d20 --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs @@ -0,0 +1,14 @@ +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; +using System.Xml.Linq; + +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; + +public class BroadcastQuickFixesBlock : BroadcastBlockBase<(TagAsset, XDocument, IEnumerable), SyncContext> +{ + public BroadcastQuickFixesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } +} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs index 664c43f..28eb80c 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BulkSaveStagingBlock.cs @@ -1,11 +1,10 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -using rubberduckvba.Server.Data; using rubberduckvba.Server.Services; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class BulkSaveStagingBlock : ActionBlockBase, SyncContext> +public class BulkSaveStagingBlock : ActionBlockBase { private readonly IStagingServices _staging; @@ -15,8 +14,8 @@ public BulkSaveStagingBlock(PipelineSection parent, CancellationTok _staging = staging; } - protected override async Task ActionAsync(IEnumerable input) + protected override async Task ActionAsync(StagingContext input) { - await _staging.StageAsync(Context.StagingContext, Token); + await _staging.StageAsync(input, Token); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlTagAssetBlock.cs similarity index 88% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlTagAssetBlock.cs index d17bc71..5cb6ab8 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlAssetBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/DownloadXmlTagAssetBlock.cs @@ -5,9 +5,9 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class DownloadXmlAssetBlock : TransformBlockBase +public class DownloadXmlTagAssetBlock : TransformBlockBase { - public DownloadXmlAssetBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public DownloadXmlTagAssetBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs index 36f156b..cbc6ff5 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs @@ -2,7 +2,6 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.Server.Model; -using System.Collections.Immutable; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; @@ -34,10 +33,9 @@ public override IEnumerable Transform(IEnumerable input) var merged = _service.Merge(dbItems, main, next); Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); - Context.StagingContext.UpdatedAnnotations = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); - Context.StagingContext.NewAnnotations = merged.Where(e => e.Id == default).ToImmutableArray(); + Context.StagingContext.Annotations = new(merged); - Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedAnnotations.Count()} | New: {Context.StagingContext.NewAnnotations.Count()}"); + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.Annotations.Count()} | New: {Context.StagingContext.Annotations.Count()}"); return merged; } finally diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs index 235c678..fd357c2 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs @@ -2,7 +2,6 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.Server.Model; -using System.Collections.Immutable; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; @@ -20,7 +19,6 @@ public override IEnumerable Transform(IEnumerable input) { try { - var main = input .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) .ToList(); @@ -34,10 +32,9 @@ public override IEnumerable Transform(IEnumerable input) var merged = _service.Merge(dbItems, main, next); Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); - Context.StagingContext.UpdatedInspections = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); - Context.StagingContext.NewInspections = merged.Where(e => e.Id == default).ToImmutableArray(); + Context.StagingContext.Inspections = new(merged); - Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedInspections.Count()} | New: {Context.StagingContext.NewInspections.Count()}"); + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.Inspections.Count(e => e.Id != default)} | New: {Context.StagingContext.Inspections.Count(e => e.Id == default)}"); return merged; } finally diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs index ef0e8b7..8c8040a 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs @@ -2,7 +2,6 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.Server.Model; -using System.Collections.Immutable; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; @@ -34,10 +33,9 @@ public override IEnumerable Transform(IEnumerable input) var merged = _service.Merge(dbItems, main, next); Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); - Context.StagingContext.UpdatedQuickFixes = merged.Where(e => e.Id != default && e.DateTimeUpdated.HasValue).ToImmutableArray(); - Context.StagingContext.NewQuickFixes = merged.Where(e => e.Id == default).ToImmutableArray(); + Context.StagingContext.QuickFixes = new(merged); - Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.UpdatedQuickFixes.Count()} | New: {Context.StagingContext.NewQuickFixes.Count()}"); + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.QuickFixes.Count(e => e.Id != default)} | New: {Context.StagingContext.QuickFixes.Count(e => e.Id == default)}"); return merged; } finally diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs index a6213c4..f729130 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseAnnotationXElementInfoBlock.cs @@ -7,9 +7,12 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmld public class ParseAnnotationXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), Annotation, SyncContext> { - public ParseAnnotationXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + private readonly XmlDocAnnotationParser _parser; + + public ParseAnnotationXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, XmlDocAnnotationParser parser) : base(parent, tokenSource, logger) { + _parser = parser; } public override Annotation Transform((TagAsset asset, XElementInfo info) input) @@ -17,8 +20,7 @@ public override Annotation Transform((TagAsset asset, XElementInfo info) input) var feature = Context.Features["Annotations"]; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); - var parser = new XmlDocAnnotation(input.info.Name, input.info.Element, isPreRelease); - var result = parser.Parse(input.asset.Id, feature.Id); + var result = _parser.Parse(input.asset.Id, feature.Id, input.info.Name, input.info.Element, isPreRelease); return result ?? throw new InvalidOperationException("Failed to parse annotation xmldoc"); } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs index 58b1d77..3aa6ed9 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs @@ -2,19 +2,18 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.XmlDoc; using rubberduckvba.Server.Model; -using rubberduckvba.Server.Services; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; public class ParseInspectionXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), Inspection, SyncContext> { - private readonly IMarkdownFormattingService _markdownService; + private readonly XmlDocInspectionParser _parser; public ParseInspectionXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, - IMarkdownFormattingService markdownService) + XmlDocInspectionParser parser) : base(parent, tokenSource, logger) { - _markdownService = markdownService; + _parser = parser; } public override async Task TransformAsync((TagAsset asset, XElementInfo info) input) @@ -25,19 +24,14 @@ public override async Task TransformAsync((TagAsset asset, XElementI } var feature = Context.Features["Inspections"]; - var quickfixes = Context.Features["QuickFixes"].QuickFixes; // FIXME not loaded in initial run + var quickfixes = Context.Features["QuickFixes"].QuickFixes; // NOTE: this makes parsing quickfixes a requirement for inspections + var config = Context.InspectionDefaultConfig.TryGetValue(input.info.Name, out var value) ? value : null; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); var name = input.info.Element.Attribute("name")!.Value; - if (Context.TryGetTagById(input.asset.TagId, out var tag)) - { - var parser = new XmlDocInspection(_markdownService); - var result = await parser.ParseAsync(input.asset.Id, tag.Name, feature.Id, quickfixes, name, input.info.Element, config, isPreRelease); - - return result with { TagAssetId = input.asset.Id }; - } + var result = await _parser.ParseAsync(input.asset.Id, feature.Id, quickfixes, name, input.info.Element, config, isPreRelease); - throw new InvalidOperationException($"[Tag.Id]:{input.asset.TagId} was not loaded or does not exist."); + return result with { TagAssetId = input.asset.Id }; } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs index c793f52..e2e8ba3 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseQuickFixXElementInfoBlock.cs @@ -7,9 +7,12 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmld public class ParseQuickFixXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), QuickFix, SyncContext> { - public ParseQuickFixXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + private readonly XmlDocQuickFixParser _parser; + + public ParseQuickFixXElementInfoBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger, XmlDocQuickFixParser parser) : base(parent, tokenSource, logger) { + _parser = parser; } public override QuickFix Transform((TagAsset asset, XElementInfo info) input) @@ -22,9 +25,8 @@ public override QuickFix Transform((TagAsset asset, XElementInfo info) input) var feature = Context.Features["QuickFixes"]; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); - var parser = new XmlDocQuickFix(); - var result = parser.Parse(input.info.Name, input.asset.Id, feature.Id, input.info.Element, isPreRelease) with { TagAssetId = input.asset.Id }; + var result = _parser.Parse(input.info.Name, input.asset.Id, feature.Id, input.info.Element, isPreRelease) with { TagAssetId = input.asset.Id }; - return result ?? throw new InvalidOperationException("Failed to parse xmldoc"); + return result ?? throw new InvalidOperationException("Failed to parse quickfix xmldoc"); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamAnnotationNodesBlock.cs similarity index 86% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamAnnotationNodesBlock.cs index 11e9df9..591f88f 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetAnnotationNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamAnnotationNodesBlock.cs @@ -5,9 +5,9 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class GetAnnotationNodesBlock : GetXElementInfoBlock +public class StreamAnnotationNodesBlock : GetXElementInfoBlock { - public GetAnnotationNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public StreamAnnotationNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs similarity index 85% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs index d537641..10fa389 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetInspectionNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs @@ -5,9 +5,9 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class GetInspectionNodesBlock : GetXElementInfoBlock +public class StreamInspectionNodesBlock : GetXElementInfoBlock { - public GetInspectionNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public StreamInspectionNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamLatestTagsBlock.cs similarity index 65% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamLatestTagsBlock.cs index eb39169..00893cc 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastLatestTagsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamLatestTagsBlock.cs @@ -4,9 +4,9 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class BroadcastLatestTagsBlock : TransformManyBlockBase, TagGraph, SyncContext> +public class StreamLatestTagsBlock : TransformManyBlockBase, TagGraph, SyncContext> { - public BroadcastLatestTagsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public StreamLatestTagsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamQuickFixNodesBlock.cs similarity index 86% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamQuickFixNodesBlock.cs index 0548a14..6f924f9 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/GetQuickFixNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamQuickFixNodesBlock.cs @@ -5,9 +5,9 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class GetQuickFixNodesBlock : GetXElementInfoBlock +public class StreamQuickFixNodesBlock : GetXElementInfoBlock { - public GetQuickFixNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public StreamQuickFixNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamTagAssetsBlock.cs similarity index 65% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamTagAssetsBlock.cs index 862c16f..798fd0c 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastTagAssetsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamTagAssetsBlock.cs @@ -4,9 +4,9 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class BroadcastTagAssetsBlock : TransformManyBlockBase +public class StreamTagAssetsBlock : TransformManyBlockBase { - public BroadcastTagAssetsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public StreamTagAssetsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs index 60c46ea..99bd41e 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs @@ -1,12 +1,14 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncTags; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.Server.Data; using rubberduckvba.Server.Model; using rubberduckvba.Server.Model.Entity; using rubberduckvba.Server.Services; using System.Threading.Tasks.Dataflow; +using System.Xml.Linq; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; @@ -20,7 +22,9 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS IGitHubClientService github, IXmlDocMerge mergeService, IStagingServices staging, - IMarkdownFormattingService markdownService) + XmlDocAnnotationParser xmlAnnotationParser, + XmlDocQuickFixParser xmlQuickFixParser, + XmlDocInspectionParser xmlInspectionParser) : base(parent, tokenSource, logger) { ReceiveRequest = new ReceiveRequestBlock(this, tokenSource, logger); @@ -34,21 +38,24 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS JoinDbTags = new DataflowJoinBlock>(this, tokenSource, logger, nameof(JoinDbTags)); LoadDbTags = new LoadDbTagsBlock(this, tokenSource, logger); JoinAsyncSources = new DataflowJoinBlock(this, tokenSource, logger, nameof(JoinAsyncSources)); - BroadcastTags = new BroadcastLatestTagsBlock(this, tokenSource, logger); - BroadcastAssets = new BroadcastTagAssetsBlock(this, tokenSource, logger); - StreamXmlAssets = new StreamXmlAssetsBlock(this, tokenSource, logger); - DownloadXmlAsset = new DownloadXmlAssetBlock(this, tokenSource, logger); + StreamLatestTags = new StreamLatestTagsBlock(this, tokenSource, logger); + StreamTagAssets = new StreamTagAssetsBlock(this, tokenSource, logger); + BufferXmlAsset = new XmlTagAssetBufferBlock(this, tokenSource, logger); + DownloadXmlAsset = new DownloadXmlTagAssetBlock(this, tokenSource, logger); BroadcastXDocument = new BroadcastXDocumentBlock(this, tokenSource, logger); - GetInspectionNodes = new GetInspectionNodesBlock(this, tokenSource, logger); - GetQuickFixNodes = new GetQuickFixNodesBlock(this, tokenSource, logger); - GetAnnotationNodes = new GetAnnotationNodesBlock(this, tokenSource, logger); - ParseInspectionInfo = new ParseInspectionXElementInfoBlock(this, tokenSource, logger, markdownService); - ParseQuickFixInfo = new ParseQuickFixXElementInfoBlock(this, tokenSource, logger); - ParseAnnotationInfo = new ParseAnnotationXElementInfoBlock(this, tokenSource, logger); + JoinQuickFixes = new DataflowJoinBlock<(TagAsset, XDocument), IEnumerable>(this, tokenSource, logger, nameof(JoinQuickFixes)); + StreamInspectionNodes = new StreamInspectionNodesBlock(this, tokenSource, logger); + StreamQuickFixNodes = new StreamQuickFixNodesBlock(this, tokenSource, logger); + StreamAnnotationNodes = new StreamAnnotationNodesBlock(this, tokenSource, logger); + ParseXmlDocInspections = new ParseInspectionXElementInfoBlock(this, tokenSource, logger, xmlInspectionParser); + ParseXmlDocQuickFixes = new ParseQuickFixXElementInfoBlock(this, tokenSource, logger, xmlQuickFixParser); + ParseXmlDocAnnotations = new ParseAnnotationXElementInfoBlock(this, tokenSource, logger, xmlAnnotationParser); MergeInspections = new MergeInspectionsBlock(this, tokenSource, logger, mergeService); MergeQuickFixes = new MergeQuickFixesBlock(this, tokenSource, logger, mergeService); MergeAnnotations = new MergeAnnotationsBlock(this, tokenSource, logger, mergeService); - AccumulateProcessedItems = new AccumulateProcessedFeatureItemsBlock(this, tokenSource, logger); + AccumulateProcessedInspections = new AccumulateProcessedInspectionsBlock(this, tokenSource, logger); + AccumulateProcessedQuickFixes = new AccumulateProcessedQuickFixesBlock(this, tokenSource, logger); + AccumulateProcessedAnnotations = new AccumulateProcessedAnnotationsBlock(this, tokenSource, logger); SaveStaging = new BulkSaveStagingBlock(this, tokenSource, staging, logger); } @@ -64,21 +71,29 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS private DataflowJoinBlock> JoinDbTags { get; } private LoadDbTagsBlock LoadDbTags { get; } private DataflowJoinBlock JoinAsyncSources { get; } - private BroadcastLatestTagsBlock BroadcastTags { get; } - private BroadcastTagAssetsBlock BroadcastAssets { get; } - private StreamXmlAssetsBlock StreamXmlAssets { get; } - private DownloadXmlAssetBlock DownloadXmlAsset { get; } + private StreamLatestTagsBlock StreamLatestTags { get; } + private StreamTagAssetsBlock StreamTagAssets { get; } + private XmlTagAssetBufferBlock BufferXmlAsset { get; } + private DownloadXmlTagAssetBlock DownloadXmlAsset { get; } private BroadcastXDocumentBlock BroadcastXDocument { get; } - private GetInspectionNodesBlock GetInspectionNodes { get; } - private GetQuickFixNodesBlock GetQuickFixNodes { get; } - private GetAnnotationNodesBlock GetAnnotationNodes { get; } - private ParseInspectionXElementInfoBlock ParseInspectionInfo { get; } - private ParseQuickFixXElementInfoBlock ParseQuickFixInfo { get; } - private ParseAnnotationXElementInfoBlock ParseAnnotationInfo { get; } - private MergeInspectionsBlock MergeInspections { get; } + + private StreamQuickFixNodesBlock StreamQuickFixNodes { get; } + private ParseQuickFixXElementInfoBlock ParseXmlDocQuickFixes { get; } private MergeQuickFixesBlock MergeQuickFixes { get; } + private BroadcastQuickFixesBlock BroadcastQuickFixes { get; } + private AccumulateProcessedQuickFixesBlock AccumulateProcessedQuickFixes { get; } + + private DataflowJoinBlock<(TagAsset, XDocument), IEnumerable> JoinQuickFixes { get; } + private StreamInspectionNodesBlock StreamInspectionNodes { get; } + private ParseInspectionXElementInfoBlock ParseXmlDocInspections { get; } + private MergeInspectionsBlock MergeInspections { get; } + private AccumulateProcessedInspectionsBlock AccumulateProcessedInspections { get; } + + private StreamAnnotationNodesBlock StreamAnnotationNodes { get; } + private ParseAnnotationXElementInfoBlock ParseXmlDocAnnotations { get; } private MergeAnnotationsBlock MergeAnnotations { get; } - private AccumulateProcessedFeatureItemsBlock AccumulateProcessedItems { get; } + private AccumulateProcessedAnnotationsBlock AccumulateProcessedAnnotations { get; } + private BulkSaveStagingBlock SaveStaging { get; } public ITargetBlock InputBlock => ReceiveRequest.Block; @@ -97,21 +112,28 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS [nameof(JoinDbTags)] = JoinDbTags.Block, [nameof(LoadDbTags)] = LoadDbTags.Block, [nameof(JoinAsyncSources)] = JoinAsyncSources.Block, - [nameof(BroadcastTags)] = BroadcastTags.Block, - [nameof(BroadcastAssets)] = BroadcastAssets.Block, - [nameof(StreamXmlAssets)] = StreamXmlAssets.Block, + [nameof(StreamLatestTags)] = StreamLatestTags.Block, + [nameof(StreamTagAssets)] = StreamTagAssets.Block, + [nameof(BufferXmlAsset)] = BufferXmlAsset.Block, [nameof(DownloadXmlAsset)] = DownloadXmlAsset.Block, [nameof(BroadcastXDocument)] = BroadcastXDocument.Block, - [nameof(GetInspectionNodes)] = GetInspectionNodes.Block, - [nameof(GetQuickFixNodes)] = GetQuickFixNodes.Block, - [nameof(GetAnnotationNodes)] = GetAnnotationNodes.Block, - [nameof(ParseInspectionInfo)] = ParseInspectionInfo.Block, - [nameof(ParseQuickFixInfo)] = ParseQuickFixInfo.Block, - [nameof(ParseAnnotationInfo)] = ParseAnnotationInfo.Block, - [nameof(MergeInspections)] = MergeInspections.Block, + [nameof(JoinQuickFixes)] = JoinQuickFixes.Block, + + [nameof(StreamQuickFixNodes)] = StreamQuickFixNodes.Block, + [nameof(ParseXmlDocQuickFixes)] = ParseXmlDocQuickFixes.Block, [nameof(MergeQuickFixes)] = MergeQuickFixes.Block, + [nameof(AccumulateProcessedQuickFixes)] = AccumulateProcessedQuickFixes.Block, + + [nameof(StreamInspectionNodes)] = StreamInspectionNodes.Block, + [nameof(ParseXmlDocInspections)] = ParseXmlDocInspections.Block, + [nameof(MergeInspections)] = MergeInspections.Block, + [nameof(AccumulateProcessedInspections)] = AccumulateProcessedInspections.Block, + + [nameof(StreamAnnotationNodes)] = StreamAnnotationNodes.Block, + [nameof(ParseXmlDocAnnotations)] = ParseXmlDocAnnotations.Block, [nameof(MergeAnnotations)] = MergeAnnotations.Block, - [nameof(AccumulateProcessedItems)] = AccumulateProcessedItems.Block, + [nameof(AccumulateProcessedAnnotations)] = AccumulateProcessedAnnotations.Block, + [nameof(SaveStaging)] = SaveStaging.Block, }; #endregion @@ -129,21 +151,32 @@ public override void CreateBlocks() JoinDbTags.CreateBlock(AcquireDbMainTagGraph, AcquireDbNextTagGraph, AcquireDbTags); LoadDbTags.CreateBlock(JoinDbTags); JoinAsyncSources.CreateBlock(LoadDbTags, LoadInspectionDefaultConfig, LoadFeatures); - BroadcastTags.CreateBlock(JoinAsyncSources); - BroadcastAssets.CreateBlock(BroadcastTags); - StreamXmlAssets.CreateBlock(BroadcastAssets); - DownloadXmlAsset.CreateBlock(StreamXmlAssets); + StreamLatestTags.CreateBlock(JoinAsyncSources); + StreamTagAssets.CreateBlock(StreamLatestTags); + BufferXmlAsset.CreateBlock(StreamTagAssets); + DownloadXmlAsset.CreateBlock(BufferXmlAsset); BroadcastXDocument.CreateBlock(DownloadXmlAsset); - GetInspectionNodes.CreateBlock(BroadcastXDocument); - GetQuickFixNodes.CreateBlock(BroadcastXDocument); - GetAnnotationNodes.CreateBlock(BroadcastXDocument); - ParseInspectionInfo.CreateBlock(GetInspectionNodes); - ParseQuickFixInfo.CreateBlock(GetQuickFixNodes); - ParseAnnotationInfo.CreateBlock(GetAnnotationNodes); - FeatureItemBuffer.CreateBlock(ParseInspectionInfo, ParseQuickFixInfo, ParseAnnotationInfo); - AccumulateProcessedItems.CreateBlock(FeatureItemBuffer); - MergeInspections.CreateBlock(() => Context.StagingContext.NewInspections, AccumulateProcessedItems.Block.Completion); - MergeQuickFixes.CreateBlock(() => Context.StagingContext.NewQuickFixes) - SaveStaging.CreateBlock(MergeInspections); + + StreamQuickFixNodes.CreateBlock(BroadcastXDocument); + ParseXmlDocQuickFixes.CreateBlock(StreamQuickFixNodes); + MergeQuickFixes.CreateBlock(() => Context.StagingContext.QuickFixes, AccumulateProcessedQuickFixes.Block.Completion); + BroadcastQuickFixes.CreateBlock(MergeQuickFixes); + AccumulateProcessedQuickFixes.CreateBlock(BroadcastQuickFixes); + JoinQuickFixes.CreateBlock(BroadcastXDocument, BroadcastQuickFixes); + + StreamAnnotationNodes.CreateBlock(BroadcastXDocument); + ParseXmlDocAnnotations.CreateBlock(StreamAnnotationNodes); + MergeAnnotations.CreateBlock(() => Context.StagingContext.Annotations, AccumulateProcessedAnnotations.Block.Completion); + AccumulateProcessedAnnotations.CreateBlock(MergeAnnotations); + + StreamInspectionNodes.CreateBlock(JoinQuickFixes); + ParseXmlDocInspections.CreateBlock(StreamInspectionNodes); + MergeInspections.CreateBlock(() => Context.StagingContext.Inspections, AccumulateProcessedInspections.Block.Completion); + AccumulateProcessedInspections.CreateBlock(MergeInspections); + + SaveStaging.CreateBlock(() => Context.StagingContext, + AccumulateProcessedInspections.Block.Completion, + AccumulateProcessedQuickFixes.Block.Completion, + AccumulateProcessedAnnotations.Block.Completion); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs similarity index 61% rename from rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs rename to rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs index 860caa9..86fabc6 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamXmlAssetsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs @@ -4,8 +4,8 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class StreamXmlAssetsBlock : BufferBlockBase +public class XmlTagAssetBufferBlock : BufferBlockBase { - public StreamXmlAssetsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public XmlTagAssetBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs index b8daaf7..4e50ac3 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/SynchronizeXmlPipeline.cs @@ -1,6 +1,7 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; +using rubberduckvba.Server.ContentSynchronization.XmlDoc; using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; using rubberduckvba.Server.Data; using rubberduckvba.Server.Model.Entity; @@ -18,9 +19,13 @@ public class SynchronizeXmlPipeline : PipelineBase, ISynchron private readonly IRepository _inspections; private readonly IRepository _quickfixes; private readonly IRepository _annotations; + private readonly XmlDocAnnotationParser _annotationParser; + private readonly XmlDocQuickFixParser _quickFixParser; + private readonly XmlDocInspectionParser _inspectionParser; public SynchronizeXmlPipeline(IRequestParameters parameters, ILogger logger, IRubberduckDbService content, IGitHubClientService github, IXmlDocMerge merge, IStagingServices staging, IMarkdownFormattingService markdown, CancellationTokenSource tokenSource, - IRepository inspections, IRepository quickfixes, IRepository annotations) + IRepository inspections, IRepository quickfixes, IRepository annotations, + XmlDocAnnotationParser xmlAnnotationParser, XmlDocQuickFixParser xmlQuickFixParser, XmlDocInspectionParser xmlInspectionParser) : base(new SyncContext(parameters), tokenSource, logger) { _content = content; @@ -31,6 +36,10 @@ public SynchronizeXmlPipeline(IRequestParameters parameters, ILogger logger, IRu _inspections = inspections; _quickfixes = quickfixes; _annotations = annotations; + + _annotationParser = xmlAnnotationParser; + _quickFixParser = xmlQuickFixParser; + _inspectionParser = xmlInspectionParser; } public async Task> ExecuteAsync(SyncRequestParameters parameters, CancellationTokenSource tokenSource) @@ -42,7 +51,7 @@ public async Task> ExecuteAsync(SyncRequestParameters para } // 01. Create the pipeline sections - var synchronizeFeatureItems = new SyncXmldocSection(this, tokenSource, Logger, _content, _inspections, _quickfixes, _annotations, _github, _merge, _staging, _markdown); + var synchronizeFeatureItems = new SyncXmldocSection(this, tokenSource, Logger, _content, _inspections, _quickfixes, _annotations, _github, _merge, _staging, _annotationParser, _quickFixParser, _inspectionParser); // 02. Wire up the pipeline AddSections(parameters, synchronizeFeatureItems); diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs deleted file mode 100644 index 9e83c37..0000000 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/CodeAnalysisXmlDocParser.cs +++ /dev/null @@ -1,99 +0,0 @@ -using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.Server.Model; -using rubberduckvba.Server.Services; -using System.Collections.Concurrent; -using System.Xml.Linq; - -namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; - -public interface ICodeAnalysisXmlDocParserFactory -{ - /// - /// Creates a new CodeAnalysisXmlDocParser service instance. - /// - /// Default inspection severity levels, obtained from Rubberduck.WebApi.Services.Abstract.IGitHubDataService - IXmlDocParser CreateXmlDocParser(IEnumerable inspectionDefaults); -} - -public class CodeAnalysisXmlDocParserFactory : ICodeAnalysisXmlDocParserFactory -{ - private readonly IRubberduckDbService _content; - private readonly IMarkdownFormattingService _markdown; - - public CodeAnalysisXmlDocParserFactory(IRubberduckDbService content, IMarkdownFormattingService markdown) - { - _content = content; - _markdown = markdown; - } - - public IXmlDocParser CreateXmlDocParser(IEnumerable inspectionDefaults) - { - return new CodeAnalysisXmlDocParser(_content, _markdown, inspectionDefaults); - } -} - - -public class CodeAnalysisXmlDocParser : XmlDocParserBase, ICodeAnalysisXmlDocParser -{ - private readonly IRubberduckDbService _content; - private readonly IMarkdownFormattingService _markdownService; - private readonly IDictionary _inspectionDefaults; - - public CodeAnalysisXmlDocParser(IRubberduckDbService content, IMarkdownFormattingService markdownService, IEnumerable inspectionDefaults) - : base("Rubberduck.CodeAnalysis.xml") - { - _content = content; - _markdownService = markdownService; - _inspectionDefaults = inspectionDefaults.ToDictionary(e => e.InspectionName, e => e); - } - - //protected override async Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease) - //{ - // var quickfixesFeatureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "QuickFixes") - // ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'QuickFixes' feature."); - // var quickFixes = ReadQuickFixes(assetId, tagName, quickfixesFeatureId, document, !isPreRelease); - - // var inspectionsFeatureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "Inspections") - // ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'Inspections' feature."); - // var inspections = ReadInspections(assetId, tagName, inspectionsFeatureId, document, !isPreRelease, quickFixes); - - // return inspections.Concat(quickFixes); - //} - - private IEnumerable ReadInspections(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased, IEnumerable quickFixes) - { - var nodes = from node in doc.Descendants("member").AsParallel() - let name = GetFullTypeNameOrDefault(node, "Inspection") - where !string.IsNullOrWhiteSpace(name) - let inspectionName = name.Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1) - let config = _inspectionDefaults.ContainsKey(inspectionName) ? _inspectionDefaults[inspectionName] : default - select (name, node, config); - - var results = new ConcurrentBag>(); - Parallel.ForEach(nodes, info => - { - var xmldoc = new XmlDocInspection(_markdownService); - results.Add(xmldoc.ParseAsync(assetId, tagName, featureId, quickFixes, info.name, info.node, info.config, !hasReleased)); - }); - - return results.Select(t => t.GetAwaiter().GetResult()); - } - - private IEnumerable ReadQuickFixes(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased) - { - var nodes = from node in doc.Descendants("member").AsParallel() - let name = GetFullTypeNameOrDefault(node, "QuickFix") - where !string.IsNullOrEmpty(name) && node.Descendants(XmlDocSchema.QuickFix.CanFix.ElementName).Any() // this excludes any quickfixes added to main (master) prior to v2.5.0 - select (name, node); - - var results = new ConcurrentBag(); - Parallel.ForEach(nodes, info => - { - var xmldoc = new XmlDocQuickFix(); - results.Add(xmldoc.Parse(info.name, assetId, featureId, info.node, !hasReleased)); - }); - - return results; - } -} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs deleted file mode 100644 index 7961262..0000000 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/ParsingXmlDocParser.cs +++ /dev/null @@ -1,43 +0,0 @@ -using rubberduckvba.Server.ContentSynchronization.XmlDoc.Abstract; -using rubberduckvba.Server.Model; -using rubberduckvba.Server.Services; -using System.Collections.Concurrent; -using System.Xml.Linq; - -namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; - -public class ParsingXmlDocParser : XmlDocParserBase, IParsingXmlDocParser -{ - private readonly IRubberduckDbService _content; - - public ParsingXmlDocParser(IRubberduckDbService content) - : base("Rubberduck.Parsing.xml") - { - _content = content; - } - - //protected override async Task> ParseAsync(int assetId, string tagName, XDocument document, bool isPreRelease) - //{ - // var featureId = await _content.GetFeatureId(RepositoryId.Rubberduck, "Annotations") - // ?? throw new InvalidOperationException("Could not retrieve a FeatureId for the 'Annotations' feature."); - // return await Task.FromResult(ReadAnnotations(assetId, tagName, featureId, document, !isPreRelease)); - //} - - private IEnumerable ReadAnnotations(int assetId, string tagName, int featureId, XDocument doc, bool hasReleased) - { - var nodes = from node in doc.Descendants("member").AsParallel() - let name = GetFullTypeNameOrDefault(node, "Annotation") - where !string.IsNullOrWhiteSpace(name) - select (name, node); - - var results = new ConcurrentBag(); - Parallel.ForEach(nodes, info => - { - var xmldoc = new XmlDocAnnotation(info.name, info.node, !hasReleased); - var item = xmldoc.Parse(assetId, featureId); - results.Add(item); - }); - - return results; - } -} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs index 4fbc934..8f680ab 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/Schema/XmlDocSchema.cs @@ -61,6 +61,7 @@ public static class QuickFix public static class Summary { public static readonly string ElementName = "summary"; + public static readonly string IsHiddenAttribute = "hidden"; } public static class Remarks @@ -74,6 +75,8 @@ public static class CanFix public static readonly string ProcedureAttribute = "procedure"; public static readonly string ModuleAttribute = "module"; public static readonly string ProjectAttribute = "project"; + public static readonly string MultipleAttribute = "multiple"; + public static readonly string AllAttribute = "all"; } public static class Inspections @@ -122,6 +125,7 @@ public static class Annotation public static class Summary { public static readonly string ElementName = "summary"; + public static readonly string IsHiddenAttribute = "hidden"; } public static class Remarks @@ -134,6 +138,7 @@ public static class Parameter public static readonly string ElementName = "parameter"; public static readonly string NameAttribute = "name"; public static readonly string TypeAttribute = "type"; + public static readonly string RequiredAttribute = "required"; } public static class Example diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs deleted file mode 100644 index 3917613..0000000 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotation.cs +++ /dev/null @@ -1,195 +0,0 @@ -using Newtonsoft.Json; -using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.Server.Model; -using System.Reflection; -using System.Xml.Linq; - -namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; - -public class AnnotationProperties -{ - public AnnotationArgInfo[] Parameters { get; set; } = []; -} - -public class XmlDocAnnotation -{ - public XmlDocAnnotation(string name, XElement node, bool isPreRelease) - { - SourceObject = node.Attribute("name")!.Value.Substring(2).Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1); - IsPreRelease = isPreRelease; - - AnnotationName = name; - Summary = node.Element(XmlDocSchema.Annotation.Summary.ElementName)?.Value.Trim() ?? string.Empty; - Remarks = node.Element(XmlDocSchema.Annotation.Remarks.ElementName)?.Value.Trim() ?? string.Empty; - - Parameters = node.Elements(XmlDocSchema.Annotation.Parameter.ElementName) - .Select(e => (Name: e.Attribute(XmlDocSchema.Annotation.Parameter.NameAttribute)?.Value ?? string.Empty, - Type: e.Attribute(XmlDocSchema.Annotation.Parameter.TypeAttribute)?.Value ?? string.Empty, - Description: e.Value)) - .Select(e => new AnnotationArgInfo(e.Name, e.Type, e.Description)) - .ToArray(); - - Properties = JsonConvert.SerializeObject(Parameters); - - Examples = []; - } - - public string SourceObject { get; } - public string Properties { get; } - public bool IsPreRelease { get; } - - public string AnnotationName { get; } - public string Summary { get; } - public string Remarks { get; } - - public IReadOnlyList Parameters { get; } - public IReadOnlyList Examples { get; } - - public Annotation Parse(int assetId, int featureId) - { - var parameters = new AnnotationProperties - { - Parameters = Parameters.ToArray() - }; - - return new Annotation - { - FeatureId = featureId, - Name = AnnotationName, - IsNew = IsPreRelease, - TagAssetId = assetId, - SourceUrl = SourceObject, - - Examples = [] - }; - } - - private AnnotationExample[] ParseExamples(XElement node) - { - //try - //{ - // var examples = new List(); - // var exampleNodes = node.Elements(XmlDocSchema.Annotation.Example.ElementName); - // foreach (var example in exampleNodes) - // { - // /* - // * - // * - // * - // */ - // var modules = example.Elements(XmlDocSchema.Annotation.Example.Module.ElementName).AsParallel(); - // var simpleExamples = modules.Where(m => m.Nodes().OfType().Any()) - // .Select((e, i) => new AnnotationExample { Modules = [ExtractCodeModule(e, i)] }) - // .ToArray(); - // if (simpleExamples.Length > 0) - // { - // examples.AddRange(simpleExamples.ToArray()); - // continue; - // } - - // IEnumerable before = Enumerable.Empty(); - // IEnumerable? after = null; - - // if (modules.Any()) - // { - // /* - // * - // * - // * - // * - // * - // * - // * - // */ - // before = modules.Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Module.Before.ElementName)!, i, "(code pane)")); - // } - - // if (example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName).Any()) - // { - // /* - // * - // * - // * - // * - // * - // * - // * - // * - // * - // */ - // before = example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName) - // .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Before.Module.ElementName)!, i, "(code pane)")); - // } - - // if (before.Any() && after.Any()) - // { - // examples.Add(new BeforeAndAfterCodeExample(before, after)); - // } - // } - return []; - //} - //catch (Exception) - //{ - // var errorExample = new[] { ExampleModule.ParseError("AnnotationExample") }; - // return [new AnnotationExample { Modules = errorExample }]; - //} - } - - private static readonly IDictionary ModuleTypes = - typeof(ExampleModuleType) - .GetMembers() - .Select(m => (m.Name, m.GetCustomAttributes().OfType().SingleOrDefault()?.Description)) - .Where(m => m.Description != null) - .ToDictionary(m => m.Description!, m => (ExampleModuleType)Enum.Parse(typeof(ExampleModuleType), m.Name, true)); - - private static string GetDefaultModuleName(ExampleModuleType type, int index = 1) - { - switch (type) - { - case ExampleModuleType.PredeclaredClass: - case ExampleModuleType.ClassModule: - return $"Class{index}"; - case ExampleModuleType.UserFormModule: - return $"UserForm{index}"; - case ExampleModuleType.DocumentModule: - return $"DocumentModule{index}"; - default: - return $"Module{index}"; - } - } - - private ExampleModule ExtractCodeModule(XElement cdataParent, int index, string? description = null) - { - var module = cdataParent.AncestorsAndSelf(XmlDocSchema.Annotation.Example.Module.ElementName).Single(); - var moduleType = ModuleTypes.TryGetValue(module.Attribute(XmlDocSchema.Annotation.Example.Module.ModuleTypeAttribute)?.Value ?? string.Empty, out var type) ? type : ExampleModuleType.Any; - var name = module.Attribute(XmlDocSchema.Annotation.Example.Module.ModuleNameAttribute)?.Value ?? GetDefaultModuleName(moduleType, index); - var code = cdataParent.Nodes().OfType().Single().Value; - - var model = new ExampleModule - { - ModuleName = name, - ModuleType = moduleType, - Description = description, - HtmlContent = code.Trim().Replace(" ", " ") - }; - - return model; - } -} - -public class AnnotationArgInfo(string name, string type, string description) -{ - public string Name { get; set; } = name; - public string Type { get; set; } = type; - public string Description { get; set; } = description; -} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs new file mode 100644 index 0000000..17d79f7 --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocAnnotationParser.cs @@ -0,0 +1,178 @@ +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; +using System.Reflection; +using System.Xml.Linq; + +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; + +public class XmlDocAnnotationParser +{ + public Annotation Parse(int assetId, int featureId, string name, XElement node, bool isPreRelease) + { + var sourceObject = node.Attribute("name")!.Value[2..][(name.LastIndexOf('.') + 1)..]; + //var sourceEditUrl = $"https://github.com/rubberduck-vba/Rubberduck/edit/next/{sourceObject}.cs"; + //var sourceViewUrl = $"https://github.com/rubberduck-vba/Rubberduck/blob/{tagName}/{sourceObject}.cs"; + + var summary = node.Element(XmlDocSchema.Annotation.Summary.ElementName)?.Value.Trim() ?? string.Empty; + var remarks = node.Element(XmlDocSchema.Annotation.Remarks.ElementName)?.Value.Trim() ?? string.Empty; + + var isHidden = node.Element(XmlDocSchema.Annotation.Summary.ElementName)?.Attribute(XmlDocSchema.Annotation.Summary.IsHiddenAttribute)?.Value.Equals(true.ToString(), StringComparison.InvariantCultureIgnoreCase) ?? false; + + var parameters = node.Elements(XmlDocSchema.Annotation.Parameter.ElementName) + .Select(e => (Name: e.Attribute(XmlDocSchema.Annotation.Parameter.NameAttribute)?.Value ?? string.Empty, + Required: e.Attribute(XmlDocSchema.Annotation.Parameter.RequiredAttribute)?.Value ?? string.Empty, + Type: e.Attribute(XmlDocSchema.Annotation.Parameter.TypeAttribute)?.Value ?? string.Empty, + Description: e.Value)) + .Select(e => new AnnotationParameter { Name = e.Name, Type = e.Type, Description = e.Description, Required = e.Required == true.ToString() }) + .ToArray(); + + var examples = ParseExamples(node).ToArray(); + + return new Annotation + { + FeatureId = featureId, + TagAssetId = assetId, + SourceUrl = sourceObject, + + Name = name, + Summary = summary, + Remarks = remarks, + + IsNew = isPreRelease, + IsDiscontinued = default, + IsHidden = isHidden, + + Parameters = parameters, + Examples = examples + }; + } + + private IEnumerable ParseExamples(XElement node) + { + try + { + var examples = new List(); + var exampleNodes = node.Elements(XmlDocSchema.Annotation.Example.ElementName); + foreach (var example in exampleNodes) + { + /* + * + * + * + */ + var modules = example.Elements(XmlDocSchema.Annotation.Example.Module.ElementName).AsParallel(); + var simpleExamples = modules.Where(m => m.Nodes().OfType().Any()) + .Select((e, i) => new AnnotationExample { Modules = [ExtractCodeModule(e, i)] }) + .ToArray(); + if (simpleExamples.Length > 0) + { + examples.AddRange(simpleExamples); + continue; + } + + IEnumerable before = []; + IEnumerable? after = null; + + if (modules.Any()) + { + /* + * + * + * + * + * + * + * + */ + before = modules.Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Module.Before.ElementName)!, i, "(code pane)")); + } + + if (example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName).Any()) + { + /* + * + * + * + * + * + * + * + * + * + */ + before = example.Elements(XmlDocSchema.Annotation.Example.Before.ElementName) + .Select((e, i) => ExtractCodeModule(e.Element(XmlDocSchema.Annotation.Example.Before.Module.ElementName)!, i, "(code pane)")); + } + + if (before.Any() && (after?.Any() ?? false)) + { + examples.Add(new AnnotationExample { ModulesBefore = before.ToArray(), ModulesAfter = after.ToArray() }); + } + } + return examples; + } + catch (Exception) + { + var errorExample = new[] { ExampleModule.ParseError("AnnotationExample") }; + return [new AnnotationExample { Modules = errorExample }]; + } + } + + private static readonly IDictionary ModuleTypes = + typeof(ExampleModuleType) + .GetMembers() + .Select(m => (m.Name, m.GetCustomAttributes().OfType().SingleOrDefault()?.Description)) + .Where(m => m.Description != null) + .ToDictionary(m => m.Description!, m => (ExampleModuleType)Enum.Parse(typeof(ExampleModuleType), m.Name, true)); + + private static string GetDefaultModuleName(ExampleModuleType type, int index = 1) + { + switch (type) + { + case ExampleModuleType.PredeclaredClass: + case ExampleModuleType.ClassModule: + return $"Class{index}"; + case ExampleModuleType.UserFormModule: + return $"UserForm{index}"; + case ExampleModuleType.DocumentModule: + return $"DocumentModule{index}"; + default: + return $"Module{index}"; + } + } + + private ExampleModule ExtractCodeModule(XElement cdataParent, int index, string? description = null) + { + var module = cdataParent.AncestorsAndSelf(XmlDocSchema.Annotation.Example.Module.ElementName).Single(); + var moduleType = ModuleTypes.TryGetValue(module.Attribute(XmlDocSchema.Annotation.Example.Module.ModuleTypeAttribute)?.Value ?? string.Empty, out var type) ? type : ExampleModuleType.Any; + var name = module.Attribute(XmlDocSchema.Annotation.Example.Module.ModuleNameAttribute)?.Value ?? GetDefaultModuleName(moduleType, index); + var code = cdataParent.Nodes().OfType().Single().Value; + + var model = new ExampleModule + { + ModuleName = name, + ModuleType = moduleType, + Description = description, + HtmlContent = code.Trim().Replace(" ", " ") + }; + + return model; + } +} + +public class AnnotationArgInfo(string name, string type, string description) +{ + public string Name { get; set; } = name; + public string Type { get; set; } = type; + public string Description { get; set; } = description; +} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs deleted file mode 100644 index bcd95d2..0000000 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspection.cs +++ /dev/null @@ -1,150 +0,0 @@ -using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; -using rubberduckvba.Server.Model; -using rubberduckvba.Server.Services; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Reflection; -using System.Xml.Linq; - -namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; - -public record class InspectionProperties -{ - public string Reasoning { get; init; } = default!; - public string[] References { get; init; } = []; - public string[] QuickFixes { get; init; } = []; - public string HostApp { get; init; } = default!; - public string Summary { get; init; } = default!; - public string Remarks { get; init; } = default!; - public string DefaultSeverity { get; init; } = default!; - public string InspectionType { get; init; } = default!; - public Example[] Examples { get; init; } = []; -} - -public class XmlDocInspection -{ - private static readonly string _defaultSeverity = "Warning"; - private static readonly string _defaultInspectionType = "CodeQualityIssues"; - private readonly IMarkdownFormattingService _markdownService; - - public XmlDocInspection(IMarkdownFormattingService markdownService) - { - _markdownService = markdownService; - } - - public async Task ParseAsync(int assetId, string tagName, int featureId, IEnumerable quickFixes, string name, XElement node, InspectionDefaultConfig? config, bool isPreRelease) - { - var typeName = name.Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1); - var inspectionName = typeName.Replace("Inspection", string.Empty).Trim(); - - var fixesByName = quickFixes.ToLookup(e => e.Name, e => e.Inspections); - var filteredFixes = quickFixes.Where(fix => fixesByName[fix.Name].FirstOrDefault()?.Contains(inspectionName) ?? false).ToList(); - - var sourceObject = name.Substring(2).Replace(".", "/").Replace("Rubberduck/CodeAnalysis/", "Rubberduck.CodeAnalysis/"); - var sourceEditUrl = $"https://github.com/rubberduck-vba/Rubberduck/edit/next/{sourceObject}.cs"; - var sourceViewUrl = $"https://github.com/rubberduck-vba/Rubberduck/blob/{tagName}/{sourceObject}.cs"; - - var summaryTask = _markdownService.FormatMarkdownDocument(node.Element(XmlDocSchema.Inspection.Summary.ElementName)?.Value.Trim() ?? string.Empty); - var reasoningTask = _markdownService.FormatMarkdownDocument(node.Element(XmlDocSchema.Inspection.Reasoning.ElementName)?.Value.Trim() ?? string.Empty); - var remarksTask = _markdownService.FormatMarkdownDocument(node.Element(XmlDocSchema.Inspection.Remarks.ElementName)?.Value.Trim() ?? string.Empty); - - var references = node.Elements(XmlDocSchema.Inspection.Reference.ElementName).Select(e => e.Attribute(XmlDocSchema.Inspection.Reference.NameAttribute)!.Value.Trim()).ToArray(); - var hostApp = node.Element(XmlDocSchema.Inspection.HostApp.ElementName)?.Attribute(XmlDocSchema.Inspection.HostApp.NameAttribute)?.Value.Trim() ?? string.Empty; - var isHidden = node.Element(XmlDocSchema.Inspection.Summary.ElementName)?.Attribute(XmlDocSchema.Inspection.Summary.IsHiddenAttribute)?.Value.Equals(true.ToString(), StringComparison.InvariantCultureIgnoreCase) ?? false; - - var defaultSeverity = config?.DefaultSeverity ?? _defaultSeverity; - var inspectionType = config?.InspectionType ?? _defaultInspectionType; - - if (Enum.TryParse(inspectionType, out var enumInspectionType)) - { - inspectionType = InspectionTypes[enumInspectionType]; - } - var examples = ParseExamples(node).ToArray(); - - var (summary, reasoning, remarks) = (await summaryTask, await reasoningTask, await remarksTask); - - return new Inspection - { - FeatureId = featureId, - - Id = default, - DateTimeInserted = DateTime.UtcNow, - DateTimeUpdated = default, - TagAssetId = assetId, - SourceUrl = sourceObject, - - IsHidden = isHidden, - IsNew = isPreRelease, - IsDiscontinued = default, - - Name = inspectionName, - Summary = summary, - Reasoning = reasoning, - Remarks = remarks, - HostApp = hostApp, - DefaultSeverity = defaultSeverity, - InspectionType = inspectionType, - QuickFixes = filteredFixes.Select(e => e.Name).ToArray(), - References = references, - Examples = examples - }; - } - - private static readonly IDictionary ModuleTypes = - Enum.GetValues() - .Select(m => (Name: m.ToString(), Description: typeof(ExampleModuleType).GetMember(m.ToString()).Single() - .GetCustomAttributes().OfType().SingleOrDefault()?.Description ?? string.Empty)) - .ToDictionary(m => m.Description, m => Enum.Parse(m.Name, ignoreCase: true)); - - private static readonly IDictionary InspectionTypes = - Enum.GetValues() - .Select(m => (Name: m.ToString(), Description: typeof(CodeInspectionType).GetMember(m.ToString()).Single() - .GetCustomAttributes().OfType().SingleOrDefault()?.Description ?? string.Empty)) - .ToDictionary(m => Enum.Parse(m.Name, ignoreCase: true), m => m.Description); - - private enum CodeInspectionType - { - [Display(Name = "Rubberduck Opportunities")] - RubberduckOpportunities, - [Display(Name = "Language Opportunities")] - LanguageOpportunities, - [Display(Name = "Maintainability/Readability Issues")] - MaintainabilityAndReadabilityIssues, - [Display(Name = "Code Quality Issues")] - CodeQualityIssues, - [Display(Name = "Performance Opportunities")] - Performance, - } - - private IEnumerable ParseExamples(XElement node) - { - return node.Elements(XmlDocSchema.Inspection.Example.ElementName).AsParallel() - .Select((e, i) => - { - var example = new InspectionExample - { - HasResult = e.Attributes().Any(a => string.Equals(a.Name.LocalName, XmlDocSchema.Inspection.Example.HasResultAttribute, StringComparison.InvariantCultureIgnoreCase) && bool.TryParse(a.Value, out var value) && value), - SortOrder = i, - Modules = e.Elements(XmlDocSchema.Inspection.Example.Module.ElementName) - .Select(async m => - new ExampleModule - { - HtmlContent = await _markdownService.FormatMarkdownDocument("" + m.Nodes().OfType().Single().Value.Trim().Replace(" ", " ") + "", withSyntaxHighlighting: true), - ModuleName = m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleNameAttribute)?.Value ?? string.Empty, - ModuleType = ModuleTypes.TryGetValue(m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleTypeAttribute)?.Value.Trim() ?? string.Empty, out var type) ? type : ExampleModuleType.Any, - }) - .Select(t => t.GetAwaiter().GetResult()) - .Concat(e.Nodes().OfType().Select(async x => - new ExampleModule - { - HtmlContent = await _markdownService.FormatMarkdownDocument("" + x.Value.Trim().Replace(" ", " ") + "", withSyntaxHighlighting: true), - ModuleName = "Module1", - ModuleType = ExampleModuleType.Any - }) - .Select(t => t.GetAwaiter().GetResult()) - .Take(1)).ToList() - }; - return example; - }); - } -} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspectionParser.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspectionParser.cs new file mode 100644 index 0000000..4f5ed6b --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocInspectionParser.cs @@ -0,0 +1,124 @@ +using rubberduckvba.Server.ContentSynchronization.XmlDoc.Schema; +using rubberduckvba.Server.Model; +using rubberduckvba.Server.Services; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using System.Reflection; +using System.Xml.Linq; + +namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; + +public class XmlDocInspectionParser(IMarkdownFormattingService markdownService) +{ + private static readonly string _defaultSeverity = "Warning"; + private static readonly string _defaultInspectionType = "CodeQualityIssues"; + + public async Task ParseAsync(int assetId, int featureId, IEnumerable quickFixes, string name, XElement node, InspectionDefaultConfig? config, bool isPreRelease) + { + var typeName = name[(name.LastIndexOf('.') + 1)..]; + var inspectionName = typeName.Replace("Inspection", string.Empty).Trim(); + + var fixesByName = quickFixes.ToLookup(e => e.Name, e => e.Inspections); + var filteredFixes = quickFixes.Where(fix => fixesByName[fix.Name].FirstOrDefault()?.Contains(inspectionName) ?? false).ToList(); + + var sourceObject = name[2..].Replace('.', '/').Replace("Rubberduck/CodeAnalysis/", "Rubberduck.CodeAnalysis/"); + //var sourceEditUrl = $"https://github.com/rubberduck-vba/Rubberduck/edit/next/{sourceObject}.cs"; + //var sourceViewUrl = $"https://github.com/rubberduck-vba/Rubberduck/blob/{tagName}/{sourceObject}.cs"; + + var summaryTask = Task.Run(() => markdownService.FormatMarkdownDocument(node.Element(XmlDocSchema.Inspection.Summary.ElementName)?.Value.Trim() ?? string.Empty)); + var reasoningTask = Task.Run(() => markdownService.FormatMarkdownDocument(node.Element(XmlDocSchema.Inspection.Reasoning.ElementName)?.Value.Trim() ?? string.Empty)); + var remarksTask = Task.Run(() => markdownService.FormatMarkdownDocument(node.Element(XmlDocSchema.Inspection.Remarks.ElementName)?.Value.Trim() ?? string.Empty)); + + var references = node.Elements(XmlDocSchema.Inspection.Reference.ElementName).Select(e => e.Attribute(XmlDocSchema.Inspection.Reference.NameAttribute)!.Value.Trim()).ToArray(); + var hostApp = node.Element(XmlDocSchema.Inspection.HostApp.ElementName)?.Attribute(XmlDocSchema.Inspection.HostApp.NameAttribute)?.Value.Trim() ?? string.Empty; + var isHidden = node.Element(XmlDocSchema.Inspection.Summary.ElementName)?.Attribute(XmlDocSchema.Inspection.Summary.IsHiddenAttribute)?.Value.Equals(true.ToString(), StringComparison.InvariantCultureIgnoreCase) ?? false; + + var defaultSeverity = config?.DefaultSeverity ?? _defaultSeverity; + var inspectionType = config?.InspectionType ?? _defaultInspectionType; + + if (Enum.TryParse(inspectionType, out var enumInspectionType)) + { + inspectionType = InspectionTypes[enumInspectionType]; + } + + var examples = ParseExamples(node).ToArray(); + var (summary, reasoning, remarks) = (await summaryTask, await reasoningTask, await remarksTask); + + return new Inspection + { + FeatureId = featureId, + + Id = default, + DateTimeInserted = DateTime.UtcNow, + DateTimeUpdated = default, + TagAssetId = assetId, + SourceUrl = sourceObject, + + IsHidden = isHidden, + IsNew = isPreRelease, + IsDiscontinued = default, + + Name = inspectionName, + Summary = summary, + Reasoning = reasoning, + Remarks = remarks, + HostApp = hostApp, + DefaultSeverity = defaultSeverity, + InspectionType = inspectionType, + QuickFixes = filteredFixes.Select(e => e.Name).ToArray(), + References = references, + Examples = examples + }; + } + + private static readonly Dictionary ModuleTypes = + Enum.GetValues() + .Select(m => (Name: m.ToString(), Description: typeof(ExampleModuleType).GetMember(m.ToString()).Single() + .GetCustomAttributes().OfType().SingleOrDefault()?.Description ?? string.Empty)) + .ToDictionary(m => m.Description, m => Enum.Parse(m.Name, ignoreCase: true)); + + private static readonly Dictionary InspectionTypes = + Enum.GetValues() + .Select(m => (Name: m.ToString(), Description: typeof(CodeInspectionType).GetMember(m.ToString()).Single() + .GetCustomAttributes().OfType().SingleOrDefault()?.Description ?? string.Empty)) + .ToDictionary(m => Enum.Parse(m.Name, ignoreCase: true), m => m.Description); + + private enum CodeInspectionType + { + [Display(Name = "Rubberduck Opportunities")] + RubberduckOpportunities, + [Display(Name = "Language Opportunities")] + LanguageOpportunities, + [Display(Name = "Maintainability/Readability Issues")] + MaintainabilityAndReadabilityIssues, + [Display(Name = "Code Quality Issues")] + CodeQualityIssues, + [Display(Name = "Performance Opportunities")] + Performance, + } + + private IEnumerable ParseExamples(XElement node) => + node.Elements(XmlDocSchema.Inspection.Example.ElementName) + .AsParallel() + .Select((e, i) => new InspectionExample + { + SortOrder = i, + HasResult = e.Attributes().Any(a => string.Equals(a.Name.LocalName, XmlDocSchema.Inspection.Example.HasResultAttribute, StringComparison.InvariantCultureIgnoreCase) && bool.TryParse(a.Value, out var value) && value), + Modules = e.Elements(XmlDocSchema.Inspection.Example.Module.ElementName) + .Select(m => + new ExampleModule + { + HtmlContent = markdownService.FormatMarkdownDocument("" + m.Nodes().OfType().Single().Value.Trim().Replace(" ", " ") + "", withSyntaxHighlighting: true), + ModuleName = m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleNameAttribute)?.Value ?? string.Empty, + ModuleType = ModuleTypes.TryGetValue(m.Attribute(XmlDocSchema.Inspection.Example.Module.ModuleTypeAttribute)?.Value.Trim() ?? string.Empty, out var type) ? type : ExampleModuleType.Any, + }) + .Concat(e.Nodes().OfType().Select(x => + new ExampleModule + { + HtmlContent = markdownService.FormatMarkdownDocument("" + x.Value.Trim().Replace(" ", " ") + "", withSyntaxHighlighting: true), + ModuleName = "Module1", + ModuleType = ExampleModuleType.Any + }) + .Take(1)).ToList() + }); +} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs index e8f6a7d..cd21a7b 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs @@ -6,6 +6,43 @@ namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; public class XmlDocMerge(ILogger logger) : IXmlDocMerge { + //public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) where T : IFeature + //{ + // var mainBranch = main.ToHashSet(); + // var nextBranch = (next.Any() ? next : main).ToHashSet(); + + // var merged = new HashSet(); + // var timestamp = TimeProvider.System.GetUtcNow().DateTime; + + // var updatedItems = new HashSet( + // from item in nextBranch + // where dbItems.ContainsKey(item.Name) + // let dbItem = dbItems[item.Name] + // where dbItem.GetContentHash() != item.GetContentHash() + // select item with + // { + // Id = dbItem.Id, + // IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + // IsDiscontinued = dbItem.IsDiscontinued || !nextBranch.Any(a => a.Name == item.Name), + // DateTimeUpdated = timestamp + // } + // ); + + // var comparer = new XmlDocBranchIntersectComparer(); + // var insertItems = new HashSet( + // from item in nextBranch.Intersect(mainBranch, comparer) + // where !dbItems.ContainsKey(item.Name) + // select item with + // { + // IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + // IsDiscontinued = !nextBranch.Any(a => a.Name == item.Name), + // DateTimeInserted = timestamp + // } + // ); + + // return merged; + //} + public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) { var mainBranch = main.ToHashSet(); @@ -28,9 +65,9 @@ select item with } ); - var comparer = new XmlDocBranchIntersectComparer(); + var comparer = new XmlDocBranchIntersectComparer(); var insertItems = new HashSet( - from item in nextBranch//.Intersect(mainBranch, comparer) + from item in nextBranch.Intersect(mainBranch, comparer) where !dbItems.ContainsKey(item.Name) select item with { @@ -44,55 +81,77 @@ select item with } - //public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) - //{ - // var mainBranch = main.ToHashSet(); - // var nextBranch = (next.Any() ? next : main).ToHashSet(); - - // var isInitialLoad = !dbItems.Any(); - - // var comparer = new XmlDocBranchIntersectComparer(); - // var timestamp = TimeProvider.System.GetUtcNow().DateTime; - - // var merged = new HashSet(); + public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) + { + var mainBranch = main.ToHashSet(); + var nextBranch = (next.Any() ? next : main).ToHashSet(); - // var updatedItems = new HashSet( - // from item in nextBranch - // where dbItems.ContainsKey(item.Name) - // let dbItem = dbItems[item.Name] - // where dbItem.Serialized != item.Serialized - // select item with - // { - // Id = dbItem.Id, - // IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), - // IsDiscontinued = dbItem.IsDiscontinued || !nextBranch.Any(a => a.Name == item.Name), - // DateTimeUpdated = timestamp - // } - // ); + var merged = new HashSet(); + var timestamp = TimeProvider.System.GetUtcNow().DateTime; - // var insertItems = new HashSet( - // from item in nextBranch//.Intersect(mainBranch, comparer) - // where !dbItems.ContainsKey(item.Name) - // select item with - // { - // IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), - // IsDiscontinued = !nextBranch.Any(a => a.Name == item.Name), - // DateTimeInserted = timestamp - // } - // ); + var updatedItems = new HashSet( + from item in nextBranch + where dbItems.ContainsKey(item.Name) + let dbItem = dbItems[item.Name] + where dbItem.GetContentHash() != item.GetContentHash() + select item with + { + Id = dbItem.Id, + IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + IsDiscontinued = dbItem.IsDiscontinued || !nextBranch.Any(a => a.Name == item.Name), + DateTimeUpdated = timestamp + } + ); - // merged.UnionWith(updatedItems); - // merged.UnionWith(insertItems); - // return merged; - //} + var comparer = new XmlDocBranchIntersectComparer(); + var insertItems = new HashSet( + from item in nextBranch.Intersect(mainBranch, comparer) + where !dbItems.ContainsKey(item.Name) + select item with + { + IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + IsDiscontinued = !nextBranch.Any(a => a.Name == item.Name), + DateTimeInserted = timestamp + } + ); - public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) - { - throw new NotImplementedException(); + return merged; } public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) { - throw new NotImplementedException(); + var mainBranch = main.ToHashSet(); + var nextBranch = (next.Any() ? next : main).ToHashSet(); + + var merged = new HashSet(); + var timestamp = TimeProvider.System.GetUtcNow().DateTime; + + var updatedItems = new HashSet( + from item in nextBranch + where dbItems.ContainsKey(item.Name) + let dbItem = dbItems[item.Name] + where dbItem.GetContentHash() != item.GetContentHash() + select item with + { + Id = dbItem.Id, + IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + IsDiscontinued = dbItem.IsDiscontinued || !nextBranch.Any(a => a.Name == item.Name), + DateTimeUpdated = timestamp + } + ); + + var comparer = new XmlDocBranchIntersectComparer(); + var insertItems = new HashSet( + from item in nextBranch.Intersect(mainBranch, comparer) + where !dbItems.ContainsKey(item.Name) + select item with + { + IsNew = mainBranch.Any() && !mainBranch.Any(a => a.Name == item.Name), + IsDiscontinued = !nextBranch.Any(a => a.Name == item.Name), + DateTimeInserted = timestamp + } + ); + + return merged; } } diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFixParser.cs similarity index 75% rename from rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs rename to rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFixParser.cs index 491ffb0..fa89574 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFix.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocQuickFixParser.cs @@ -5,25 +5,13 @@ namespace rubberduckvba.Server.ContentSynchronization.XmlDoc; -public class QuickFixProperties -{ - public string Summary { get; set; } - public string Remarks { get; set; } - public bool CanFixInProcedure { get; set; } - public bool CanFixInModule { get; set; } - public bool CanFixInProject { get; set; } - public string[] Inspections { get; set; } -} - -public class XmlDocQuickFix : IEquatable +public class XmlDocQuickFixParser { public QuickFix Parse(string name, int assetId, int featureId, XElement node, bool isPreRelease) { - var sourceObject = name; + var sourceObject = name[2..].Replace('.', '/').Replace("Rubberduck/CodeAnalysis/", "Rubberduck.CodeAnalysis/"); var typeName = name/*.Substring(name.LastIndexOf(".", StringComparison.Ordinal) + 1)/*.Replace("QuickFix", string.Empty)*/; - sourceObject = node.Attribute("name")?.Value.Substring(2) ?? string.Empty; - var summary = node.Element(XmlDocSchema.QuickFix.Summary.ElementName)?.Value.Trim().Replace(" ", " ") ?? string.Empty; var remarks = node.Element(XmlDocSchema.QuickFix.Remarks.ElementName)?.Value.Trim().Replace(" ", " ") ?? string.Empty; @@ -31,6 +19,8 @@ public QuickFix Parse(string name, int assetId, int featureId, XElement node, bo var canFixInProcedure = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ProcedureAttribute)?.Value ?? true.ToString()); var canFixInModule = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ModuleAttribute)?.Value ?? true.ToString()); var canFixInProject = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.ProjectAttribute)?.Value ?? true.ToString()); + var canFixMultiple = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.MultipleAttribute)?.Value ?? true.ToString()); + var canFixAll = Convert.ToBoolean(canFixNode?.Attribute(XmlDocSchema.QuickFix.CanFix.AllAttribute)?.Value ?? true.ToString()); var nodes = node.Element(XmlDocSchema.QuickFix.Inspections.ElementName)? .Elements(XmlDocSchema.QuickFix.Inspections.Inspection.ElementName); @@ -47,48 +37,39 @@ public QuickFix Parse(string name, int assetId, int featureId, XElement node, bo return new QuickFix { FeatureId = featureId, - - Name = name, - IsHidden = false, - IsNew = isPreRelease, - - Summary = summary.Trim().Replace(" ", " "), TagAssetId = assetId, SourceUrl = sourceObject, - Examples = ParseExamples(node).ToArray(), - }; - } - - public string SourceObject { get; init; } - public string TypeName { get; init; } - public string QuickFixName { get; init; } - - public string Summary { get; init; } - public string Remarks { get; init; } - public bool IsPreRelease { get; init; } + Name = name, + Summary = summary.Trim().Replace(" ", " "), + Remarks = remarks, - public bool CanFixInProcedure { get; init; } - public bool CanFixInModule { get; init; } - public bool CanFixInProject { get; init; } + IsHidden = false, + IsNew = isPreRelease, // if initially true, will be set to false if same quickfix exists in regular release branch (main) + IsDiscontinued = default, // initially false, will be set to true if same quickfix does not exist in pre-release branch (next) - public BeforeAndAfterCodeExample[] Examples { get; init; } = []; + CanFixAll = canFixAll, + CanFixMultiple = canFixMultiple, + CanFixProcedure = canFixInProcedure, + CanFixModule = canFixInModule, + CanFixProject = canFixInProject, - public bool Equals(XmlDocQuickFix? other) => other?.QuickFixName == QuickFixName; + Examples = [.. ParseExamples(node)], + Inspections = inspections + }; + } - public override bool Equals(object? obj) => Equals(obj as XmlDocQuickFix); - public override int GetHashCode() => QuickFixName.GetHashCode(); - private static readonly IDictionary ModuleTypes = + private static readonly Dictionary ModuleTypes = typeof(ExampleModuleType) .GetMembers() .Select(m => (m.Name, Description: m.GetCustomAttributes().OfType().SingleOrDefault()?.Description ?? string.Empty)) .Where(m => m.Description != null) .ToDictionary(m => m.Description, m => (ExampleModuleType)Enum.Parse(typeof(ExampleModuleType), m.Name, true)); - private IEnumerable ParseExamples(XElement node) + private static List ParseExamples(XElement node) { - var results = new List(); + var examples = new List(); foreach (var exampleNode in node.Elements(XmlDocSchema.QuickFix.Example.ElementName)) { var before = exampleNode.Element(XmlDocSchema.QuickFix.Example.Before.ElementName)? @@ -125,13 +106,13 @@ private IEnumerable ParseExamples(XElement node) if (before != null && after != null) { - results.Add(new QuickFixExample { ModulesBefore = before.ToList(), ModulesAfter = after.ToList() }); + examples.Add(new QuickFixExample { ModulesBefore = before.ToList(), ModulesAfter = after.ToList() }); } else { // TODO log a warning, something. } } - return results; + return examples; } } diff --git a/rubberduckvba.Server/Data/DataModel.cs b/rubberduckvba.Server/Data/DataModel.cs index 8411b07..1ea2e6c 100644 --- a/rubberduckvba.Server/Data/DataModel.cs +++ b/rubberduckvba.Server/Data/DataModel.cs @@ -108,9 +108,9 @@ public record class FeatureXmlDoc public IEnumerable Examples { get; init; } = []; } -public class XmlDocBranchIntersectComparer : EqualityComparer +public class XmlDocBranchIntersectComparer : EqualityComparer where T : IFeature { - public override bool Equals(FeatureXmlDoc? x, FeatureXmlDoc? y) + public override bool Equals(T? x, T? y) { if (x is null && y is null) { @@ -130,7 +130,7 @@ public override bool Equals(FeatureXmlDoc? x, FeatureXmlDoc? y) return x.Name == y.Name; } - public override int GetHashCode([DisallowNull] FeatureXmlDoc obj) + public override int GetHashCode([DisallowNull] T obj) { return HashCode.Combine(obj.Name); } diff --git a/rubberduckvba.Server/Model/Annotation.cs b/rubberduckvba.Server/Model/Annotation.cs index 18ad001..97f91c7 100644 --- a/rubberduckvba.Server/Model/Annotation.cs +++ b/rubberduckvba.Server/Model/Annotation.cs @@ -3,7 +3,7 @@ namespace rubberduckvba.Server.Model; -public record class Annotation() +public record class Annotation() : IFeature { public Annotation(AnnotationEntity entity) : this() { @@ -28,6 +28,8 @@ public Annotation(AnnotationEntity entity) : this() public bool IsDiscontinued { get; init; } public bool IsHidden { get; init; } public string Name { get; init; } = string.Empty; + public string Summary { get; init; } = string.Empty; + public string Remarks { get; init; } = string.Empty; public AnnotationParameter[] Parameters { get; init; } = []; public AnnotationExample[] Examples { get; init; } = []; @@ -40,7 +42,20 @@ public Annotation(AnnotationEntity entity) : this() TagAssetId = TagAssetId, SourceUrl = SourceUrl, Name = Name, + Summary = Summary, + Remarks = Remarks, JsonParameters = JsonSerializer.Serialize(Parameters), JsonExamples = JsonSerializer.Serialize(Examples), }; + + public int GetContentHash() + { + var hash = new HashCode(); + hash.Add(Name); + hash.Add(Summary); + hash.Add(Remarks); + hash.Add(JsonSerializer.Serialize(Parameters)); + hash.Add(JsonSerializer.Serialize(Examples)); + return hash.ToHashCode(); + } } diff --git a/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs b/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs index 8087369..5c586ba 100644 --- a/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs +++ b/rubberduckvba.Server/Model/Entity/AnnotationEntity.cs @@ -5,7 +5,8 @@ public record class AnnotationEntity : Entity public int FeatureId { get; init; } public int TagAssetId { get; init; } public string SourceUrl { get; init; } = string.Empty; + public string Summary { get; init; } = string.Empty; + public string Remarks { get; init; } = string.Empty; public string? JsonParameters { get; init; } public string? JsonExamples { get; init; } - } diff --git a/rubberduckvba.Server/Model/Example.cs b/rubberduckvba.Server/Model/Example.cs index 7035d0d..72305df 100644 --- a/rubberduckvba.Server/Model/Example.cs +++ b/rubberduckvba.Server/Model/Example.cs @@ -15,19 +15,26 @@ public record class InspectionExample : Example public ICollection Modules { get; init; } = []; } -public record class QuickFixExample : Example +public record class QuickFixExample : BeforeAndAfterExample +{ +} + +public record class AnnotationExample : BeforeAndAfterExample { /// - /// The code modules before the quickfix is applied. + /// The example modules when the annotation has no before/after examples. + /// + public ICollection Modules { get; init; } = []; +} + +public record class BeforeAndAfterExample : Example +{ + /// + /// The code modules before feature is used. /// public ICollection ModulesBefore { get; init; } = []; /// - /// The code modules after the quickfix is applied. + /// The code modules after the feature is used. /// public ICollection ModulesAfter { get; init; } = []; } - -public record class AnnotationExample : Example -{ - public ICollection Modules { get; init; } = []; -} diff --git a/rubberduckvba.Server/Model/Feature.cs b/rubberduckvba.Server/Model/Feature.cs index 72cbe64..d1aef69 100644 --- a/rubberduckvba.Server/Model/Feature.cs +++ b/rubberduckvba.Server/Model/Feature.cs @@ -2,7 +2,21 @@ namespace rubberduckvba.Server.Model; -public record class Feature() +public interface IFeature +{ + int Id { get; init; } + DateTime DateTimeInserted { get; init; } + DateTime? DateTimeUpdated { get; init; } + string Name { get; init; } + + bool IsNew { get; init; } + bool IsHidden { get; init; } + bool IsDiscontinued { get; init; } + + int GetContentHash(); +} + +public record class Feature() : IFeature { public Feature(FeatureEntity entity) : this() { @@ -32,6 +46,7 @@ public Feature(FeatureEntity entity) : this() public string Description { get; init; } = string.Empty; public bool IsHidden { get; init; } public bool IsNew { get; init; } + public bool IsDiscontinued { get; init; } public bool HasImage { get; init; } public FeatureEntity ToEntity() => new() @@ -49,6 +64,8 @@ public Feature(FeatureEntity entity) : this() RepositoryId = (int)Services.RepositoryId.Rubberduck, Title = Title, }; + + public int GetContentHash() => HashCode.Combine(Name, Title, ShortDescription, Description, HasImage, IsHidden, IsNew, IsDiscontinued); } public record class FeatureGraph : Feature diff --git a/rubberduckvba.Server/Model/Inspection.cs b/rubberduckvba.Server/Model/Inspection.cs index ffbb53c..817faaf 100644 --- a/rubberduckvba.Server/Model/Inspection.cs +++ b/rubberduckvba.Server/Model/Inspection.cs @@ -3,7 +3,7 @@ namespace rubberduckvba.Server.Model; -public record class Inspection() +public record class Inspection() : IFeature { public Inspection(InspectionEntity entity) : this() { diff --git a/rubberduckvba.Server/Model/QuickFix.cs b/rubberduckvba.Server/Model/QuickFix.cs index e78ba59..08b9631 100644 --- a/rubberduckvba.Server/Model/QuickFix.cs +++ b/rubberduckvba.Server/Model/QuickFix.cs @@ -3,7 +3,7 @@ namespace rubberduckvba.Server.Model; -public record class QuickFix() +public record class QuickFix() : IFeature { public QuickFix(QuickFixEntity entity) : this() { @@ -70,4 +70,20 @@ public QuickFix(QuickFixEntity entity) : this() JsonExamples = JsonSerializer.Serialize(Examples), Inspections = string.Join(',', Inspections), }; + + public int GetContentHash() + { + var hash = new HashCode(); + hash.Add(Summary); + hash.Add(Remarks); + hash.Add(Name); + hash.Add(CanFixAll); + hash.Add(CanFixModule); + hash.Add(CanFixMultiple); + hash.Add(CanFixProcedure); + hash.Add(CanFixProject); + hash.Add(JsonSerializer.Serialize(Examples)); + hash.Add(string.Join(',', Inspections)); + return hash.ToHashCode(); + } } \ No newline at end of file diff --git a/rubberduckvba.Server/Services/MarkdownFormattingService.cs b/rubberduckvba.Server/Services/MarkdownFormattingService.cs index 745ae81..00a6171 100644 --- a/rubberduckvba.Server/Services/MarkdownFormattingService.cs +++ b/rubberduckvba.Server/Services/MarkdownFormattingService.cs @@ -6,14 +6,14 @@ namespace rubberduckvba.Server.Services; public interface IMarkdownFormattingService { - Task FormatMarkdownDocument(string content, bool withSyntaxHighlighting = false); + string FormatMarkdownDocument(string content, bool withSyntaxHighlighting = false); } public class MarkdownFormattingService(ISyntaxHighlighterService service) : IMarkdownFormattingService { private static readonly Markdown _service = new(); - public async Task FormatMarkdownDocument(string content, bool withSyntaxHighlighting = false) + public string FormatMarkdownDocument(string content, bool withSyntaxHighlighting = false) { if (string.IsNullOrWhiteSpace(content)) { @@ -25,7 +25,10 @@ public async Task FormatMarkdownDocument(string content, bool withSyntax if (withSyntaxHighlighting) { - markdown = await PreProcessMarkdownString(markdown); + // HTML tags makes the markdown formatter silently fail, + // so we pull out any blocks and format everything between them. + + markdown = PreProcessMarkdownString(markdown); var lastSectionStart = markdown.LastIndexOf(""); if (lastSectionStart > 0) @@ -60,11 +63,10 @@ public async Task FormatMarkdownDocument(string content, bool withSyntax html = _service.Transform(markdown); } - var result = await PostProcessHtml(html); - return await Task.FromResult(result); + return PostProcessHtml(html); } - private async Task PreProcessMarkdownString(string content) + private string PreProcessMarkdownString(string content) { var document = new HtmlDocument(); document.LoadHtml($"
{content}
"); @@ -72,7 +74,7 @@ private async Task PreProcessMarkdownString(string content) var codeNodes = document.DocumentNode.Descendants("code").ToList(); foreach (var node in codeNodes) { - var code = await service.FormatAsync(node.InnerText); + var code = service.Format(node.InnerText); //node.Name = "div"; //node.EndNode.Name = "div"; @@ -100,7 +102,7 @@ private async Task PreProcessMarkdownString(string content) return document.DocumentNode.InnerHtml; } - private async Task PostProcessHtml(string html) + private string PostProcessHtml(string html) { var document = new HtmlDocument(); document.LoadHtml($"
{html}
"); @@ -110,6 +112,6 @@ private async Task PostProcessHtml(string html) node.AddClass("document-img"); } - return await Task.FromResult(document.DocumentNode.FirstChild.InnerHtml); + return document.DocumentNode.FirstChild.InnerHtml; } } diff --git a/rubberduckvba.Server/Services/RubberduckDbService.cs b/rubberduckvba.Server/Services/RubberduckDbService.cs index df8131d..051085e 100644 --- a/rubberduckvba.Server/Services/RubberduckDbService.cs +++ b/rubberduckvba.Server/Services/RubberduckDbService.cs @@ -11,24 +11,41 @@ public interface IStagingServices Task StageAsync(StagingContext staging, CancellationToken token); } -public class StagingServices(IRubberduckDbService service, TagServices tagService, FeatureServices featureServices) : IStagingServices +public class StagingServices(TagServices tagService, FeatureServices featureServices) : IStagingServices { public async Task StageAsync(StagingContext context, CancellationToken token) { token.ThrowIfCancellationRequested(); - var updatedTags = context.ProcessedTags.Where(e => e.Id != default); + var updatedTags = context.Tags.Where(e => e.Id != default); tagService.Update(updatedTags); token.ThrowIfCancellationRequested(); - var newTags = context.ProcessedTags.Where(e => e.Id == default); + var newTags = context.Tags.Where(e => e.Id == default); tagService.Create(newTags); - //token.ThrowIfCancellationRequested(); - //featureServices.Update(context.UpdatedFeatureItems); - //await service.UpdateAsync(context.UpdatedFeatureItems); + token.ThrowIfCancellationRequested(); + var updatedInspections = context.Inspections.Where(e => e.Id != default); + featureServices.Update(updatedInspections); + + token.ThrowIfCancellationRequested(); + var newInspections = context.Inspections.Where(e => e.Id == default); + featureServices.Insert(newInspections); + + token.ThrowIfCancellationRequested(); + var updatedQuickFixes = context.QuickFixes.Where(e => e.Id != default); + featureServices.Update(updatedQuickFixes); - //token.ThrowIfCancellationRequested(); - //await service.CreateAsync(context.NewFeatureItems); + token.ThrowIfCancellationRequested(); + var newQuickFixes = context.QuickFixes.Where(e => e.Id == default); + featureServices.Insert(newQuickFixes); + + token.ThrowIfCancellationRequested(); + var updatedAnnotations = context.Annotations.Where(e => e.Id != default); + featureServices.Update(updatedAnnotations); + + token.ThrowIfCancellationRequested(); + var newAnnotations = context.Annotations.Where(e => e.Id == default); + featureServices.Insert(newAnnotations); } } From b8231f2cf24036a2537b7c8bcf606d02380567d9 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Sun, 10 Nov 2024 01:37:58 -0500 Subject: [PATCH 10/11] ajusted xmldoc pipeline (runs to completion) --- .../Api/Features/FeaturesController.cs | 8 +- .../Pipeline/Abstract/DataflowJoinBlock.cs | 26 +-- .../Abstract/ExecutionDataflowBlockBase.cs | 16 +- .../Pipeline/Abstract/PipelineSection.cs | 25 ++- .../Pipeline/Sections/Context/SyncContext.cs | 19 +- .../SyncXmldoc/BroadcastQuickFixesBlock.cs | 21 +- .../SyncXmldoc/FeatureItemBufferBlock.cs | 11 - .../SyncXmldoc/MergeAnnotationsBlock.cs | 12 +- .../SyncXmldoc/MergeInspectionsBlock.cs | 8 +- .../SyncXmldoc/MergeQuickFixesBlock.cs | 9 +- .../ParseInspectionXElementInfoBlock.cs | 7 +- .../SyncXmldoc/PrepareStagingBlock.cs | 26 +++ .../SyncXmldoc/StreamInspectionNodesBlock.cs | 23 +- .../Sections/SyncXmldoc/SyncXmldocSection.cs | 70 ++++-- .../SyncXmldoc/XmlTagAssetBufferBlock.cs | 18 ++ .../XmlDoc/XmlDocMerge.cs | 18 +- rubberduckvba.Server/Data/DataModel.cs | 202 ------------------ .../Data/FeaturesRepository.cs | 2 + .../Data/QuickFixRepository.cs | 2 +- .../Data/SynchronizationRequest.cs | 32 +++ .../Data/XmlDocBranchIntersectComparer.cs | 32 +++ .../Hangfire/QueuedUpdateOrchestrator.cs | 4 + rubberduckvba.Server/Program.cs | 5 +- .../Services/RubberduckDbService.cs | 8 +- 24 files changed, 297 insertions(+), 307 deletions(-) delete mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs create mode 100644 rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/PrepareStagingBlock.cs delete mode 100644 rubberduckvba.Server/Data/DataModel.cs create mode 100644 rubberduckvba.Server/Data/SynchronizationRequest.cs create mode 100644 rubberduckvba.Server/Data/XmlDocBranchIntersectComparer.cs diff --git a/rubberduckvba.Server/Api/Features/FeaturesController.cs b/rubberduckvba.Server/Api/Features/FeaturesController.cs index 6c5aacb..3832084 100644 --- a/rubberduckvba.Server/Api/Features/FeaturesController.cs +++ b/rubberduckvba.Server/Api/Features/FeaturesController.cs @@ -66,8 +66,8 @@ public async Task> Info([FromRoute] string name) var model = new FeatureViewModel(feature with { - Description = md.FormatMarkdownDocument(feature.Description, true), - ShortDescription = md.FormatMarkdownDocument(feature.ShortDescription), + Description = feature.Description, + ShortDescription = feature.ShortDescription, ParentId = feature.Id, ParentName = feature.Name, @@ -75,8 +75,8 @@ public async Task> Info([FromRoute] string name) Features = feature.Features.Select(subFeature => subFeature with { - Description = md.FormatMarkdownDocument(subFeature.Description), - ShortDescription = md.FormatMarkdownDocument(subFeature.ShortDescription) + Description = subFeature.Description, + ShortDescription = subFeature.ShortDescription }).ToArray(), Inspections = feature.Inspections, diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs index 6212d48..3a57c47 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/DataflowJoinBlock.cs @@ -43,6 +43,7 @@ public JoinBlock CreateBlock(GroupingDataflowBlockOptions options, ISour Block = new JoinBlock(options); LinkSources(source1, source2); + Parent.TraceBlockCompletion(Block, Name); return Block; } @@ -51,12 +52,11 @@ public JoinBlock CreateBlock(GroupingDataflowBlockOptions opti { Block = new JoinBlock(options); - var sourceBlock1 = source1.TryGetBlock() as ISourceBlock; - var sourceBlock2 = source2.TryGetBlock() as ISourceBlock; - if (sourceBlock1 != null && sourceBlock2 != null) - { - LinkSources(sourceBlock1, sourceBlock2); - } + var sourceBlock1 = source1.TryGetBlock() as ISourceBlock ?? throw new ArgumentNullException(nameof(source1)); + var sourceBlock2 = source2.TryGetBlock() as ISourceBlock ?? throw new ArgumentNullException(nameof(source2)); + + LinkSources(sourceBlock1, sourceBlock2); + Parent.TraceBlockCompletion(Block, Name); return Block; } @@ -121,6 +121,7 @@ public JoinBlock CreateBlock(GroupingDataflowBlockOptions options, I Block = new JoinBlock(options); LinkSources(source1, source2, source3); + Parent.TraceBlockCompletion(Block, Name); return Block; } @@ -129,13 +130,12 @@ public JoinBlock CreateBlock(GroupingDataflowBlockOptions { Block = new JoinBlock(options); - var sourceBlock1 = source1.TryGetBlock() as ISourceBlock; - var sourceBlock2 = source2.TryGetBlock() as ISourceBlock; - var sourceBlock3 = source3.TryGetBlock() as ISourceBlock; - if (sourceBlock1 != null && sourceBlock2 != null && sourceBlock3 != null) - { - LinkSources(sourceBlock1, sourceBlock2, sourceBlock3); - } + var sourceBlock1 = source1.TryGetBlock() as ISourceBlock ?? throw new ArgumentNullException(nameof(source1)); + var sourceBlock2 = source2.TryGetBlock() as ISourceBlock ?? throw new ArgumentNullException(nameof(source2)); + var sourceBlock3 = source3.TryGetBlock() as ISourceBlock ?? throw new ArgumentNullException(nameof(source3)); + + LinkSources(sourceBlock1, sourceBlock2, sourceBlock3); + Parent.TraceBlockCompletion(Block, Name); return Block; } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs index 1fcb11f..0fc2885 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/ExecutionDataflowBlockBase.cs @@ -165,9 +165,9 @@ protected void LinkToSources(params ISectionBlock[] sources) } else if (srcBlock != null) { - // could be e.g. ActionBlock, which can't directly source another block. - completionTasks.Add(srcBlock.Completion); - Logger.LogDebug(Context.Parameters, $"{Name} | ⚠️ Source block ({srcBlock.GetType().Name}) is not ISourceBlock<{typeof(TInput).Name}>. If this is accidental, pipeline may not complete."); + //completionTasks.Add(srcBlock.Completion); + Logger.LogWarning(Context.Parameters, $"{Name} | ⚠️ Source block ({srcBlock.GetType().Name}) is not ISourceBlock<{typeof(TInput).Name}>. Pipeline may not complete."); + throw new InvalidOperationException($"Source block ({srcBlock.GetType().Name}) is not ISourceBlock<{typeof(TInput).Name}>"); } else { @@ -194,6 +194,7 @@ protected void WaitAllTasks(params Task[] completionTasks) sw.Stop(); Block.Complete(); Logger.LogInformation(Context.Parameters, $"{Name} | ☑️ Block completed | ⏱️ {sw.Elapsed}"); + Parent.LogBlockCompletionDetails(); })); } } @@ -203,6 +204,7 @@ protected void LinkFromSource(Func blockOutput, params Task[] waitForTas if (waitForTasks?.Any() ?? false) { Logger.LogTrace(Context.Parameters, $"{Name} | 🕑 Awaiting the completion of {waitForTasks.Length} source block task{(waitForTasks.Length > 1 ? "s" : string.Empty)}"); + _whenAllTasks.Add(Task.WhenAll(waitForTasks).ContinueWith(t => { try @@ -216,18 +218,14 @@ protected void LinkFromSource(Func blockOutput, params Task[] waitForTas } Logger.LogTrace(Context.Parameters, $"{Name} | 🚀 Block accepted input ({typeof(TInput).Name})"); + Block.Complete(); } catch (Exception exception) { Logger.LogException(Context.Parameters, exception); throw; } - finally - { - Block.Complete(); - Logger.LogTrace(Context.Parameters, $"{Name} | ☑️ Block completed"); - } - }, Token, TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Current)); + }, Token, TaskContinuationOptions.NotOnCanceled, TaskScheduler.Current)); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs index 6e5524e..a81f83e 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Abstract/PipelineSection.cs @@ -27,6 +27,7 @@ protected PipelineSection(IPipeline parent, CancellationTokenSou private readonly List _tracedCompletionTasks = []; public void TraceBlockCompletion(IDataflowBlock block, string name) { + Logger.LogTrace(Context.Parameters, $"{GetType().Name} | ☑️ Tracing block completion for {name}."); _tracedCompletionTasks.Add(block.Completion.ContinueWith(t => { string status; @@ -42,22 +43,26 @@ public void TraceBlockCompletion(IDataflowBlock block, string name) status = "task ran to completion."; break; default: - status = $"task is in unexpected state {t.Status}."; + status = $"task is in unexpected state '{t.Status}'."; break; } Logger.LogTrace(Context.Parameters, $"{GetType().Name} | ✅ Dataflow block completion task completed | {name} ({block.GetType().Name}) | {status}"); - }).ContinueWith(t => - { - var details = Blocks.Select( - block => $"{( - block.Value.Completion.IsCompletedSuccessfully ? "✔️" - : block.Value.Completion.IsFaulted ? "✖️" - : block.Value.Completion.IsCanceled ? "⛔" - : "🕑")} {block.Key} : {block.Value.Completion.Status}"); - Logger.LogTrace(Context.Parameters, "Pipeline block completion status details" + Environment.NewLine + string.Join(Environment.NewLine, details)); + LogBlockCompletionDetails(); })); } + public void LogBlockCompletionDetails() + { + var details = Blocks.Select( + block => $"{( + block.Value.Completion.IsCompletedSuccessfully ? "✔️" + : block.Value.Completion.IsFaulted ? "✖️" + : block.Value.Completion.IsCanceled ? "⛔" + : "🕑")} {block.Key} : {block.Value.Completion.Status}"); + + Logger.LogTrace(Context.Parameters, "Pipeline block completion status details" + Environment.NewLine + string.Join(Environment.NewLine, details)); + } + public void FaultPipelineBlock(IDataflowBlock block, Exception exception) { block.Fault(exception); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs index 991fd46..cdafb1f 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs @@ -29,6 +29,7 @@ public void LoadParameters(SyncRequestParameters parameters) public StagingContext StagingContext => ContextNotInitializedException.ThrowIfNull(_staging); + private Dictionary _latestTagsByAssetId = []; private TagGraph? _main; public TagGraph RubberduckDbMain => ContextNotInitializedException.ThrowIfNull(_main); @@ -38,6 +39,10 @@ public void LoadRubberduckDbMain(TagGraph main) InvalidContextParameterException.ThrowIfNull(nameof(main), main); ContextAlreadyInitializedException.ThrowIfNotNull(_main); _main ??= main; + foreach (var asset in _main.Assets) + { + _latestTagsByAssetId[asset.Id] = _main; + } } private TagGraph? _next; @@ -49,6 +54,17 @@ public void LoadRubberduckDbNext(TagGraph next) InvalidContextParameterException.ThrowIfNull(nameof(next), next); ContextAlreadyInitializedException.ThrowIfNotNull(_next); _next ??= next; + foreach (var asset in _next.Assets) + { + _latestTagsByAssetId[asset.Id] = _next; + } + } + + + public bool TryGetTagByAssetId(int assetId, out TagGraph tag) + { + var tags = ContextNotInitializedException.ThrowIfNull(_latestTagsByAssetId); + return tags.TryGetValue(assetId, out tag!); } private ImmutableDictionary? _tagsById; @@ -65,6 +81,7 @@ public void LoadDbTags(IEnumerable tags) _tagsById = tags.ToImmutableDictionary(tag => tag.Id); } + private ImmutableDictionary? _inspectionConfig; public ImmutableDictionary InspectionDefaultConfig => ContextNotInitializedException.ThrowIfNull(_inspectionConfig); @@ -80,7 +97,7 @@ public ImmutableHashSet Inspections => ContextNotInitializedException.ThrowIfNull(_inspections); private ImmutableHashSet? _quickfixes; - public ImmutableHashSet Quickfixes + public ImmutableHashSet QuickFixes => ContextNotInitializedException.ThrowIfNull(_quickfixes); private ImmutableHashSet? _annotations; diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs index 7cd4d20..e3225f2 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/BroadcastQuickFixesBlock.cs @@ -1,13 +1,28 @@ using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; using rubberduckvba.Server.Model; -using System.Xml.Linq; namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class BroadcastQuickFixesBlock : BroadcastBlockBase<(TagAsset, XDocument, IEnumerable), SyncContext> +public class BroadcastQuickFixesBlock : BroadcastBlockBase, SyncContext> { - public BroadcastQuickFixesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + public BroadcastQuickFixesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } +} + +public class BroadcastAnnotationsBlock : BroadcastBlockBase, SyncContext> +{ + public BroadcastAnnotationsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } +} + +public class BroadcastInspectionsBlock : BroadcastBlockBase, SyncContext> +{ + public BroadcastInspectionsBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs deleted file mode 100644 index e65a415..0000000 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/FeatureItemBufferBlock.cs +++ /dev/null @@ -1,11 +0,0 @@ -using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; -using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; -using rubberduckvba.Server.Data; - -namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; - -public class FeatureItemBufferBlock : BufferBlockBase -{ - public FeatureItemBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) - : base(parent, tokenSource, logger) { } -} diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs index cbc6ff5..49e38f0 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeAnnotationsBlock.cs @@ -19,23 +19,23 @@ public override IEnumerable Transform(IEnumerable input) { try { - - var main = input - .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) + var main = Context.StagingContext.Annotations + .Where(annotation => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == annotation.TagAssetId)) .ToList(); - var next = input - .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == e.TagAssetId)) + var next = Context.StagingContext.Annotations + .Where(annotation => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == annotation.TagAssetId)) .ToList(); Logger.LogDebug(Context.Parameters, $"Merging annotations. Main x{main.Count} | Next x{next.Count}"); var dbItems = Context.Annotations.ToDictionary(e => e.Name); + var merged = _service.Merge(dbItems, main, next); Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); Context.StagingContext.Annotations = new(merged); - Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.Annotations.Count()} | New: {Context.StagingContext.Annotations.Count()}"); + Logger.LogDebug(Context.Parameters, $"Updated: {Context.StagingContext.Annotations.Count(e => e.Id != default)} | New: {Context.StagingContext.Annotations.Count(e => e.Id == default)}"); return merged; } finally diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs index fd357c2..c7f247f 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeInspectionsBlock.cs @@ -19,12 +19,12 @@ public override IEnumerable Transform(IEnumerable input) { try { - var main = input - .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) + var main = Context.StagingContext.Inspections + .Where(inspection => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == inspection.TagAssetId)) .ToList(); - var next = input - .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == e.TagAssetId)) + var next = Context.StagingContext.Inspections + .Where(inspection => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == inspection.TagAssetId)) .ToList(); Logger.LogDebug(Context.Parameters, $"Merging inspections. Main x{main.Count} | Next x{next.Count}"); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs index 8c8040a..b5e9b34 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/MergeQuickFixesBlock.cs @@ -19,17 +19,16 @@ public override IEnumerable Transform(IEnumerable input) { try { - - var main = input - .Where(e => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == e.TagAssetId)) + var main = Context.StagingContext.QuickFixes + .Where(quickfix => Context.RubberduckDbMain.Assets.Any(asset => asset.Id == quickfix.TagAssetId)) .ToList(); - var next = input + var next = Context.StagingContext.QuickFixes .Where(e => Context.RubberduckDbNext.Assets.Any(asset => asset.Id == e.TagAssetId)) .ToList(); Logger.LogDebug(Context.Parameters, $"Merging quickfixes. Main x{main.Count} | Next x{next.Count}"); - var dbItems = Context.Quickfixes.ToDictionary(e => e.Name); + var dbItems = Context.QuickFixes.ToDictionary(e => e.Name); var merged = _service.Merge(dbItems, main, next); Logger.LogDebug(Context.Parameters, $"Merged x{merged.Count()}"); diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs index 3aa6ed9..29f5cb2 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/ParseInspectionXElementInfoBlock.cs @@ -5,7 +5,7 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class ParseInspectionXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info), Inspection, SyncContext> +public class ParseInspectionXElementInfoBlock : TransformBlockBase<(TagAsset asset, XElementInfo info, IEnumerable quickfixes), Inspection, SyncContext> { private readonly XmlDocInspectionParser _parser; @@ -16,7 +16,7 @@ public ParseInspectionXElementInfoBlock(PipelineSection parent, Can _parser = parser; } - public override async Task TransformAsync((TagAsset asset, XElementInfo info) input) + public override async Task TransformAsync((TagAsset asset, XElementInfo info, IEnumerable quickfixes) input) { if (input.asset is null) { @@ -24,13 +24,12 @@ public override async Task TransformAsync((TagAsset asset, XElementI } var feature = Context.Features["Inspections"]; - var quickfixes = Context.Features["QuickFixes"].QuickFixes; // NOTE: this makes parsing quickfixes a requirement for inspections var config = Context.InspectionDefaultConfig.TryGetValue(input.info.Name, out var value) ? value : null; var isPreRelease = Context.RubberduckDbNext.Assets.Any(asset => asset.Id == input.asset.Id); var name = input.info.Element.Attribute("name")!.Value; - var result = await _parser.ParseAsync(input.asset.Id, feature.Id, quickfixes, name, input.info.Element, config, isPreRelease); + var result = await _parser.ParseAsync(input.asset.Id, feature.Id, input.quickfixes, name, input.info.Element, config, isPreRelease); return result with { TagAssetId = input.asset.Id }; } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/PrepareStagingBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/PrepareStagingBlock.cs new file mode 100644 index 0000000..2090ecb --- /dev/null +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/PrepareStagingBlock.cs @@ -0,0 +1,26 @@ +using rubberduckvba.Server.ContentSynchronization.Pipeline.Abstract; +using rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.Context; +using rubberduckvba.Server.Model; + +namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; + +public class PrepareStagingBlock : TransformBlockBase, IEnumerable, IEnumerable>, StagingContext, SyncContext> +{ + public PrepareStagingBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) + { + } + + public override StagingContext Transform(Tuple, IEnumerable, IEnumerable> input) + { + var parameters = Context.StagingContext.Parameters; + var (annotations, quickfixes, inspections) = (input.Item1, input.Item2, input.Item3); + + return new StagingContext(parameters) + { + Inspections = new(inspections), + QuickFixes = new(quickfixes), + Annotations = new(annotations) + }; + } +} \ No newline at end of file diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs index 10fa389..8f4e894 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/StreamInspectionNodesBlock.cs @@ -5,28 +5,39 @@ namespace rubberduckvba.Server.ContentSynchronization.Pipeline.Sections.SyncXmldoc; -public class StreamInspectionNodesBlock : GetXElementInfoBlock +public class StreamInspectionNodesBlock : TransformManyBlockBase>, (TagAsset, XElementInfo, IEnumerable), SyncContext> { public StreamInspectionNodesBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } - public override IEnumerable<(TagAsset, XElementInfo)> Transform((TagAsset asset, XDocument document) input) + public override IEnumerable<(TagAsset, XElementInfo, IEnumerable)> Transform(Tuple<(TagAsset, XDocument), IEnumerable> input) { - if (input.asset is null) + if (input.Item1.Item1 is null) { return []; } - var result = (from node in input.document.Descendants("member").AsParallel() + var result = (from node in input.Item1.Item2.Descendants("member").AsParallel() let fullName = GetNameOrDefault(node, "Inspection") where !string.IsNullOrWhiteSpace(fullName) let typeName = fullName.Substring(fullName.LastIndexOf(".", StringComparison.Ordinal) + 1) - select (input.asset, new XElementInfo(typeName, node))) + select (input.Item1.Item1, new XElementInfo(typeName, node), input.Item2)) .ToList(); - Logger.LogInformation(Context.Parameters, $"{Name} | Extracted {result.Count} inspection nodes from tag asset {input.asset.Name}"); + Logger.LogInformation(Context.Parameters, $"{Name} | Extracted {result.Count} inspection nodes from tag asset {input.Item1.Item1.Name}"); return result; } + + private static string GetNameOrDefault(XElement memberNode, string suffix) + { + var name = memberNode.Attribute("name")?.Value; + if (name == null || !name.StartsWith("T:") || !name.EndsWith(suffix) || name.EndsWith($"I{suffix}")) + { + return default!; + } + + return name.Substring(2); + } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs index 99bd41e..d34d90a 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/SyncXmldocSection.cs @@ -47,15 +47,23 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS StreamInspectionNodes = new StreamInspectionNodesBlock(this, tokenSource, logger); StreamQuickFixNodes = new StreamQuickFixNodesBlock(this, tokenSource, logger); StreamAnnotationNodes = new StreamAnnotationNodesBlock(this, tokenSource, logger); + BufferInspections = new InspectionBufferBlock(this, tokenSource, logger); + BufferQuickFixes = new QuickFixBufferBlock(this, tokenSource, logger); + BufferAnnotations = new AnnotationBufferBlock(this, tokenSource, logger); ParseXmlDocInspections = new ParseInspectionXElementInfoBlock(this, tokenSource, logger, xmlInspectionParser); ParseXmlDocQuickFixes = new ParseQuickFixXElementInfoBlock(this, tokenSource, logger, xmlQuickFixParser); ParseXmlDocAnnotations = new ParseAnnotationXElementInfoBlock(this, tokenSource, logger, xmlAnnotationParser); MergeInspections = new MergeInspectionsBlock(this, tokenSource, logger, mergeService); MergeQuickFixes = new MergeQuickFixesBlock(this, tokenSource, logger, mergeService); + BroadcastQuickFixes = new BroadcastQuickFixesBlock(this, tokenSource, logger); + BroadcastAnnotations = new BroadcastAnnotationsBlock(this, tokenSource, logger); + BroadcastInspections = new BroadcastInspectionsBlock(this, tokenSource, logger); MergeAnnotations = new MergeAnnotationsBlock(this, tokenSource, logger, mergeService); AccumulateProcessedInspections = new AccumulateProcessedInspectionsBlock(this, tokenSource, logger); AccumulateProcessedQuickFixes = new AccumulateProcessedQuickFixesBlock(this, tokenSource, logger); AccumulateProcessedAnnotations = new AccumulateProcessedAnnotationsBlock(this, tokenSource, logger); + JoinStagingSources = new DataflowJoinBlock, IEnumerable, IEnumerable>(this, tokenSource, logger, nameof(JoinStagingSources)); + PrepareStaging = new PrepareStagingBlock(this, tokenSource, logger); SaveStaging = new BulkSaveStagingBlock(this, tokenSource, staging, logger); } @@ -78,6 +86,7 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS private BroadcastXDocumentBlock BroadcastXDocument { get; } private StreamQuickFixNodesBlock StreamQuickFixNodes { get; } + private QuickFixBufferBlock BufferQuickFixes { get; } private ParseQuickFixXElementInfoBlock ParseXmlDocQuickFixes { get; } private MergeQuickFixesBlock MergeQuickFixes { get; } private BroadcastQuickFixesBlock BroadcastQuickFixes { get; } @@ -85,15 +94,21 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS private DataflowJoinBlock<(TagAsset, XDocument), IEnumerable> JoinQuickFixes { get; } private StreamInspectionNodesBlock StreamInspectionNodes { get; } + private InspectionBufferBlock BufferInspections { get; } private ParseInspectionXElementInfoBlock ParseXmlDocInspections { get; } private MergeInspectionsBlock MergeInspections { get; } + private BroadcastInspectionsBlock BroadcastInspections { get; } private AccumulateProcessedInspectionsBlock AccumulateProcessedInspections { get; } private StreamAnnotationNodesBlock StreamAnnotationNodes { get; } + private AnnotationBufferBlock BufferAnnotations { get; } private ParseAnnotationXElementInfoBlock ParseXmlDocAnnotations { get; } private MergeAnnotationsBlock MergeAnnotations { get; } + private BroadcastAnnotationsBlock BroadcastAnnotations { get; } private AccumulateProcessedAnnotationsBlock AccumulateProcessedAnnotations { get; } + private DataflowJoinBlock, IEnumerable, IEnumerable> JoinStagingSources { get; } + private PrepareStagingBlock PrepareStaging { get; } private BulkSaveStagingBlock SaveStaging { get; } public ITargetBlock InputBlock => ReceiveRequest.Block; @@ -112,28 +127,37 @@ public SyncXmldocSection(IPipeline parent, CancellationTokenS [nameof(JoinDbTags)] = JoinDbTags.Block, [nameof(LoadDbTags)] = LoadDbTags.Block, [nameof(JoinAsyncSources)] = JoinAsyncSources.Block, + [nameof(StreamLatestTags)] = StreamLatestTags.Block, [nameof(StreamTagAssets)] = StreamTagAssets.Block, [nameof(BufferXmlAsset)] = BufferXmlAsset.Block, [nameof(DownloadXmlAsset)] = DownloadXmlAsset.Block, [nameof(BroadcastXDocument)] = BroadcastXDocument.Block, - [nameof(JoinQuickFixes)] = JoinQuickFixes.Block, + + [nameof(StreamAnnotationNodes)] = StreamAnnotationNodes.Block, + [nameof(ParseXmlDocAnnotations)] = ParseXmlDocAnnotations.Block, + [nameof(AccumulateProcessedAnnotations)] = AccumulateProcessedAnnotations.Block, + [nameof(MergeAnnotations)] = MergeAnnotations.Block, + [nameof(BufferAnnotations)] = BufferAnnotations.Block, + [nameof(BroadcastAnnotations)] = BroadcastAnnotations.Block, [nameof(StreamQuickFixNodes)] = StreamQuickFixNodes.Block, [nameof(ParseXmlDocQuickFixes)] = ParseXmlDocQuickFixes.Block, - [nameof(MergeQuickFixes)] = MergeQuickFixes.Block, [nameof(AccumulateProcessedQuickFixes)] = AccumulateProcessedQuickFixes.Block, + [nameof(MergeQuickFixes)] = MergeQuickFixes.Block, + [nameof(BufferQuickFixes)] = BufferQuickFixes.Block, + [nameof(BroadcastQuickFixes)] = BroadcastQuickFixes.Block, + [nameof(JoinQuickFixes)] = JoinQuickFixes.Block, [nameof(StreamInspectionNodes)] = StreamInspectionNodes.Block, [nameof(ParseXmlDocInspections)] = ParseXmlDocInspections.Block, - [nameof(MergeInspections)] = MergeInspections.Block, [nameof(AccumulateProcessedInspections)] = AccumulateProcessedInspections.Block, + [nameof(MergeInspections)] = MergeInspections.Block, + [nameof(BufferInspections)] = BufferInspections.Block, + [nameof(BroadcastInspections)] = BroadcastInspections.Block, - [nameof(StreamAnnotationNodes)] = StreamAnnotationNodes.Block, - [nameof(ParseXmlDocAnnotations)] = ParseXmlDocAnnotations.Block, - [nameof(MergeAnnotations)] = MergeAnnotations.Block, - [nameof(AccumulateProcessedAnnotations)] = AccumulateProcessedAnnotations.Block, - + [nameof(JoinStagingSources)] = JoinStagingSources.Block, + [nameof(PrepareStaging)] = PrepareStaging.Block, [nameof(SaveStaging)] = SaveStaging.Block, }; #endregion @@ -151,32 +175,38 @@ public override void CreateBlocks() JoinDbTags.CreateBlock(AcquireDbMainTagGraph, AcquireDbNextTagGraph, AcquireDbTags); LoadDbTags.CreateBlock(JoinDbTags); JoinAsyncSources.CreateBlock(LoadDbTags, LoadInspectionDefaultConfig, LoadFeatures); + StreamLatestTags.CreateBlock(JoinAsyncSources); StreamTagAssets.CreateBlock(StreamLatestTags); BufferXmlAsset.CreateBlock(StreamTagAssets); DownloadXmlAsset.CreateBlock(BufferXmlAsset); BroadcastXDocument.CreateBlock(DownloadXmlAsset); + StreamAnnotationNodes.CreateBlock(BroadcastXDocument); + ParseXmlDocAnnotations.CreateBlock(StreamAnnotationNodes); + AccumulateProcessedAnnotations.CreateBlock(ParseXmlDocAnnotations); + MergeAnnotations.CreateBlock(() => Context.StagingContext.Annotations, AccumulateProcessedAnnotations.Block.Completion); + BufferAnnotations.CreateBlock(MergeAnnotations); + BroadcastAnnotations.CreateBlock(BufferAnnotations); + StreamQuickFixNodes.CreateBlock(BroadcastXDocument); ParseXmlDocQuickFixes.CreateBlock(StreamQuickFixNodes); + AccumulateProcessedQuickFixes.CreateBlock(ParseXmlDocQuickFixes); MergeQuickFixes.CreateBlock(() => Context.StagingContext.QuickFixes, AccumulateProcessedQuickFixes.Block.Completion); - BroadcastQuickFixes.CreateBlock(MergeQuickFixes); - AccumulateProcessedQuickFixes.CreateBlock(BroadcastQuickFixes); - JoinQuickFixes.CreateBlock(BroadcastXDocument, BroadcastQuickFixes); + BufferQuickFixes.CreateBlock(MergeQuickFixes); + BroadcastQuickFixes.CreateBlock(BufferQuickFixes); - StreamAnnotationNodes.CreateBlock(BroadcastXDocument); - ParseXmlDocAnnotations.CreateBlock(StreamAnnotationNodes); - MergeAnnotations.CreateBlock(() => Context.StagingContext.Annotations, AccumulateProcessedAnnotations.Block.Completion); - AccumulateProcessedAnnotations.CreateBlock(MergeAnnotations); + JoinQuickFixes.CreateBlock(BroadcastXDocument, BroadcastQuickFixes); StreamInspectionNodes.CreateBlock(JoinQuickFixes); ParseXmlDocInspections.CreateBlock(StreamInspectionNodes); + AccumulateProcessedInspections.CreateBlock(ParseXmlDocInspections); MergeInspections.CreateBlock(() => Context.StagingContext.Inspections, AccumulateProcessedInspections.Block.Completion); - AccumulateProcessedInspections.CreateBlock(MergeInspections); + BufferInspections.CreateBlock(MergeInspections); + BroadcastInspections.CreateBlock(BufferInspections); - SaveStaging.CreateBlock(() => Context.StagingContext, - AccumulateProcessedInspections.Block.Completion, - AccumulateProcessedQuickFixes.Block.Completion, - AccumulateProcessedAnnotations.Block.Completion); + JoinStagingSources.CreateBlock(BroadcastAnnotations, BroadcastQuickFixes, BroadcastInspections); + PrepareStaging.CreateBlock(JoinStagingSources); + SaveStaging.CreateBlock(PrepareStaging); } } diff --git a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs index 86fabc6..69afc5e 100644 --- a/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs +++ b/rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/SyncXmldoc/XmlTagAssetBufferBlock.cs @@ -9,3 +9,21 @@ public class XmlTagAssetBufferBlock : BufferBlockBase public XmlTagAssetBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) : base(parent, tokenSource, logger) { } } + +public class AnnotationBufferBlock : BufferBlockBase, SyncContext> +{ + public AnnotationBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) { } +} + +public class QuickFixBufferBlock : BufferBlockBase, SyncContext> +{ + public QuickFixBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) { } +} + +public class InspectionBufferBlock : BufferBlockBase, SyncContext> +{ + public InspectionBufferBlock(PipelineSection parent, CancellationTokenSource tokenSource, ILogger logger) + : base(parent, tokenSource, logger) { } +} diff --git a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs index cd21a7b..19491b3 100644 --- a/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs +++ b/rubberduckvba.Server/ContentSynchronization/XmlDoc/XmlDocMerge.cs @@ -45,8 +45,8 @@ public class XmlDocMerge(ILogger logger) : IXmlDocMerge public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) { - var mainBranch = main.ToHashSet(); - var nextBranch = (next.Any() ? next : main).ToHashSet(); + var mainBranch = (main.Any() ? main : dbItems.Values).ToHashSet(); + var nextBranch = (next.Any() ? next : mainBranch).ToHashSet(); var merged = new HashSet(); var timestamp = TimeProvider.System.GetUtcNow().DateTime; @@ -77,14 +77,16 @@ select item with } ); + merged.UnionWith(updatedItems); + merged.UnionWith(insertItems); return merged; } public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) { - var mainBranch = main.ToHashSet(); - var nextBranch = (next.Any() ? next : main).ToHashSet(); + var mainBranch = (main.Any() ? main : dbItems.Values).ToHashSet(); + var nextBranch = (next.Any() ? next : mainBranch).ToHashSet(); var merged = new HashSet(); var timestamp = TimeProvider.System.GetUtcNow().DateTime; @@ -115,13 +117,15 @@ select item with } ); + merged.UnionWith(updatedItems); + merged.UnionWith(insertItems); return merged; } public IEnumerable Merge(IDictionary dbItems, IEnumerable main, IEnumerable next) { - var mainBranch = main.ToHashSet(); - var nextBranch = (next.Any() ? next : main).ToHashSet(); + var mainBranch = (main.Any() ? main : dbItems.Values).ToHashSet(); + var nextBranch = (next.Any() ? next : mainBranch).ToHashSet(); var merged = new HashSet(); var timestamp = TimeProvider.System.GetUtcNow().DateTime; @@ -152,6 +156,8 @@ select item with } ); + merged.UnionWith(updatedItems); + merged.UnionWith(insertItems); return merged; } } diff --git a/rubberduckvba.Server/Data/DataModel.cs b/rubberduckvba.Server/Data/DataModel.cs deleted file mode 100644 index 1ea2e6c..0000000 --- a/rubberduckvba.Server/Data/DataModel.cs +++ /dev/null @@ -1,202 +0,0 @@ -using rubberduckvba.Server.Model; -using System.Diagnostics.CodeAnalysis; - -namespace rubberduckvba.Server.Data; - -//public record class Tag -//{ -// public int Id { get; init; } -// public DateTime DateTimeInserted { get; init; } -// public DateTime? DateTimeUpdated { get; init; } -// public long ReleaseId { get; init; } -// public string Name { get; init; } = default!; -// public DateTime DateCreated { get; init; } -// public string InstallerDownloadUrl { get; init; } = default!; -// public int InstallerDownloads { get; init; } -// public bool IsPreRelease { get; init; } -//} - -//public record class TagAsset -//{ -// public int Id { get; init; } -// public DateTime DateTimeInserted { get; init; } -// public DateTime? DateTimeUpdated { get; init; } -// public int TagId { get; init; } -// public string Name { get; init; } = default!; -// public string DownloadUrl { get; init; } = default!; -//} - - -//public record class TagGraph : Tag -//{ -// public IEnumerable Assets { get; init; } = []; -//} - -//public record class Feature -//{ -// public int Id { get; init; } -// public int? ParentId { get; init; } -// public DateTime DateTimeInserted { get; init; } -// public DateTime? DateTimeUpdated { get; init; } -// public int RepositoryId { get; init; } -// public string Name { get; init; } = default!; -// public string Title { get; init; } = default!; -// public string ShortDescription { get; init; } = default!; -// public string Description { get; init; } = default!; -// public bool IsHidden { get; init; } -// public bool IsNew { get; init; } -// public bool HasImage { get; init; } -//} - -//public record class FeatureGraph : Feature -//{ -// public static FeatureGraph FromFeature(Feature feature) => new() -// { -// Id = feature.Id, -// DateTimeInserted = feature.DateTimeInserted, -// DateTimeUpdated = feature.DateTimeUpdated, -// RepositoryId = feature.RepositoryId, -// ParentId = feature.ParentId, -// Name = feature.Name, -// Title = feature.Title, -// ShortDescription = feature.ShortDescription, -// Description = feature.Description, -// IsHidden = feature.IsHidden, -// IsNew = feature.IsNew, -// }; - -// public string ParentName { get; init; } = default!; -// public string ParentTitle { get; init; } = default!; - -// public IEnumerable Features { get; init; } = []; -// public IEnumerable Items { get; init; } = []; - -// public IEnumerable Inspections { get; init; } = []; -//} - -public record class FeatureXmlDoc : FeatureXmlDoc -{ - public TInfo? Info { get; init; } = default!; -} - -public record class FeatureXmlDoc -{ - public int Id { get; init; } - public DateTime DateTimeInserted { get; init; } - public DateTime? DateTimeUpdated { get; init; } - - public int FeatureId { get; init; } - public string FeatureName { get; init; } - public string FeatureTitle { get; init; } - - public string Name { get; init; } = default!; - public string Title { get; init; } = default!; - public string Summary { get; init; } = default!; - - public bool IsNew { get; init; } - public bool IsDiscontinued { get; init; } - public bool IsHidden { get; init; } - - public int TagAssetId { get; init; } - public int TagId { get; init; } - - public string SourceUrl { get; init; } = default!; - - public string Serialized { get; init; } = default!; - public string TagName { get; init; } = default!; - - public IEnumerable Examples { get; init; } = []; -} - -public class XmlDocBranchIntersectComparer : EqualityComparer where T : IFeature -{ - public override bool Equals(T? x, T? y) - { - if (x is null && y is null) - { - return true; - } - - if (x is null || y is null) - { - return false; - } - - if (ReferenceEquals(x, y)) - { - return true; - } - - return x.Name == y.Name; - } - - public override int GetHashCode([DisallowNull] T obj) - { - return HashCode.Combine(obj.Name); - } -} - -public record class XmlDocInspectionInfo : FeatureXmlDoc -{ - public string Reasoning { get; init; } = default!; - public string Remarks { get; init; } = default!; - public string DefaultSeverity { get; init; } = default!; - public string InspectionType { get; init; } = default!; - - public string[] References { get; init; } = []; - public string[] QuickFixes { get; init; } = []; - public string? HostApp { get; init; } = default!; - - -} - -public record class XmlDocQuickFixInfo : FeatureXmlDoc -{ - public string Remarks { get; init; } = default!; - public bool CanFixInProcedure { get; init; } - public bool CanFixInModule { get; init; } - public bool CanFixInProject { get; init; } - public string[] Inspections { get; init; } = []; -} - -public record class XmlDocAnnotationInfo : FeatureXmlDoc -{ - public XmlDocAnnotationParameterInfo[] Parameters { get; init; } = []; -} - -public record class XmlDocAnnotationParameterInfo -{ - public string Name { get; init; } = default!; - public string Type { get; init; } = default!; - public string Description { get; init; } = default!; -} - -public enum SyncStatus -{ - Received = 0, - Started = 1, - Success = 2, - Error = -1 -} - -public record class SynchronizationRequest -{ - public Guid RequestId { get; init; } = default!; - public string JobId { get; init; } = default!; - public DateTime UtcDateTimeStarted { get; init; } = default!; - public DateTime? UtcDateTimeEnded { get; init; } = default!; - public SyncStatus Status { get; init; } = default!; - public string Message { get; init; } = default!; -} - -public static class SynchronizationMessage -{ - public static string FromStatus(SyncStatus status) => status switch - { - SyncStatus.Received => "Synchronization queued.", - SyncStatus.Started => "Synchronization started.", - SyncStatus.Success => "Synchronization completed.", - SyncStatus.Error => "Synchronization failed.", - _ => "(unknown status)" - }; -} diff --git a/rubberduckvba.Server/Data/FeaturesRepository.cs b/rubberduckvba.Server/Data/FeaturesRepository.cs index 888c6ea..be7dc6b 100644 --- a/rubberduckvba.Server/Data/FeaturesRepository.cs +++ b/rubberduckvba.Server/Data/FeaturesRepository.cs @@ -16,9 +16,11 @@ public FeaturesRepository(IOptions settings) [DateTimeInserted], [DateTimeUpdated], [RepositoryId], + [ParentId], [Name], [Title], [ShortDescription], + [Description], [IsNew], [HasImage] FROM [dbo].[Features]"; diff --git a/rubberduckvba.Server/Data/QuickFixRepository.cs b/rubberduckvba.Server/Data/QuickFixRepository.cs index 0c2b0cb..9247fb2 100644 --- a/rubberduckvba.Server/Data/QuickFixRepository.cs +++ b/rubberduckvba.Server/Data/QuickFixRepository.cs @@ -44,7 +44,7 @@ INSERT INTO [dbo].[QuickFixes] ( [CanFixProject], [CanFixAll], [Inspections], - [JsonExamples] + [JsonExamples]) VALUES ( GETDATE(), @featureId, diff --git a/rubberduckvba.Server/Data/SynchronizationRequest.cs b/rubberduckvba.Server/Data/SynchronizationRequest.cs new file mode 100644 index 0000000..bd54cbd --- /dev/null +++ b/rubberduckvba.Server/Data/SynchronizationRequest.cs @@ -0,0 +1,32 @@ +namespace rubberduckvba.Server.Data; + + +public enum SyncStatus +{ + Received = 0, + Started = 1, + Success = 2, + Error = -1 +} + +public record class SynchronizationRequest +{ + public Guid RequestId { get; init; } = default!; + public string JobId { get; init; } = default!; + public DateTime UtcDateTimeStarted { get; init; } = default!; + public DateTime? UtcDateTimeEnded { get; init; } = default!; + public SyncStatus Status { get; init; } = default!; + public string Message { get; init; } = default!; +} + +public static class SynchronizationMessage +{ + public static string FromStatus(SyncStatus status) => status switch + { + SyncStatus.Received => "Synchronization queued.", + SyncStatus.Started => "Synchronization started.", + SyncStatus.Success => "Synchronization completed.", + SyncStatus.Error => "Synchronization failed.", + _ => "(unknown status)" + }; +} diff --git a/rubberduckvba.Server/Data/XmlDocBranchIntersectComparer.cs b/rubberduckvba.Server/Data/XmlDocBranchIntersectComparer.cs new file mode 100644 index 0000000..fb2e877 --- /dev/null +++ b/rubberduckvba.Server/Data/XmlDocBranchIntersectComparer.cs @@ -0,0 +1,32 @@ +using rubberduckvba.Server.Model; +using System.Diagnostics.CodeAnalysis; + +namespace rubberduckvba.Server.Data; + +public class XmlDocBranchIntersectComparer : EqualityComparer where T : IFeature +{ + public override bool Equals(T? x, T? y) + { + if (x is null && y is null) + { + return true; + } + + if (x is null || y is null) + { + return false; + } + + if (ReferenceEquals(x, y)) + { + return true; + } + + return x.Name == y.Name; + } + + public override int GetHashCode([DisallowNull] T obj) + { + return HashCode.Combine(obj.Name); + } +} diff --git a/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs b/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs index f55a179..1e64a03 100644 --- a/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs +++ b/rubberduckvba.Server/Hangfire/QueuedUpdateOrchestrator.cs @@ -114,6 +114,10 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton, SynchronizationPipelineFactory>(); services.AddSingleton(); services.AddSingleton(); + + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); } private static async Task Run(IServiceCollection services, PerformContext context, TParameters parameters) diff --git a/rubberduckvba.Server/Program.cs b/rubberduckvba.Server/Program.cs index 3a2225f..fd06fbe 100644 --- a/rubberduckvba.Server/Program.cs +++ b/rubberduckvba.Server/Program.cs @@ -165,6 +165,9 @@ private static void ConfigureServices(IServiceCollection services) services.AddSingleton, SynchronizationPipelineFactory>(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); @@ -185,7 +188,7 @@ private static void ConfigureLogging(IServiceCollection services) var config = new LoggingConfiguration(); (NLog.LogLevel MinLevel, string, Target Target)[] targets = [ - (NLog.LogLevel.Trace, "*", new DebuggerTarget("DebuggerLog")), + (NLog.LogLevel.Trace, "rubberduckvba.*", new DebuggerTarget("DebuggerLog")), (NLog.LogLevel.Info, "rubberduckvba.*", new FileTarget("FileLog") { FileName = "logs/rubberduckvba.Server.log", diff --git a/rubberduckvba.Server/Services/RubberduckDbService.cs b/rubberduckvba.Server/Services/RubberduckDbService.cs index 051085e..458c5cd 100644 --- a/rubberduckvba.Server/Services/RubberduckDbService.cs +++ b/rubberduckvba.Server/Services/RubberduckDbService.cs @@ -154,7 +154,13 @@ public async Task> GetTopLevelFeatures(RepositoryId? reposi public async Task ResolveFeature(RepositoryId repositoryId, string name) { - return _featureServices.Get(name); + var features = _featureServices.Get(topLevelOnly: false).ToList(); + var feature = features.Single(e => string.Equals(e.Name, name, StringComparison.OrdinalIgnoreCase)); + var children = features.Where(e => e.ParentId == feature.Id); + return new FeatureGraph(feature.ToEntity()) + { + Features = children.ToArray() + }; // const string featureSql = @" //WITH feature AS ( // SELECT [Id] From e9c40979e8f0bf8adaa4f24633448a2c958236b5 Mon Sep 17 00:00:00 2001 From: Mathieu Guindon Date: Sun, 10 Nov 2024 01:57:17 -0500 Subject: [PATCH 11/11] adjust feature stack --- .../Api/Features/FeatureViewModel.cs | 10 +++---- .../Api/Features/FeaturesController.cs | 26 +++---------------- .../Data/FeaturesRepository.cs | 1 + .../Services/rubberduckdb/FeatureServices.cs | 2 ++ 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/rubberduckvba.Server/Api/Features/FeatureViewModel.cs b/rubberduckvba.Server/Api/Features/FeatureViewModel.cs index 6211158..12b9220 100644 --- a/rubberduckvba.Server/Api/Features/FeatureViewModel.cs +++ b/rubberduckvba.Server/Api/Features/FeatureViewModel.cs @@ -20,11 +20,7 @@ public FeatureViewModel(Feature model) if (model is FeatureGraph graph) { - FeatureId = graph.ParentId; - FeatureName = graph.ParentName; - FeatureTitle = graph.ParentTitle; - - Features = graph.Features.Select(e => new FeatureViewModel(e)).ToArray(); + Features = graph.Features.Select(e => new FeatureViewModel(e) { FeatureId = e.ParentId, FeatureName = graph.Name, FeatureTitle = graph.Title }).ToArray(); Inspections = graph.Inspections.ToArray(); } } @@ -34,8 +30,8 @@ public FeatureViewModel(Feature model) public DateTime? DateUpdated { get; init; } public int? FeatureId { get; init; } - public string FeatureName { get; init; } - public string FeatureTitle { get; init; } + public string? FeatureName { get; init; } + public string? FeatureTitle { get; init; } public string Name { get; init; } public string Title { get; init; } diff --git a/rubberduckvba.Server/Api/Features/FeaturesController.cs b/rubberduckvba.Server/Api/Features/FeaturesController.cs index 3832084..43f60c1 100644 --- a/rubberduckvba.Server/Api/Features/FeaturesController.cs +++ b/rubberduckvba.Server/Api/Features/FeaturesController.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Mvc; using rubberduckvba.Server.Model; using rubberduckvba.Server.Services; +using rubberduckvba.Server.Services.rubberduckdb; using System.ComponentModel; using System.Reflection; @@ -16,7 +17,7 @@ public record class MarkdownFormattingRequestViewModel [ApiController] [AllowAnonymous] -public class FeaturesController(IRubberduckDbService db, IMarkdownFormattingService md, ICacheService cache) : ControllerBase +public class FeaturesController(IRubberduckDbService db, FeatureServices features, IMarkdownFormattingService md, ICacheService cache) : ControllerBase { private static RepositoryOptionViewModel[] RepositoryOptions { get; } = Enum.GetValues().Select(e => new RepositoryOptionViewModel { Id = e, Name = e.ToString() }).ToArray(); @@ -58,32 +59,13 @@ public async Task> Info([FromRoute] string name) // return cached; //} - var feature = await db.ResolveFeature(RepositoryId.Rubberduck, name); + var feature = features.Get(name); if (feature is null) { return NotFound(); } - var model = new FeatureViewModel(feature with - { - Description = feature.Description, - ShortDescription = feature.ShortDescription, - - ParentId = feature.Id, - ParentName = feature.Name, - ParentTitle = feature.Title, - - Features = feature.Features.Select(subFeature => subFeature with - { - Description = subFeature.Description, - ShortDescription = subFeature.ShortDescription - }).ToArray(), - - Inspections = feature.Inspections, - QuickFixes = feature.QuickFixes, - Annotations = feature.Annotations, - }); - + var model = new FeatureViewModel(feature); //cache.Write(HttpContext.Request.Path, model); return Ok(model); } diff --git a/rubberduckvba.Server/Data/FeaturesRepository.cs b/rubberduckvba.Server/Data/FeaturesRepository.cs index be7dc6b..94cb0b8 100644 --- a/rubberduckvba.Server/Data/FeaturesRepository.cs +++ b/rubberduckvba.Server/Data/FeaturesRepository.cs @@ -9,6 +9,7 @@ public FeaturesRepository(IOptions settings) : base(settings) { } protected override string TableName { get; } = "Features"; + protected override string? ParentFKColumnName { get; } = "ParentId"; protected override string SelectSql { get; } = @" SELECT diff --git a/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs b/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs index ec5b1af..44402a4 100644 --- a/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs +++ b/rubberduckvba.Server/Services/rubberduckdb/FeatureServices.cs @@ -22,6 +22,7 @@ public FeatureGraph Get(string name) { var id = featureRepository.GetId(name); var feature = featureRepository.GetById(id); + var children = featureRepository.GetAll(parentId: id).Select(e => new Feature(e)); IEnumerable inspections = []; IEnumerable quickfixes = []; @@ -42,6 +43,7 @@ public FeatureGraph Get(string name) return new FeatureGraph(feature) { + Features = children, Annotations = annotations, QuickFixes = quickfixes, Inspections = inspections,