Merge pull request #285 from pranavrd/fix/rs-url-name

chore: change rs url to rs reg url
datakaveri · Oct 5, 2023 · a909354 · a909354
2 parents 63c6e15 + e49be94
commit a909354
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/iudx/catalogue/server/database/Constants.java b/src/main/java/iudx/catalogue/server/database/Constants.java
@@ -187,7 +187,7 @@ public class Constants {
           + "\"iudx:COS\", \"iudx:ResourceGroup\", \"iudx:Resource\"]}}}},\"_source\""
           + ":{\"includes\": "
           + "[\"type\",\"id\",\"label\",\"accessPolicy\",\"tags\",\"instance\","
-          + "\"provider\", \"resourceServerURL\",\"description\" ,\"cosURL\", "
+          + "\"provider\", \"resourceServerRegURL\",\"description\" ,\"cosURL\", "
           + "\"cos\", \"resourceGroup\", \"resourceType\"]},\"size\":"
           + " 10000}";
 
@@ -199,7 +199,7 @@ public class Constants {
         + "{\"bool\":{\"must\":[{\"terms\":{\"type.keyword\":"
         + "[\"iudx:Provider\",\"iudx:COS\"]}}]}}]}},\"_source\":"
         + "{\"includes\":[\"type\",\"id\",\"label\",\"accessPolicy\","
-        + "\"tags\",\"instance\",\"provider\",\"resourceServerURL\","
+        + "\"tags\",\"instance\",\"provider\",\"resourceServerRegURL\","
         + "\"description\",\"cosURL\",\"cos\",\"resourceGroup\"]},"
         + "\"size\":10000}";
   public static final String GET_MLAYER_DATASET =
@@ -214,7 +214,7 @@ public class Constants {
           + " \"label\", \"description\", \"instance\", \"accessPolicy\",\"cosURL\","
           + " \"dataSample\","
           + " \"dataDescriptor\", \"@context\", \"dataQualityFile\", \"dataSampleFile\","
-          + " \"resourceType\", \"resourceServerURL\",\"resourceType\"]},\"size\": 10000}";
+          + " \"resourceType\", \"resourceServerRegURL\",\"resourceType\"]},\"size\": 10000}";
 
   public static final String RESOURCE_ACCESSPOLICY_COUNT =
       "{\"size\":0,\"query\":{\"match_all\":{}},\"aggs\":{\"results\":{\"composite\":"

diff --git a/src/main/java/iudx/catalogue/server/database/DatabaseServiceImpl.java b/src/main/java/iudx/catalogue/server/database/DatabaseServiceImpl.java
@@ -1919,8 +1919,8 @@ private void gettingAllDatasets(String query, Promise<JsonObject> datasetResult)
                 providerDescription.put(record.getString(ID), record.getString(DESCRIPTION_ATTR));
                 rsUrl.put(
                     record.getString(ID),
-                    record.containsKey("resourceServerURL")
-                        ? record.getString("resourceServerURL")
+                    record.containsKey("resourceServerRegURL")
+                        ? record.getString("resourceServerRegURL")
                         : "");
               } else if (record.getJsonArray(TYPE).getString(0).equals("iudx:COS")) {
                 cosUrl.put(record.getString(ID), record.getString("cosURL"));
@@ -1935,7 +1935,7 @@ private void gettingAllDatasets(String query, Promise<JsonObject> datasetResult)
                 record.put(
                     "providerDescription",
                     providerDescription.getString(record.getString(PROVIDER)));
-                record.put("resourceServerURL", rsUrl.getString(record.getString(PROVIDER)));
+                record.put("resourceServerRegURL", rsUrl.getString(record.getString(PROVIDER)));
                 record.put(
                     "cosURL",
                     record.containsKey("cos") ? cosUrl.getString(record.getString("cos")) : "");

diff --git a/src/main/java/iudx/catalogue/server/database/ElasticClient.java b/src/main/java/iudx/catalogue/server/database/ElasticClient.java
@@ -155,7 +155,7 @@ public void onSuccess(Response response) {
                   provider
                           .put(ID, record.getString(ID))
                           .put(DESCRIPTION_ATTR, record.getString(DESCRIPTION_ATTR));
-                  dataset.put("resourceServerURL", record.getString("resourceServerURL"));
+                  dataset.put("resourceServerRegURL", record.getString("resourceServerRegURL"));
                   dataset.put(PROVIDER, provider);
                 }
                 if (type.equals("iudx:Resource")) {