Merge pull request #3389 from Ginger-Automation/Enhancement/LiteDBUpg…

…rade Enhancement/lite db upgrade
Ginger-Automation · Jan 9, 2024 · 673bfbb · 673bfbb
2 parents ed2fb3a + e1566e9
commit 673bfbb
Show file tree

Hide file tree

Showing 17 changed files with 776 additions and 795 deletions.
diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs b/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs
diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
@@ -665,7 +665,7 @@
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="Gherkin" Version="5.1.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
-    <PackageReference Include="LiteDB" Version="4.1.4" />
+    <PackageReference Include="LiteDB" Version="5.0.17" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
     <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="11.1.1" />

diff --git a/Ginger/Ginger/Run/RunSetsExecutionsHistoryPage.xaml.cs b/Ginger/Ginger/Run/RunSetsExecutionsHistoryPage.xaml.cs
@@ -253,8 +253,7 @@ private void DeleteExecutionReports(System.Collections.IList runSetReports)
                 {
                     LiteDbManager dbManager = new LiteDbManager(executionLoggerHelper.GetLoggerDirectory(WorkSpace.Instance.Solution.LoggerConfigurations.CalculatedLoggerFolder));
                     var result = dbManager.GetRunSetLiteData();
-                    List<LiteDbRunSet> filterData = null;
-                    filterData = result.IncludeAll().Find(a => a._id.ToString() == runSetReport.GUID).ToList();
+                    List<LiteDbRunSet> filterData = LiteDbRunSet.IncludeAllReferences(result).Find(a => a._id.Equals(new LiteDB.ObjectId(runSetReport.GUID))).ToList();
 
                     LiteDbConnector dbConnector = new LiteDbConnector(Path.Combine(mRunSetExecsRootFolder, "GingerExecutionResults.db"));
                     dbConnector.DeleteDocumentByLiteDbRunSet(filterData[0]);

diff --git a/Ginger/Ginger/RunSetPageLib/RunnerPage.xaml.cs b/Ginger/Ginger/RunSetPageLib/RunnerPage.xaml.cs
@@ -433,7 +433,7 @@ private void GenerateBFReport(BusinessFlow bf)
                 LiteDbManager dbManager = new LiteDbManager(WorkSpace.Instance.Solution.SolutionOperations.ConvertSolutionRelativePath(WorkSpace.Instance.Solution.LoggerConfigurations.CalculatedLoggerFolder));
                 var result = dbManager.GetRunSetLiteData();
 
-                List<LiteDbRunSet> filterData = dbManager.FilterCollection(result, Query.All());
+                List<LiteDbRunSet> filterData = dbManager.FilterCollection<LiteDbRunSet>(LiteDbRunSet.IncludeAllReferences(result), Query.All());
 
                 LiteDbRunSet runSetLast = filterData.Last();
                 //runSetLast._id = new ObjectId();
@@ -466,7 +466,7 @@ private void GenerateBFReport(BusinessFlow bf)
             }
             catch (Exception ex)
             {
-
+                Reporter.ToLog(eLogLevel.ERROR, "Failed to generate business flow report", ex);
             }
         }
 

diff --git a/Ginger/GingerCoreCommon/GingerCoreCommon.csproj b/Ginger/GingerCoreCommon/GingerCoreCommon.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <PackageReference Include="Ginger.External" Version="1.0.0" />
-    <PackageReference Include="LiteDB" Version="4.1.4" />
+    <PackageReference Include="LiteDB" Version="5.0.17" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="3.7.0" />    
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.7.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />

diff --git a/Ginger/GingerCoreNET/DataSource/ActDSTableElement.cs b/Ginger/GingerCoreNET/DataSource/ActDSTableElement.cs
@@ -18,13 +18,11 @@ limitations under the License.
 
 using amdocs.ginger.GingerCoreNET;
 using Amdocs.Ginger.Common;
-using Amdocs.Ginger.Common.Enums;
 using Amdocs.Ginger.Common.InterfacesLib;
 using Amdocs.Ginger.CoreNET.DataSource;
 using Amdocs.Ginger.Repository;
 using GingerCore.DataSource;
 using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
-using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -86,6 +84,16 @@ public override void Execute()
             if (DataSource.DSType == DataSourceBase.eDSType.LiteDataBase)
             {
                 GingerCoreNET.DataSource.GingerLiteDB liteDB = new GingerCoreNET.DataSource.GingerLiteDB();
+                string value = GetInputParamValue("Value");
+                if (!string.IsNullOrEmpty(value))
+                {
+                    ValueExpression mValueExpression = new(WorkSpace.Instance.RunsetExecutor.RunsetExecutionEnvironment, RunOnBusinessFlow, WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<DataSourceBase>());
+                    mValueExpression.Value = value;
+                    ValueUC = mValueExpression.ValueCalculated;
+                }
+
+                LiteDBSQLTranslator liteDBSQLTranslator = new (this);
+                this.ValueExp = liteDBSQLTranslator.CreateValueExpression();
                 string Query = ValueExp.Substring(ValueExp.IndexOf("QUERY=") + 6, ValueExp.Length - (ValueExp.IndexOf("QUERY=") + 7));
                 liteDB.FileFullPath = WorkSpace.Instance.Solution.SolutionOperations.ConvertSolutionRelativePath(DataSource.FileFullPath);
 
@@ -281,6 +289,24 @@ public override void Execute()
 
         }
 
+
+        private string mKeyName;
+        [IsSerializedForLocalRepository]
+        public string KeyName
+        {
+            get 
+            {
+                return mKeyName; 
+            }
+            set
+            {
+                if(!string.Equals(mKeyName , value))
+                {
+                    mKeyName = value;
+                    OnPropertyChanged(nameof(KeyName));
+                }
+            }
+        }
         private eControlAction mControlAction;
         [IsSerializedForLocalRepository]
         public eControlAction ControlAction