Merge pull request #154 from dbpedia/dev

fixed sparql get request failing & sparql interface bug
dbpedia · Dec 20, 2023 · 6f89524 · 6f89524
2 parents 5ad99f0 + b6da4d9
commit 6f89524
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/public/css/_collections.scss b/public/css/_collections.scss
@@ -261,7 +261,7 @@
 .collection-editor-tabs {
   display: flex;
   margin-bottom: -1px;
-  margin-top: 2em;
+  padding-top: 2em;
 }
 
 .collection-editor-info-text {

diff --git a/public/css/website.css b/public/css/website.css
@@ -249,7 +249,7 @@
 .collection-editor-tabs {
   display: flex;
   margin-bottom: -1px;
-  margin-top: 2em;
+  padding-top: 2em;
 }
 
 .collection-editor-info-text {

diff --git a/server/app/api/routes/general.js b/server/app/api/routes/general.js
@@ -14,7 +14,7 @@ module.exports = function (router, protector, webdav) {
 
   router.get('/sparql', cors(), function (req, res, next) {
 
-    var query = req.body.query;
+    var query = req.query.query;
 
     if(query == undefined || query == "") {
       next('route');

diff --git a/server/app/test/methods/api/general-tests.js b/server/app/test/methods/api/general-tests.js
@@ -81,22 +81,22 @@ async function publishTest() {
 
     // ======== Publish invalid Dataid =======
     delete options.body;
-    try{
+    try {
         response = await rp(options);
         assert(false, 'should not be possible to publish non existent metadata')
-    } catch(err) {
+    } catch (err) {
         assert(err.response.statusCode == 400, 'empty metadata shoud not be publishibly.');
     }
 
-//     search doesnt work
-//     Error: connect ECONNREFUSED 127.0.0.1:8082
-//     at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1247:16) {
-//   errno: -111,
-//   code: 'ECONNREFUSED',
-//   syscall: 'connect',
-//   address: '127.0.0.1',
-//   port: 8082
-// }
+    //     search doesnt work
+    //     Error: connect ECONNREFUSED 127.0.0.1:8082
+    //     at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1247:16) {
+    //   errno: -111,
+    //   code: 'ECONNREFUSED',
+    //   syscall: 'connect',
+    //   address: '127.0.0.1',
+    //   port: 8082
+    // }
     // // ========= Search Tests ===========
     // // ========= Search existing Data ===========
     // options.method = "GET";
@@ -117,21 +117,30 @@ async function publishTest() {
     response = await rp(options);
     assert(response.statusCode == 204, `Could not delete version ${options.uri}.`);
 
-    // ======== send sparql request ===========
+    // ======== send sparql request POST ===========
     options.method = "POST";
     options.uri = `${process.env.DATABUS_RESOURCE_BASE_URL}/sparql`;
     options.body = { query: "select distinct * where {?a ?b ?c} LIMIT 2" }
 
     response = await rp(options);
     assert(response.statusCode == 200, 'fail')
 
+    // ======== send sparql request GET ===========
+    options.method = "GET";
+    options.uri = `${process.env.DATABUS_RESOURCE_BASE_URL}/sparql?query=select%20distinct%20%2A%20where%20%7B%3Fa%20%3Fb%20%3Fc%7D%20LIMIT%202`;
+
+    response = await rp(options);
+
+    assert(response.statusCode == 200, 'fail')
+
     // ========= send invalid sparql request =========
+    options.method = "POST";
     options.body = { query: "asd" }
-    
-    try{
+
+    try {
         await rp(options);
         assert(false, 'invalid sparql query shouldnt work.')
-    } catch(err) {
+    } catch (err) {
         assert(err.response.statusCode == 400, "invalid sparql query shouldnt work.")
     }