zugferdrestapi: Fix missing properties

Modules.Interfaces/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>

Modules.Interfaces/ZUGFeRDInterface.vb

@@ -67,6 +67,16 @@ Public Class ZUGFeRDInterface
         Return SerializeZUGFeRDDocument(oXmlDocument)
     End Function
 
+    Public Function ExtractZUGFeRDFileWithGDPicture(Stream As Stream) As CrossIndustryDocumentType
+        Dim oXmlDocument = ValidateZUGFeRDFileWithGDPicture(Stream)
+
+        If IsNothing(oXmlDocument) Then
+            Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
+        End If
+
+        Return SerializeZUGFeRDDocument(oXmlDocument)
+    End Function
+
     Public Function ValidateZUGFeRDFile(Path As String) As XPathDocument
         Dim oProcessOutput, oProcessError As String
         Dim oXmlDocument As XPathDocument
@@ -111,26 +121,47 @@ Public Class ZUGFeRDInterface
         Return oXmlDocument
     End Function
 
+    Public Function ValidateZUGFeRDFileWithGDPicture(Stream As Stream) As XPathDocument
+        Dim oAttachmentExtractor = New PDFAttachments(_logConfig)
+        Dim oAllowedExtensions = New List(Of String) From {"xml"}
+
+        Try
+            Dim oResults = oAttachmentExtractor.Extract(Stream, oAllowedExtensions)
+            Return HandleAttachments(oResults)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
     Public Function ValidateZUGFeRDFileWithGDPicture(Path As String) As XPathDocument
         Dim oAttachmentExtractor = New PDFAttachments(_logConfig)
         Dim oAllowedExtensions = New List(Of String) From {"xml"}
-        Dim oXmlDocument As XPathDocument
 
         Try
             Dim oResults = oAttachmentExtractor.Extract(Path, oAllowedExtensions)
+            Return HandleAttachments(oResults)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
 
-            If oResults Is Nothing Then
+    Private Function HandleAttachments(Results As List(Of PDFAttachments.AttachmentResult)) As XPathDocument
+        Dim oXmlDocument As XPathDocument
+
+        If Results Is Nothing Then
             Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
         End If
 
-            If oResults.Count = 0 Then
+        If Results.Count = 0 Then
             Throw New ZUGFeRDExecption(ErrorType.NoZugferd, "Datei ist keine ZUGFeRD Datei.")
         End If
 
         Dim oFound As Boolean = False
         Dim oFoundResult As PDFAttachments.AttachmentResult = Nothing
 
-            For Each oResult In oResults
+        For Each oResult In Results
             If oResult.FileName.ToUpper() = PDFAttachments.ZUGFERD_XML_FILENAME.ToUpper() Then
                 oFound = True
                 oFoundResult = oResult
@@ -151,10 +182,6 @@ Public Class ZUGFeRDInterface
             _logger.Error(ex)
             Throw ex
         End Try
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
     End Function
 
     Public Function SerializeZUGFeRDDocument(Document As XPathDocument) As CrossIndustryDocumentType

WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs

@@ -77,7 +77,7 @@ namespace ZUGFeRDRESTService.Controllers
         }
 
         /// <summary>
-        /// POST: /api/Validation
+        /// POST: /api/validation
         /// </summary>
         /// <param name="files">This parameter's name needs to correspond to the html form's file-input name</param>
         [HttpPost]
@@ -85,25 +85,16 @@ namespace ZUGFeRDRESTService.Controllers
         {
             _logger.Debug("Start processing request to ValidationController");      
 
-            string oFilePath = Path.Combine(Path.GetTempPath(), file.FileName);           
-
-            _logger.Debug("Saving file to temp-path [{0}]", oFilePath);
-
-            using FileStream oStream = new FileStream(oFilePath, FileMode.Create);
-            await file.CopyToAsync(oStream);
-
-            // TODO: Delete temp file / Do we even need the temp file?
-
-            _logger.Debug("File successfully saved!");
-
             CrossIndustryDocumentType oDocument;
             PropertyValues.CheckPropertyValuesResult oResult = new PropertyValues.CheckPropertyValuesResult();
 
             try
             {               
-                _logger.Debug("Extracting ZUGFeRD Data from file [{0}]", oFilePath);
+                using Stream oStream = file.OpenReadStream();
+                {
+                    _logger.Debug("Extracting ZUGFeRD Data from file [{0}]", file.FileName);
 
-                oDocument = _zugferd.ExtractZUGFeRDFileWithGDPicture(oFilePath);
+                    oDocument = _zugferd.ExtractZUGFeRDFileWithGDPicture(oStream);
 
                     _logger.Debug("Checking ZUGFeRD Data against the database");
 
@@ -112,7 +103,8 @@ namespace ZUGFeRDRESTService.Controllers
                     _logger.Debug("Result of checking against the database: {0} valid properties, {1} missing properties",
                         oResult.ValidProperties.Count, oResult.MissingProperties.Count);
 
-                if (oResult.MissingProperties.Count > 0) {
+                    if (oResult.MissingProperties.Count > 0)
+                    {
                         throw new ZUGFeRDExecption(ZUGFeRDInterface.ErrorType.MissingProperties,
                             "Die hochgeladene Datei ist eine gültige ZUGFeRD-Rechnung, allerdings fehlen benötigte Daten.");
                     }
@@ -126,6 +118,7 @@ namespace ZUGFeRDRESTService.Controllers
                         status = RESPONSE_OK,
                         message = oMessage
                     };
+                };
             }
             catch (ZUGFeRDExecption ex)
             {              
@@ -154,14 +147,15 @@ namespace ZUGFeRDRESTService.Controllers
                 return new ValidationResponse()
                 {
                     status = RESPONSE_ERROR,
-                    message = oMessage
+                    message = oMessage,
+                    errors = oErrors
                 };
             }
             catch (Exception ex)
             {
                 _logger.Error(ex);
 
-                string oMessage = "Die hochgeladene Datei kann nicht validiert werden!";
+                string oMessage = "Die hochgeladene Datei kann nicht validiert werden, weil ein unbekannter Fehler aufgetreten ist.";
 
                 _logger.Debug($"Replying with: [{oMessage}]");