#2238 download filtered data in package

Author: DavidBlaa

Console/BExIS.Web.Shell/Areas/DDM/BExIS.Modules.Ddm.UI/Controllers/DataController.cs

@@ -110,6 +110,8 @@ public ActionResult Show(long id, long version = 0)
             //get the researchobject (cuurently called dataset) to get the id of a metadata structure
             Dataset researcobject = this.GetUnitOfWork().GetReadOnlyRepository<Dataset>().Get(id);
 
+            
+
             if (researcobject != null)
             {
                 long metadataStrutcureId = researcobject.MetadataStructure.Id;
@@ -173,6 +175,10 @@ public ActionResult ShowData(long id, int version = 0, bool asPartial = false, s
                 ViewData["has_data"] = false;
                 ViewData["data_aggreement"] = moduleSettings.GetValueByKey("data_aggreement");
                 Session["Filter"] = null;
+                // reset sessions
+                Session["DataFilter"] = null;
+                Session["DataOrderBy"] = null;
+                Session["DataProjection"] = null;
 
                 Dataset researcobject = dm.GetDataset(id);
 
@@ -864,6 +870,13 @@ public ActionResult _CustomPrimaryDataBinding(GridCommand command, string column
 
                         FilterExpression filter = TelerikGridHelper.Convert(command.FilterDescriptors.ToList());
                         OrderByExpression orderBy = TelerikGridHelper.Convert(command.SortDescriptors.ToList());
+                        ProjectionExpression projection = null; 
+                        if(!string.IsNullOrEmpty(columns)) projection = TelerikGridHelper.Convert(columns.Replace("ID", "").Split(','));
+
+                        Session["DataFilter"] = filter;
+                        Session["DataOrderBy"] = orderBy;
+                        Session["DataProjection"] = projection;
+
 
                         table = dm.GetLatestDatasetVersionTuples(datasetId, filter, orderBy, null, "", command.Page - 1, command.PageSize);
                         ViewData["gridTotal"] = dm.RowCount(datasetId, filter);
@@ -1423,6 +1436,7 @@ private DataTable getFilteredData(long datasetId)
 
                 ProjectionExpression projection = TelerikGridHelper.Convert(columns);
 
+
                 long count = datasetManager.RowCount(datasetId, filter);
 
                 DataTable table = datasetManager.GetLatestDatasetVersionTuples(datasetId, filter, orderBy, projection, "", 0, (int)count);

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

@@ -19,9 +19,11 @@
 using BExIS.Security.Entities.Subjects;
 using BExIS.Security.Entities.Versions;
 using BExIS.Security.Services.Utilities;
+using BExIS.UI.Helpers;
 using BExIS.Utils.Config;
 using BExIS.Utils.Extensions;
 using BExIS.Utils.Models;
+using BExIS.Utils.NH.Querying;
 using BExIS.Xml.Helpers;
 using Newtonsoft.Json;
 using System;
@@ -35,6 +37,8 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Xml;
+using Telerik.Web.Mvc;
+using Vaelastrasz.Library.Models;
 using Vaiona.Logging;
 using Vaiona.Persistence.Api;
 using Vaiona.Utils.Cfg;
@@ -196,6 +200,9 @@ public ActionResult GenerateZip(long id, long versionid, string format)
             PublicationManager publicationManager = new PublicationManager();
             SubmissionManager publishingManager = new SubmissionManager();
 
+            bool isFilterInUse = filterInUse();
+            string filteredFilePath = "";
+
             string brokerName = "generic";
 
             try
@@ -220,6 +227,8 @@ public ActionResult GenerateZip(long id, long versionid, string format)
 
                     #region primary data
 
+
+
                     // check the data sturcture type ...
                     if (format != null && datasetVersion.Dataset.DataStructure.Self is StructuredDataStructure && dm.GetDataTuplesCount(datasetVersion.Id) > 0)
                     {
@@ -228,19 +237,28 @@ public ActionResult GenerateZip(long id, long versionid, string format)
                         //check wheter title is empty or not
                         title = String.IsNullOrEmpty(datasetVersion.Title) ? "no title available" : datasetVersion.Title;
 
-                        switch (format)
+                        if (isFilterInUse)
+                        {
+                            DataTable filteredData = getFilteredData(id);
+                            filteredFilePath = odm.GenerateAsciiFile("temp", filteredData, title, format, datasetVersion.Dataset.DataStructure.Id, false);
+                        }
+                        else
                         {
-                            case "application/xlsx":
-                                odm.GenerateExcelFile(id, datasetVersion.Id, false);
-                                break;
 
-                            case "application/xlsm":
-                                odm.GenerateExcelFile(id, datasetVersion.Id, true);
-                                break;
+                            switch (format)
+                            {
+                                case "application/xlsx":
+                                    odm.GenerateExcelFile(id, datasetVersion.Id, false);
+                                    break;
 
-                            default:
-                                odm.GenerateAsciiFile(id, datasetVersion.Id, format, false);
-                                break;
+                                case "application/xlsm":
+                                    odm.GenerateExcelFile(id, datasetVersion.Id, true);
+                                    break;
+
+                                default:
+                                    odm.GenerateAsciiFile(id, datasetVersion.Id, format, false);
+                                    break;
+                            }
                         }
                     }
 
@@ -272,6 +290,9 @@ public ActionResult GenerateZip(long id, long versionid, string format)
                     #region zip file
 
                     string zipName = IOHelper.GetFileName(FileType.Bundle, id, datasetVersionNumber, dataStructureId, title); //publishingManager.GetZipFileName(id, datasetVersionNumber);
+                    // add suffix if filter is in use
+                    if (isFilterInUse) zipName += "_filtered";
+
                     string zipPath = Path.Combine(publishingManager.GetDirectoryPath(id, brokerName), zipName+".zip");
                     FileHelper.CreateDicrectoriesIfNotExist(Path.GetDirectoryName(zipPath));
 
@@ -316,6 +337,18 @@ public ActionResult GenerateZip(long id, long versionid, string format)
                             }
                         }
 
+                        // if data was filtered add a text file with information about filtering
+                        if (isFilterInUse)
+                        {
+                            string path = Path.Combine(AppConfiguration.DataPath, filteredFilePath);
+                            string ext = Path.GetExtension(filteredFilePath).ToLower();
+                            string name = IOHelper.GetFileName(FileType.PrimaryData, id, datasetVersionNumber, dataStructureId)+"filtered"+ ext;
+
+                            archive.AddFileToArchive(filteredFilePath, name);
+                        }
+
+
+
                         // xml schema
                         string xsdPath = OutputMetadataManager.GetSchemaDirectoryPath(id);
                         if (Directory.Exists(xsdPath))
@@ -332,6 +365,10 @@ public ActionResult GenerateZip(long id, long versionid, string format)
                         datasetModel.DownloadInformation.DownloadSource = Request.Url.Host;
                         datasetModel.DownloadInformation.DownloadedBy = getPartyNameOrDefault();
 
+                        // set filter info 
+                        if(isFilterInUse)
+                            datasetModel.DownloadInformation.DownloadedFilter = getFilterQuery();
+
                         if(datasetModel.DownloadInformation.DownloadedBy == "DEFAULT") datasetModel.DownloadInformation.DownloadedBy = "ANONYMOUS";
 
                         string manifest = JsonConvert.SerializeObject(datasetModel);
@@ -572,5 +609,62 @@ private string getPartyNameOrDefault()
             }
             return !string.IsNullOrWhiteSpace(userName) ? userName : "DEFAULT";
         }
+
+        private bool filterInUse()
+        {
+            if (Session["DataFilter"] != null || Session["DataOrderBy"] != null || Session["DataProjection"] != null )
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private DataTable getFilteredData(long datasetId)
+        {
+            DatasetManager datasetManager = new DatasetManager();
+            try
+            {
+                GridCommand command = null;
+                FilterExpression filter = null;
+                OrderByExpression orderBy = null;
+                ProjectionExpression projection = null;
+                string[] columns = null;
+
+                if (Session["DataFilter"] != null) filter  = (FilterExpression)Session["DataFilter"];
+                if (Session["DataOrderBy"] != null) orderBy = (OrderByExpression)Session["DataOrderBy"];
+                if (Session["DataProjection"] != null) projection = (ProjectionExpression)Session["DataProjection"];
+
+
+                long count = datasetManager.RowCount(datasetId, filter);
+
+                DataTable table = datasetManager.GetLatestDatasetVersionTuples(datasetId, filter, orderBy, projection, "", 0, (int)count);
+
+                if (projection == null) table.Strip();
+
+                return table;
+            }
+            finally
+            {
+                datasetManager.Dispose();
+            }
+        }
+
+        private string getFilterQuery()
+        {
+            FilterExpression filter = null;
+            OrderByExpression orderBy = null;
+            ProjectionExpression projection = null;
+            string[] columns = null;
+
+            if (Session["DataFilter"] != null) filter = (FilterExpression)Session["DataFilter"];
+            if (Session["DataOrderBy"] != null) orderBy = (OrderByExpression)Session["DataOrderBy"];
+            if (Session["DataProjection"] != null) projection = (ProjectionExpression)Session["DataProjection"];
+
+            string query = filter?.ToSQL() + orderBy?.ToSQL() + projection?.ToSQL();
+
+            return query;
+        }
+
     }
 }

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

@@ -54,5 +54,6 @@ public class DatasetDownloadInfoModel
         public string DownloadSource { get; set; }
         public string DownloadDate { get; set; }
         public string DownloadedBy { get; set; }
+        public string DownloadedFilter { get; set; }
     }
 }