#2147 add download informations to general metadata

Author: DavidBlaa

Components/IO/BExIS.Io/IoHelper.cs

@@ -44,6 +44,8 @@ public static string GetFileName(FileType type, long datasetId, int versionNr, l
 
             string downloadTitle = title.Replace(" ", "");
 
+            // tag vs version?
+
             switch (type)
             {
                 case FileType.Metadata:
@@ -71,7 +73,7 @@ public static string GetFileName(FileType type, long datasetId, int versionNr, l
                     downloadName = string.Format("{0}_{1}_v{2}_{3}_{4}", appName, datasetId, versionNr, downloadTitle, downloadDate);
                     break;
                 case FileType.Manifest:
-                    downloadName = string.Format("{0}_{1}_v{2}_general-metadata", appName, datasetId, versionNr);
+                    downloadName = string.Format("{0}_{1}_v{2}_general_metadata", appName, datasetId, versionNr);
                     break;
                 default:
                     downloadName = string.Format("{0}_{1}_v{2}_{3}", appName, datasetId, versionNr, title);

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/BExIS.Modules.Dim.UI.csproj

@@ -515,6 +515,7 @@
     <Compile Include="Models\DataCiteDOIModels.cs" />
     <Compile Include="Models\DatasetModel.cs" />
     <Compile Include="Models\DatasetVersionModel.cs" />
+    <Compile Include="Models\Download\GeneralMetadataModel.cs" />
     <Compile Include="Models\GbifModels.cs" />
     <Compile Include="Models\Export\SimpleDataStructureModel.cs" />
     <Compile Include="Models\Mapping\LinkElementModels.cs" />

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Controllers/ExportController.cs

@@ -14,6 +14,7 @@
 using BExIS.IO.Transform.Output;
 using BExIS.Modules.Dim.UI.Helpers;
 using BExIS.Modules.Dim.UI.Models.Api;
+using BExIS.Modules.Dim.UI.Models.Download;
 using BExIS.Modules.Dim.UI.Models.Export;
 using BExIS.Security.Entities.Subjects;
 using BExIS.Security.Entities.Versions;
@@ -25,6 +26,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Data;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -323,14 +325,22 @@ public ActionResult GenerateZip(long id, long versionid, string format)
                         // manifest
                         ApiDatasetHelper apiDatasetHelper = new ApiDatasetHelper();
                         // get content
-                        ApiDatasetModel datasetModel = apiDatasetHelper.GetContent(datasetVersion, id, datasetVersionNumber, datasetVersion.Dataset.MetadataStructure.Id, dataStructureId);
+                        ApiDatasetModel apimodel = apiDatasetHelper.GetContent(datasetVersion, id, datasetVersionNumber, datasetVersion.Dataset.MetadataStructure.Id, dataStructureId);
+                        GeneralMetadataModel datasetModel = GeneralMetadataModel.Map(apimodel);
+
+                        datasetModel.DownloadInformation.DownloadDate = DateTime.Now.ToString(new CultureInfo("en-US"));
+                        datasetModel.DownloadInformation.DownloadSource = Request.Url.Host;
+                        datasetModel.DownloadInformation.DownloadedBy = getPartyNameOrDefault();
+
+                        if(datasetModel.DownloadInformation.DownloadedBy == "DEFAULT") datasetModel.DownloadInformation.DownloadedBy = "ANONYMOUS";
+
                         string manifest = JsonConvert.SerializeObject(datasetModel);
 
                         if (manifest != null)
                         {
                             string manifestFileName = IOHelper.GetFileName(FileType.Manifest, id, datasetVersionNumber, dataStructureId);
                             string manifestPath = OutputDatasetManager.GetDynamicDatasetStorePath(id,
-                                datasetVersionNumber, manifestFileName, ".json");
+                                datasetVersionNumber, "general_metadata", ".json");
                             string fullFilePath = Path.Combine(AppConfiguration.DataPath, manifestPath);
                             string directory = Path.GetDirectoryName(fullFilePath);
                             if (!Directory.Exists(directory))

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Helpers/ApiDatasetHelper.cs

@@ -29,10 +29,7 @@ public ApiDatasetModel GetContent(DatasetVersion datasetVersion, long id, int ve
                 Id = id,
                 Version = versionNumber,
                 VersionId = datasetVersion.Id,
-                VersionName = datasetVersion.VersionName,
                 VersionDate = datasetVersion.Timestamp.ToString(new CultureInfo("en-US")),
-                VersionPublicAccess = datasetVersion.PublicAccess,
-                VersionPublicAccessDate = datasetVersion.PublicAccessDate.ToString(new CultureInfo("en-US")),
                 Title = datasetVersion.Title,
                 Description = datasetVersion.Description,
                 DataStructureId = dataStructureId,

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Models/API/ApiModels.cs

@@ -37,9 +37,9 @@ public class ApiDatasetModel
         public long MetadataStructureId { get; set; }
         public bool IsPublic { get; set; }
         public string PublicationDate { get; set; }
-        public string VersionName { get; set; }
-        public bool VersionPublicAccess { get; set; }
-        public string VersionPublicAccessDate { get; set; }
+        //public string VersionName { get; set; }
+        //public bool VersionPublicAccess { get; set; }
+        //public string VersionPublicAccessDate { get; set; }
         public Dictionary<string, string> AdditionalInformations { get; set; }
         public Dictionary<string, Dictionary<string, string>> Parties { get; set; }
         public string VersionDate { get; set; }

Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Models/Download/GeneralMetadataModel.cs

@@ -0,0 +1,58 @@
+using BExIS.Modules.Dim.UI.Models.Api;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Web;
+
+namespace BExIS.Modules.Dim.UI.Models.Download
+{
+    public class GeneralMetadataModel : ApiDatasetModel
+    {
+        //public ApiDatasetModel Dataset { get; set; }
+        public DatasetDownloadInfoModel DownloadInformation { get; set; }
+
+        public GeneralMetadataModel() : base()
+        {
+            DownloadInformation = new DatasetDownloadInfoModel();
+        }
+
+        public static GeneralMetadataModel Map(ApiDatasetModel source)
+        {
+            GeneralMetadataModel target = new GeneralMetadataModel();
+
+            // 1. Hole alle öffentlichen Instanz-Eigenschaften des Quell-Typs
+            PropertyInfo[] sourceProperties = typeof(ApiDatasetModel).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+
+            // 2. Durchlaufe die Eigenschaften in einer Schleife
+            foreach (PropertyInfo sourceProperty in sourceProperties)
+            {
+                // 3. Suche die entsprechende Eigenschaft im Ziel-Typ
+                PropertyInfo targetProperty = typeof(GeneralMetadataModel).GetProperty(sourceProperty.Name);
+
+                // 4. Überprüfe, ob die Eigenschaft existiert und gesetzt werden kann
+                if (targetProperty != null && targetProperty.CanWrite)
+                {
+                    // 5. Überprüfe, ob die Typen übereinstimmen (empfohlen)
+                    if (targetProperty.PropertyType == sourceProperty.PropertyType)
+                    {
+                        // 6. Lese den Wert aus der Quelle
+                        object value = sourceProperty.GetValue(source);
+
+                        // 7. Setze den Wert im Ziel
+                        targetProperty.SetValue(target, value);
+                    }
+                }
+            }
+
+            return target;
+        }
+    }
+
+    public class DatasetDownloadInfoModel
+    {
+        public string DownloadSource { get; set; }
+        public string DownloadDate { get; set; }
+        public string DownloadedBy { get; set; }
+    }
+}