Remove data type config for pdf.

Author: bjorntore

src/Altinn.App.Core/Internal/Pdf/IPdfService.cs

@@ -22,14 +22,12 @@ public interface IPdfService
     /// </summary>
     /// <param name="instance">The instance details.</param>
     /// <param name="taskId">The task id for which the PDF is generated.</param>
-    /// <param name="dataTypeId">The data type to use when storing the PDF.</param>
     /// <param name="fileNameTextResourceElementId">A text resource element id for the file name of the PDF. If no text resource is found, the literal value will be used. If null, a default file name will be used.</param>
     /// <param name="autoGeneratePdfForTaskIds">Enable auto-pdf for a list of tasks. Will not respect pdfLayoutName on those tasks, but use the main layout-set of the given tasks and render the components in summary mode. This setting will be ignored if the PDF task has a pdf layout set defined.</param>
     /// <param name="ct">Cancellation token for when a request should be stopped before it's completed.</param>
     Task GenerateAndStorePdf(
         Instance instance,
         string taskId,
-        string? dataTypeId,
         string? fileNameTextResourceElementId,
         List<string>? autoGeneratePdfForTaskIds = null,
         CancellationToken ct = default

src/Altinn.App.Core/Internal/Pdf/PdfService.cs

@@ -72,14 +72,13 @@ public async Task GenerateAndStorePdf(Instance instance, string taskId, Cancella
     {
         using var activity = _telemetry?.StartGenerateAndStorePdfActivity(instance, taskId);
 
-        await GenerateAndStorePdfInternal(instance, taskId, null, null, null, ct);
+        await GenerateAndStorePdfInternal(instance, taskId, null, null, ct);
     }
 
     /// <inheritdoc/>
     public async Task GenerateAndStorePdf(
         Instance instance,
         string taskId,
-        string? dataTypeId,
         string? fileNameTextResourceElementId,
         List<string>? autoGeneratePdfForTaskIds = null,
         CancellationToken ct = default
@@ -90,7 +89,6 @@ public async Task GenerateAndStorePdf(
         await GenerateAndStorePdfInternal(
             instance,
             taskId,
-            dataTypeId,
             fileNameTextResourceElementId,
             autoGeneratePdfForTaskIds,
             ct
@@ -122,7 +120,6 @@ public async Task<Stream> GeneratePdf(Instance instance, string taskId, Cancella
     private async Task GenerateAndStorePdfInternal(
         Instance instance,
         string taskId,
-        string? dataTypeId,
         string? fileNameTextResourceElementId,
         List<string>? autoGeneratePdfForTaskIds = null,
         CancellationToken ct = default
@@ -148,7 +145,7 @@ private async Task GenerateAndStorePdfInternal(
         string fileName = GetFileName(instance, textResource, fileNameTextResourceElementId);
         await _dataClient.InsertBinaryData(
             instance.Id,
-            dataTypeId ?? PdfElementType,
+            PdfElementType,
             PdfContentType,
             fileName,
             pdfContent,

src/Altinn.App.Core/Internal/Process/Elements/AltinnExtensionProperties/AltinnPdfConfiguration.cs

@@ -7,12 +7,6 @@ namespace Altinn.App.Core.Internal.Process.Elements.AltinnExtensionProperties;
 /// </summary>
 public sealed class AltinnPdfConfiguration
 {
-    /// <summary>
-    /// Set the data type to use when storing the PDF. If not set, ref-data-as-pdf will be used.
-    /// </summary>
-    [XmlElement("dataTypeId", Namespace = "http://altinn.no/process")]
-    public string? DataTypeId { get; set; }
-
     /// <summary>
     /// Set the filename of the PDF. Supports text resource keys for language support.
     /// </summary>
@@ -28,15 +22,10 @@ public sealed class AltinnPdfConfiguration
 
     internal ValidAltinnPdfConfiguration Validate()
     {
-        string? normalizedDataTypeId = string.IsNullOrWhiteSpace(DataTypeId) ? null : DataTypeId.Trim();
         string? normalizedFilename = string.IsNullOrWhiteSpace(Filename) ? null : Filename.Trim();
 
-        return new ValidAltinnPdfConfiguration(normalizedDataTypeId, normalizedFilename, AutoPdfTaskIds);
+        return new ValidAltinnPdfConfiguration(normalizedFilename, AutoPdfTaskIds);
     }
 }
 
-internal readonly record struct ValidAltinnPdfConfiguration(
-    string? DataTypeId,
-    string? Filename,
-    List<string>? AutoPdfTaskIds
-);
+internal readonly record struct ValidAltinnPdfConfiguration(string? Filename, List<string>? AutoPdfTaskIds);

src/Altinn.App.Core/Internal/Process/ProcessTasks/ServiceTasks/PdfServiceTask.cs

@@ -41,7 +41,6 @@ public async Task<ServiceTaskResult> Execute(ServiceTaskContext context)
         await _pdfService.GenerateAndStorePdf(
             instance,
             taskId,
-            config.DataTypeId,
             config.Filename,
             config.AutoPdfTaskIds,
             context.CancellationToken

test/Altinn.App.Core.Tests/Internal/Pdf/PdfServiceTests.cs

@@ -323,14 +323,7 @@ public async Task GenerateAndStorePdf_WithAutoGeneratePdfForTaskIds_ShouldInclud
         };
 
         // Act
-        await target.GenerateAndStorePdf(
-            instance,
-            "Task_PDF",
-            null,
-            null,
-            autoGeneratePdfForTaskIds,
-            CancellationToken.None
-        );
+        await target.GenerateAndStorePdf(instance, "Task_PDF", null, autoGeneratePdfForTaskIds, CancellationToken.None);
 
         // Assert
         _pdfGeneratorClient.Verify(

test/Altinn.App.Core.Tests/Internal/Process/ServiceTasks/PdfServiceTaskTests.cs

@@ -56,7 +56,6 @@ public async Task Execute_Should_Call_GenerateAndStorePdf()
                 x.GenerateAndStorePdf(
                     instance,
                     instance.Process.CurrentTask.ElementId,
-                    null,
                     FileName,
                     It.IsAny<List<string>?>(),
                     It.IsAny<CancellationToken>()
@@ -98,7 +97,7 @@ public async Task Execute_Should_Pass_AutoPdfTaskIds_To_PdfService()
 
         // Assert
         _pdfServiceMock.Verify(
-            x => x.GenerateAndStorePdf(instance, "pdfTask", null, "test.pdf", taskIds, It.IsAny<CancellationToken>()),
+            x => x.GenerateAndStorePdf(instance, "pdfTask", "test.pdf", taskIds, It.IsAny<CancellationToken>()),
             Times.Once
         );
     }

test/Altinn.App.Core.Tests/PublicApiTests.PublicApi_ShouldNotChange_Unintentionally.verified.txt

@@ -3170,7 +3170,7 @@ namespace Altinn.App.Core.Internal.Pdf
     public interface IPdfService
     {
         System.Threading.Tasks.Task GenerateAndStorePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, System.Threading.CancellationToken ct);
-        System.Threading.Tasks.Task GenerateAndStorePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, string? dataTypeId, string? fileNameTextResourceElementId, System.Collections.Generic.List<string>? autoGeneratePdfForTaskIds = null, System.Threading.CancellationToken ct = default);
+        System.Threading.Tasks.Task GenerateAndStorePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, string? fileNameTextResourceElementId, System.Collections.Generic.List<string>? autoGeneratePdfForTaskIds = null, System.Threading.CancellationToken ct = default);
         System.Threading.Tasks.Task<System.IO.Stream> GeneratePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, System.Threading.CancellationToken ct);
         System.Threading.Tasks.Task<System.IO.Stream> GeneratePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, bool isPreview, System.Threading.CancellationToken ct);
     }
@@ -3192,7 +3192,7 @@ namespace Altinn.App.Core.Internal.Pdf
     {
         public PdfService(Altinn.App.Core.Internal.App.IAppResources appResources, Altinn.App.Core.Internal.Data.IDataClient dataClient, Microsoft.AspNetCore.Http.IHttpContextAccessor httpContextAccessor, Altinn.App.Core.Internal.Pdf.IPdfGeneratorClient pdfGeneratorClient, Microsoft.Extensions.Options.IOptions<Altinn.App.Core.Internal.Pdf.PdfGeneratorSettings> pdfGeneratorSettings, Microsoft.Extensions.Options.IOptions<Altinn.App.Core.Configuration.GeneralSettings> generalSettings, Microsoft.Extensions.Logging.ILogger<Altinn.App.Core.Internal.Pdf.PdfService> logger, Altinn.App.Core.Features.Auth.IAuthenticationContext authenticationContext, Altinn.App.Core.Features.Telemetry? telemetry = null) { }
         public System.Threading.Tasks.Task GenerateAndStorePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, System.Threading.CancellationToken ct) { }
-        public System.Threading.Tasks.Task GenerateAndStorePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, string? dataTypeId, string? fileNameTextResourceElementId, System.Collections.Generic.List<string>? autoGeneratePdfForTaskIds = null, System.Threading.CancellationToken ct = default) { }
+        public System.Threading.Tasks.Task GenerateAndStorePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, string? fileNameTextResourceElementId, System.Collections.Generic.List<string>? autoGeneratePdfForTaskIds = null, System.Threading.CancellationToken ct = default) { }
         public System.Threading.Tasks.Task<System.IO.Stream> GeneratePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, System.Threading.CancellationToken ct) { }
         public System.Threading.Tasks.Task<System.IO.Stream> GeneratePdf(Altinn.Platform.Storage.Interface.Models.Instance instance, string taskId, bool isPreview, System.Threading.CancellationToken ct) { }
     }
@@ -3309,8 +3309,6 @@ namespace Altinn.App.Core.Internal.Process.Elements.AltinnExtensionProperties
         [System.Xml.Serialization.XmlArray(ElementName="autoPdfTaskIds", IsNullable=true, Namespace="http://altinn.no/process")]
         [System.Xml.Serialization.XmlArrayItem(ElementName="taskId", Namespace="http://altinn.no/process")]
         public System.Collections.Generic.List<string>? AutoPdfTaskIds { get; set; }
-        [System.Xml.Serialization.XmlElement("dataTypeId", Namespace="http://altinn.no/process")]
-        public string? DataTypeId { get; set; }
         [System.Xml.Serialization.XmlElement("filename", Namespace="http://altinn.no/process")]
         public string? Filename { get; set; }
     }