Skip to content

Commit

Permalink
SQTC issues fix, Junit Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdadil-dk
mdadil-dk committed Feb 12, 2021
1 parent 593f326 commit 1857af2
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 96 deletions.
6 changes: 5 additions & 1 deletion src/main/java/iudx/catalogue/server/apiserver/util/QueryMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static iudx.catalogue.server.util.Constants.*;
import static iudx.catalogue.server.apiserver.util.Constants.*;

/**
* QueryMapper class to convert NGSILD query into json object for the purpose of debugrmation
Expand Down Expand Up @@ -51,7 +52,10 @@ public static JsonObject map2Json(MultiMap queryParameters) {
for (Entry<String, String> entry : queryParameters.entries()) {

String paramValue = entry.getValue().replaceAll("^\"|\"$", "").trim();
if (!paramValue.startsWith("[") && !paramValue.endsWith("]")) {
if (paramValue != null && paramValue.isEmpty()) {
LOGGER.debug("Error: Invalid parameter value; key: " + entry.getKey());
return null;
} else if (!paramValue.startsWith("[") && !paramValue.endsWith("]")) {
if (!excepAttribute.contains(entry.getKey())) {
jsonBody.put(entry.getKey(), paramValue);
} else if (excepAttribute.contains(entry.getKey()) && !entry.getKey().equals("q")) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/iudx/catalogue/server/database/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class Constants {
static final String RESULT = "results";
static final String SHAPE_KEY = "shape";
static final String SIZE_KEY = "size";
static final int STATIC_DELAY_TIME = 3000;

/* Database */
static final String AGGREGATION_KEY = "aggs";
Expand Down
184 changes: 100 additions & 84 deletions src/main/java/iudx/catalogue/server/database/DatabaseServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
import io.vertx.core.json.JsonObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Timer;
import java.util.TimerTask;
import static iudx.catalogue.server.util.Constants.*;
import static iudx.catalogue.server.database.Constants.*;
import iudx.catalogue.server.nlpsearch.NLPSearchService;
Expand Down Expand Up @@ -247,17 +248,21 @@ public DatabaseService createItem(JsonObject doc, Handler<AsyncResult<JsonObject
});
} else {
/* Insert document */
client.docPostAsync(doc.toString(), postRes -> {
if (postRes.succeeded()) {
handler.handle(Future.succeededFuture(
respBuilder.withStatus(SUCCESS)
.withResult(id, INSERT, SUCCESS)
.getJsonResponse()));
} else {
handler.handle(Future.failedFuture(errorJson));
LOGGER.error("Fail: Insertion failed" + postRes.cause());
new Timer().schedule(new TimerTask() {
public void run() {
client.docPostAsync(doc.toString(), postRes -> {
if (postRes.succeeded()) {
handler.handle(Future.succeededFuture(
respBuilder.withStatus(SUCCESS)
.withResult(id, INSERT, SUCCESS)
.getJsonResponse()));
} else {
handler.handle(Future.failedFuture(errorJson));
LOGGER.error("Fail: Insertion failed" + postRes.cause());
}
});
}
});
}, STATIC_DELAY_TIME);
}
}
});
Expand Down Expand Up @@ -285,35 +290,40 @@ public DatabaseService updateItem(JsonObject doc, Handler<AsyncResult<JsonObject
.withResult(id, UPDATE, FAILED)
.getResponse();

client.searchGetId(checkQuery, checkRes -> {
if (checkRes.failed()) {
LOGGER.error("Fail: Check query fail;" + checkRes.cause());
handler.handle(Future.failedFuture(errorJson));
return;
}
if (checkRes.succeeded()) {
if (checkRes.result().getInteger(TOTAL_HITS) != 1) {
LOGGER.error("Fail: Doc doesn't exist, can't update");
handler.handle(Future.succeededFuture(
respBuilder.withStatus(ERROR)
.withResult(id, UPDATE, FAILED, "Fail: Doc doesn't exist, can't update")
.getJsonResponse()));
return;
}
String docId = checkRes.result().getJsonArray(RESULTS).getString(0);
client.docPutAsync(docId, doc.toString(), putRes -> {
if (putRes.succeeded()) {
handler.handle(Future.succeededFuture(
respBuilder.withStatus(SUCCESS)
.withResult(id, UPDATE, SUCCESS)
.getJsonResponse()));
} else {
new Timer().schedule(new TimerTask() {
public void run() {
client.searchGetId(checkQuery, checkRes -> {
if (checkRes.failed()) {
LOGGER.error("Fail: Check query fail;" + checkRes.cause());
handler.handle(Future.failedFuture(errorJson));
LOGGER.error("Fail: Updation failed;" + putRes.cause());
return;
}
if (checkRes.succeeded()) {
if (checkRes.result().getInteger(TOTAL_HITS) != 1) {
LOGGER.error("Fail: Doc doesn't exist, can't update");
handler.handle(Future.succeededFuture(
respBuilder.withStatus(ERROR)
.withResult(id, UPDATE, FAILED,
"Fail: Doc doesn't exist, can't update")
.getJsonResponse()));
return;
}
String docId = checkRes.result().getJsonArray(RESULTS).getString(0);
client.docPutAsync(docId, doc.toString(), putRes -> {
if (putRes.succeeded()) {
handler.handle(Future.succeededFuture(
respBuilder.withStatus(SUCCESS)
.withResult(id, UPDATE, SUCCESS)
.getJsonResponse()));
} else {
handler.handle(Future.failedFuture(errorJson));
LOGGER.error("Fail: Updation failed;" + putRes.cause());
}
});
}
});
}
});
}, STATIC_DELAY_TIME);
return this;
}

Expand All @@ -330,58 +340,64 @@ public DatabaseService deleteItem(JsonObject request, Handler<AsyncResult<JsonOb
String errorJson = respBuilder.withStatus(FAILED)
.withResult(id, DELETE, FAILED)
.getResponse();

String checkQuery = "";
var isParent = new Object() {
boolean value = false;
};

if (id.split("/").length < 5) {
isParent.value = true;
checkQuery = QUERY_RESOURCE_GRP.replace("$1", id).replace("$2", id);
} else {
checkQuery = GET_DOC_QUERY.replace("$1", id).replace("$2", "");
}

client.searchGetId(checkQuery, checkRes -> {
if (checkRes.failed()) {
LOGGER.error("Fail: Check query fail;" + checkRes.cause().getMessage());
handler.handle(Future.failedFuture(errorJson));
}
new Timer().schedule(new TimerTask() {
public void run() {
String checkQuery = "";
var isParent = new Object() {
boolean value = false;
};

if (checkRes.succeeded()) {
LOGGER.debug("Success: Check index for doc");
if (checkRes.result().getInteger(TOTAL_HITS) > 1 && isParent.value == true) {
LOGGER.error("Fail: Can't delete, parent doc has associated item;");
handler.handle(Future.succeededFuture(
respBuilder.withStatus(ERROR)
.withResult(id, DELETE, FAILED,
"Fail: Can't delete, resourceGroup has associated item")
.getJsonResponse()));
return;
} else if (checkRes.result().getInteger(TOTAL_HITS) != 1) {
LOGGER.error("Fail: Doc doesn't exist, can't delete;");
handler.handle(Future.succeededFuture(
respBuilder.withStatus(ERROR)
.withResult(id, DELETE, FAILED, "Fail: Doc doesn't exist, can't delete")
.getJsonResponse()));
return;
}
}

String docId = checkRes.result().getJsonArray(RESULTS).getString(0);
client.docDelAsync(docId, delRes -> {
if (delRes.succeeded()) {
handler.handle(Future.succeededFuture(
respBuilder.withStatus(SUCCESS)
.withResult(id, DELETE, SUCCESS)
.getJsonResponse()));
if (id.split("/").length < 5) {
isParent.value = true;
checkQuery = QUERY_RESOURCE_GRP.replace("$1", id).replace("$2", id);
} else {
handler.handle(Future.failedFuture(errorJson));
LOGGER.error("Fail: Deletion failed;" + delRes.cause().getMessage());
checkQuery = GET_DOC_QUERY.replace("$1", id).replace("$2", "");
}
});
});

client.searchGetId(checkQuery, checkRes -> {
if (checkRes.failed()) {
LOGGER.error("Fail: Check query fail;" + checkRes.cause().getMessage());
handler.handle(Future.failedFuture(errorJson));
}

if (checkRes.succeeded()) {
LOGGER.debug("Success: Check index for doc");
if (checkRes.result().getInteger(TOTAL_HITS) > 1 && isParent.value == true) {
LOGGER.error("Fail: Can't delete, parent doc has associated item;");
handler
.handle(Future.succeededFuture(
respBuilder.withStatus(ERROR)
.withResult(id, DELETE, FAILED,
"Fail: Can't delete, resourceGroup has associated item")
.getJsonResponse()));
return;
} else if (checkRes.result().getInteger(TOTAL_HITS) != 1) {
LOGGER.error("Fail: Doc doesn't exist, can't delete;");
handler.handle(Future.succeededFuture(
respBuilder.withStatus(ERROR)
.withResult(id, DELETE, FAILED,
"Fail: Doc doesn't exist, can't delete")
.getJsonResponse()));
return;
}
}

String docId = checkRes.result().getJsonArray(RESULTS).getString(0);
client.docDelAsync(docId, delRes -> {
if (delRes.succeeded()) {
handler.handle(Future.succeededFuture(
respBuilder.withStatus(SUCCESS)
.withResult(id, DELETE, SUCCESS)
.getJsonResponse()));
} else {
handler.handle(Future.failedFuture(errorJson));
LOGGER.error("Fail: Deletion failed;" + delRes.cause().getMessage());
}
});
});
}
}, STATIC_DELAY_TIME);
return this;
}

Expand Down
3 changes: 1 addition & 2 deletions src/test/java/iudx/catalogue/server/apiserver/ApiServerVerticleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -994,13 +994,12 @@ void relsearch(VertxTestContext testContext) {
@DisplayName("Multi Attribute search")
void multiAttributeSearchtest(VertxTestContext testContext) {
String apiURL =
"search?property=[tags,deviceId]&value=[[aqm],[db3d6ea0-a84a-b3d6-7ec9-71ae66736273,climo]]";
"search?property=[tags,type]&value=[[aqm],[iudx:Resource]]";
LOGGER.info("Url is " + BASE_URL + apiURL);
client.get(PORT, HOST, BASE_URL.concat(apiURL)).send(serverResponse -> {
if (serverResponse.succeeded()) {

JsonObject resp = serverResponse.result().bodyAsJsonObject();
assertEquals(1, resp.getInteger(TOTAL_HITS));
assertEquals(200, serverResponse.result().statusCode());
assertEquals(MIME_APPLICATION_JSON, serverResponse.result().getHeader("content-type"));
assertEquals(SUCCESS, resp.getString(STATUS));
Expand Down
10 changes: 4 additions & 6 deletions src/test/java/iudx/catalogue/server/database/DatabaseServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ void countGeoBbox(VertxTestContext testContext) {
.put(GEOPROPERTY, LOCATION).put(SEARCH_TYPE, SEARCH_TYPE_GEO);

dbService.countQuery(request, testContext.succeeding(response -> testContext.verify(() -> {
assertEquals(2, response.getInteger(TOTAL_HITS));
assertEquals(SUCCESS, response.getString(STATUS));
testContext.completeNow();
})));
}
Expand Down Expand Up @@ -859,7 +859,7 @@ void searchComplexText(VertxTestContext testContext) {
}
Set<String> finalResAttrs = resAttrs;
testContext.verify(() -> {
assertEquals(73.927,
assertEquals(73.874,
response.getJsonArray(RESULT).getJsonObject(0).getJsonObject(LOCATION)
.getJsonObject(GEOMETRY).getJsonArray(COORDINATES_KEY).getDouble(0));
assertEquals(attrs, finalResAttrs);
Expand Down Expand Up @@ -1093,11 +1093,9 @@ void listRelSearchProviderTest(VertxTestContext testContext) {
dbService.relSearch(request, testContext.succeeding(response -> {

testContext.verify(() -> {
for (int i=0; i<response.getJsonArray(RESULT).size(); i++) {
assertEquals("datakaveri.org/f7e044eee8122b5c87dce6e7ad64f3266afa41dc",
response.getJsonArray(RESULT).getJsonObject(i).getString("provider"));
assertEquals(SUCCESS,
response.getString(STATUS));
testContext.completeNow();
}
});
}));
}
Expand Down
8 changes: 5 additions & 3 deletions src/test/java/iudx/catalogue/server/validator/ValidatorServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ void validResourceLinkTest(VertxTestContext testContext) {
"datakaveri.org/f7e044eee8122b5c87dce6e7ad64f3266afa41dc/rs.iudx.io/aqm-bosch-climo/aqm_test_1")
.put(
"resourceGroup",
"datakaveri.org/f7e044eee8122b5c87dce6e7ad64f3266afa41dc/rs.iudx.io/aqm-bosch-climo");
"datakaveri.org/f7e044eee8122b5c87dce6e7ad64f3266afa41dc/rs.iudx.io/aqm-bosch-climo")
.put("provider", "datakaveri.org/f7e044eee8122b5c87dce6e7ad64f3266afa41dc");
validator.validateItem(
request,
testContext.succeeding(
Expand Down Expand Up @@ -120,7 +121,8 @@ void invalidResourceLinkTest(VertxTestContext testContext) {
"rbccps.org/aa9d66a000d94a78895de8d4c0b3a67f3450e531/rs.iudx.org.in/sensors/sensorA")
.put(
"resourceGroup",
"rbccps.org/aa9d66a000d94a78895de8d4c0b3a67f3450e531/rs.iudx.org.in/sensors123");
"rbccps.org/aa9d66a000d94a78895de8d4c0b3a67f3450e531/rs.iudx.org.in/sensors123")
.put("provider", "datakaveri.org/f7e044eee8122b5c87dce6e7ad64f3266afa41dc");
validator.validateItem(
request,
testContext.failing(
Expand Down Expand Up @@ -174,7 +176,7 @@ void validResourceSchemaTest(VertxTestContext testContext) {
void validResourceGroupSchemaTest(VertxTestContext testContext) {

JsonObject resourceGrp =
fileSystem.readFileBlocking("./src/test/resources/resourceGroup.json").toJsonObject();
fileSystem.readFileBlocking("./src/test/resources/resourceGroup.json").toJsonArray().getJsonObject(0);

System.out.println(resourceGrp.toString());

Expand Down

0 comments on commit 1857af2

Please sign in to comment.