From 1a773e60413843068fea005947384fe42536c60f Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 11 Dec 2018 22:25:00 +0000
Subject: [PATCH]

---
 server/AyaNova/Startup.cs                      | 4 ++--
 server/AyaNova/biz/FilterSqlCriteriaBuilder.cs | 6 +++---
 test/raven-integration/util.cs                 | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs
index 5bdeb77a..5fdfa3cd 100644
--- a/server/AyaNova/Startup.cs
+++ b/server/AyaNova/Startup.cs
@@ -380,7 +380,7 @@ namespace AyaNova
             // ******************** TESTING WIPE DB *****************************
             //
             //Set this to true to wipe the db and reinstall a trial license and re-seed the data
-            var TESTING_REFRESH_DB = true;//#############################################################################################
+            var TESTING_REFRESH_DB = false;//#############################################################################################
 
 #if (DEBUG)
             //TESTING
@@ -419,7 +419,7 @@ namespace AyaNova
             if (TESTING_REFRESH_DB)
             {
                 AyaNova.Core.License.Fetch(apiServerState, dbContext, _log);
-                Util.Seeder.SeedDatabase(Util.Seeder.SeedLevel.SmallOneManShopTrialDataSet, -8);//#############################################################################################
+                Util.Seeder.SeedDatabase(Util.Seeder.SeedLevel.HugeForLoadTest, -8);//#############################################################################################
             }
             //TESTING
 #endif
diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
index 5ba16e06..35b4d60c 100644
--- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
+++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
@@ -40,15 +40,15 @@ namespace AyaNova.Biz
                 }
 
                 var dataType = filterOptions.Flds.Find(x => x.Fld == fld).Type;
-
+                sb.Append("(");
                 sb.Append(DataFilterToColumnCriteria(fld, dataType, opType, val, tagList, userId));
                 if (i < FilterArray.Count - 1)
                 {
-                    sb.Append(" AND ");
+                    sb.Append(") AND ");
                 }
             }
 
-            return " where " + sb.ToString();
+            return " where " + sb.ToString() + ")";
         }
 
         /// <summary>
diff --git a/test/raven-integration/util.cs b/test/raven-integration/util.cs
index 32ffafd7..1c3a04e1 100644
--- a/test/raven-integration/util.cs
+++ b/test/raven-integration/util.cs
@@ -12,8 +12,8 @@ namespace raven_integration
     {
         private static HttpClient client { get; } = new HttpClient();
 
-        // private static string API_BASE_URL = "http://localhost:7575/api/v8.0/";
-        private static string API_BASE_URL = "https://test.helloayanova.com/api/v8.0/";
+        private static string API_BASE_URL = "http://localhost:7575/api/v8.0/";
+        //private static string API_BASE_URL = "https://test.helloayanova.com/api/v8.0/";
 
         public static string TEST_DATA_FOLDER = @"..\..\..\testdata\";