issue datakaveri#160 and datakaveri#161

kailash · Nov 18, 2021 · e194504 · e194504
1 parent 1c47c74
commit e194504
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/iudx/resource/server/apiserver/service/CatalogueService.java b/src/main/java/iudx/resource/server/apiserver/service/CatalogueService.java
@@ -205,7 +205,7 @@ public Future<Boolean> isItemExist(String id) {
           if (responseHandler.succeeded()) {
             HttpResponse<Buffer> response = responseHandler.result();
             JsonObject responseBody = response.bodyAsJsonObject();
-            if (responseBody.getString("status").equalsIgnoreCase("urn:dx:cat:Success")
+            if (responseBody.getString("type").equalsIgnoreCase("urn:dx:cat:Success")
                 && responseBody.getInteger("totalHits") > 0) {
               promise.complete(true);
             } else {

diff --git a/src/main/java/iudx/resource/server/authenticator/JwtAuthenticationServiceImpl.java b/src/main/java/iudx/resource/server/authenticator/JwtAuthenticationServiceImpl.java
@@ -280,7 +280,7 @@ private Future<Boolean> isResourceExist(String id, String groupACL) {
             JsonObject responseBody = response.bodyAsJsonObject();
             if (response.statusCode() != HttpStatus.SC_OK) {
               promise.fail("false");
-            } else if (!responseBody.getString("status").equals("success")) {
+            } else if (!responseBody.getString("type").equals("urn:dx:cat:Success")) {
               promise.fail("Not Found");
               return;
             } else if (responseBody.getInteger("totalHits") == 0) {
@@ -319,7 +319,7 @@ private Future<String> getGroupAccessPolicy(String groupId) {
               return;
             }
             JsonObject responseBody = response.bodyAsJsonObject();
-            if (!responseBody.getString("status").equals("success")) {
+            if (!responseBody.getString("type").equals("urn:dx:cat:Success")) {
               promise.fail("Resource not found");
               return;
             }

diff --git a/src/main/java/iudx/resource/server/databroker/SubscriptionService.java b/src/main/java/iudx/resource/server/databroker/SubscriptionService.java
@@ -130,7 +130,7 @@ Future<JsonObject> registerStreamingSubscription(JsonObject request) {
                         array.add(exchangeName + Constants.DATA_WILDCARD_ROUTINGKEY);
                       } else {
                         exchangeName = routingKey.substring(0, routingKey.lastIndexOf("/"));
-                        array.add(routingKey);
+                        array.add(exchangeName+"/."+routingKey.substring(routingKey.lastIndexOf("/")+1));
                       }
                       JsonObject json = new JsonObject();
                       json.put(EXCHANGE_NAME, exchangeName);
@@ -272,7 +272,7 @@ Future<JsonObject> updateStreamingSubscription(JsonObject request) {
                             array.add(exchangeName + Constants.DATA_WILDCARD_ROUTINGKEY);
                           } else {
                             exchangeName = routingKey.substring(0, routingKey.lastIndexOf("/"));
-                            array.add(routingKey);
+                            array.add(exchangeName+"/."+routingKey.substring(routingKey.lastIndexOf("/")+1));
                           }
                           JsonObject json = new JsonObject();
                           json.put(EXCHANGE_NAME, exchangeName);
@@ -391,7 +391,7 @@ Future<JsonObject> appendStreamingSubscription(JsonObject request) {
                     array.add(exchangeName + Constants.DATA_WILDCARD_ROUTINGKEY);
                   } else {
                     exchangeName = routingKey.substring(0, routingKey.lastIndexOf("/"));
-                    array.add(routingKey);
+                    array.add(exchangeName+"/."+routingKey.substring(routingKey.lastIndexOf("/")+1));
                   }
                   JsonObject json = new JsonObject();
                   json.put(EXCHANGE_NAME, exchangeName);