Resolves #35

humlab-sead · Oct 25, 2019 · 503f1ec · 503f1ec
1 parent f70d4d0
commit 503f1ec
Show file tree

Hide file tree

Showing 8 changed files with 302 additions and 86 deletions.
diff --git a/sead.query.core/Model/Entities/FacetTable.cs b/sead.query.core/Model/Entities/FacetTable.cs
@@ -22,5 +22,9 @@ public class FacetTable {
 
         [JsonIgnore]
         public virtual Facet Facet { get; set; }
+
+        [JsonIgnore]
+        public string AliasOrObjectName => Alias ?? ObjectName;
+
     }
 }
diff --git a/sead.query.core/QueryBuilder/QuerySetupCompiler.cs b/sead.query.core/QueryBuilder/QuerySetupCompiler.cs
@@ -127,13 +127,13 @@ protected List<string> GetInvolvedTables(Facet targetFacet, List<string> extraTa
 
                 // ...target facet's tables...
                 .Concat(
-                    targetFacet.ExtraTables.Select(z => z.ObjectName)
+                    targetFacet.Tables.Select(z => z.ObjectName)
                 )
 
                 // ...tables from affected facets...
                 .Concat(
                     // FIXME: Shouldn't all tables be added???
-                    affectedConfigs.SelectMany(c => c.Facet.ExtraTables.Select(z => z.ObjectName).ToList())
+                    affectedConfigs.SelectMany(c => c.Facet.Tables.Select(z => z.ObjectName).ToList())
                 );
 
             return tables.Distinct().ToList();

diff --git a/sead.query.infra/Repository/FacetRepository.cs b/sead.query.infra/Repository/FacetRepository.cs
@@ -52,6 +52,7 @@ public Facet GetByCode(string facetCode)
 
         public IEnumerable<Facet> FindThoseWithAlias()
         {
+            // FIXME Only check first table?
             return GetAll().Where(p => p.Tables.Any(c => !c.Alias.Equals("")));
         }
 

diff --git a/sead.query.test/Model/FacetsGraph/FacetsGraphTests.cs b/sead.query.test/Model/FacetsGraph/FacetsGraphTests.cs
@@ -13,9 +13,6 @@
 
 namespace SeadQueryTest.Model
 {
-
-
-
     public class FacetsGraphTests : IDisposable
     {
         public void Dispose()

diff --git a/...uery.test/RequestsRFC2616/facet_load_tbl_denormalized_measured_values_33_0.rest b/...uery.test/RequestsRFC2616/facet_load_tbl_denormalized_measured_values_33_0.rest
@@ -0,0 +1,200 @@
+### Single load/tbl_denormalized_measured_values_33_0
+POST https://seadserv.humlab.umu.se:8089/api/facets/load
+content-type: application/json
+mode: cors
+accept: application/json
+
+{
+    "requestId":1,
+    "requestType":"populate",
+    "targetCode":"tbl_denormalized_measured_values_33_0",
+    "triggerCode":"tbl_denormalized_measured_values_33_0",
+    "facetConfigs":[ {
+        "facetCode":"tbl_denormalized_measured_values_33_0",
+        "position":1,
+        "picks":[],
+        "textFilter":""
+    }
+    ]
+}
+
+### Single load/tbl_denormalized_measured_values_32
+POST http://localhost:53053/api/facets/load
+content-type: application/json
+mode: cors
+accept: application/json
+
+{
+    "requestId":1,
+    "requestType":"populate",
+    "targetCode":"tbl_denormalized_measured_values_32",
+    "triggerCode":"tbl_denormalized_measured_values_32",
+    "facetConfigs":[ {
+        "facetCode":"tbl_denormalized_measured_values_32",
+        "position":1,
+        "picks":[
+            { "pickType": 2, "pickValue": "50", "text": "50"},
+            { "pickType": 3, "pickValue": "100", "text": "100"}
+        ],
+        "textFilter":""
+    }
+    ]
+}
+
+### Single load/tbl_denormalized_measured_values_33_0
+POST http://localhost:53053/api/facets/load
+content-type: application/json
+mode: cors
+accept: application/json
+
+{
+    "requestId":1,
+    "requestType":"populate",
+    "targetCode":"tbl_denormalized_measured_values_33_0",
+    "triggerCode":"tbl_denormalized_measured_values_33_0",
+    "facetConfigs":[ {
+        "facetCode":"tbl_denormalized_measured_values_33_0",
+        "position":1,
+        "picks":[],
+        "textFilter":""
+    }
+    ]
+}
+
+### Single load/site
+POST https://seadserv.humlab.umu.se:8089/api/facets/load
+content-type: application/json
+mode: cors
+accept: application/json
+
+{
+    "RequestId":1,
+    "RequestType":"populate",
+    "TargetCode":"sites",
+    "FacetConfigs":[ {
+        "FacetCode":"sites",
+        "Position":1,
+        "Picks":[],
+        "TextFilter":""
+    }]
+}
+
+### Issue with Country filter
+
+POST http://localhost:53053/api/result/load
+Sec-Fetch-Mode: cors
+mode: cors
+Accept: application/json, text/javascript, /; q=0.01
+Content-Type: application/json; charset=UTF-8
+
+{
+    "facetsConfig": {
+        "requestId":2,
+        "requestType":"populate",
+        "targetCode":"country",
+        "triggerCode":"country",
+        "facetConfigs":[
+            {
+                "facetCode":"country",
+                "position":1,
+                "picks":[
+                    {
+                        "pickType":1,
+                        "pickValue":64,
+                        "text":64
+                    }
+                ],
+                "textFilter":""
+            }
+        ]
+    },
+    "resultConfig": {
+        "requestId":2,
+        "sessionId":"1",
+        "viewTypeId":"map",
+        "aggregateKeys":["site_level"]
+    }
+}
+
+### Sample group filter error #35
+POST http://localhost:53053/api/result/load
+Sec-Fetch-Mode: cors
+mode: cors
+Accept: application/json, text/javascript, */*; q=0.01
+Content-Type: application/json; charset=UTF-8
+
+{
+	"facetsConfig": {
+		"requestId":4,
+		"requestType":"populate",
+		"targetCode":"sample_groups",
+		"triggerCode":"sample_groups",
+		"facetConfigs":[{
+			"facetCode":"sample_groups",
+			"position":1,
+			"picks":[{
+				"pickType":1,
+				"pickValue":510,
+				"text":510}],
+				"textFilter":""
+			}
+	]},
+	"resultConfig":{
+		"requestId":4,
+		"sessionId":"1",
+		"viewTypeId":"map",
+		"aggregateKeys":["site_level"]
+	}
+}
+
+### To few records...?
+POST http://localhost:53053/api/result/load
+Sec-Fetch-Mode: cors
+mode: cors
+Accept: application/json, text/javascript, */*; q=0.01
+Content-Type: application/json; charset=UTF-8
+
+{
+  "requestId": 1,
+  "requestType": "populate",
+  "targetCode": "tbl_denormalized_measured_values_33_0",
+  "facetConfigs": [
+    {
+      "facetCode": "tbl_denormalized_measured_values_33_0",
+      "position": 1,
+      "picks": [
+      ],
+      "textFilter": ""
+    }
+  ]
+}
+
+### Issue with sample groups
+#POST http://localhost:53053/api/result/load
+POST https://seadserv.humlab.umu.se:8089/api/result/load
+Sec-Fetch-Mode: cors
+mode: cors
+Accept: application/json, text/javascript, */*; q=0.01
+Content-Type: application/json; charset=UTF-8
+
+{
+	"facetsConfig": {
+		"requestId":4,
+		"requestType":"populate",
+		"targetCode":"sample_groups",
+		"triggerCode":"sample_groups",
+		"facetConfigs":[
+			{
+				"facetCode":"sample_groups",
+				"position":1,
+				"picks":[
+					{"pickType":1,"pickValue":510,"text":510}],"textFilter":""}
+				]
+			},
+	"resultConfig":{
+		"requestId":4,
+		"sessionId":"1",
+		"viewTypeId":"map",
+		"aggregateKeys":["site_level"]
+	}
+}
diff --git a/...ry.test/requests_RFC_2616/facet_load_tbl_denormalized_measured_values_33_0.rest b/...ry.test/requests_RFC_2616/facet_load_tbl_denormalized_measured_values_33_0.rest
diff --git a/setup/database/UDF_bugg_29.sql b/setup/database/UDF_bugg_29.sql
@@ -0,0 +1,3 @@
+SELECT  MIN(method_values.measured_value) AS lower,
+        MAX(method_values.measured_value) AS upper
+FROM facet.method_measured_values(33, 0)