add id in GET /metadata.jsonld responses (#279)

longshuicy · lmarini · web-flow · commit 3c5eddc1bd50 · 2021-10-01T11:57:44.000-05:00
* add id * add entry in changelog issue #278 * reordering the field to make id second Co-authored-by: Luigi Marini <lmarini@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Adding mime type for geojson
 - Add "when" parameter in a few GET API endpoints to enable pagination [#266](https://github.com/clowder-framework/clowder/issues/266)
+- Add "id" in GET metadata.jsonld endpoints [#278](https://github.com/clowder-framework/clowder/issues/278)
 
 ## 1.18.1 - 2021-08-16
 
diff --git a/app/util/JSONLD.scala b/app/util/JSONLD.scala
@@ -63,7 +63,8 @@ object JSONLD {
     )
 
     //convert metadata to json using implicit writes in Metadata model
-    val metadataJson = resourceJson ++ toJson(metadata).asInstanceOf[JsObject]
+    //include metadata ID in the json
+    val metadataJson = JsObject(Seq("id" -> JsString(metadata.id.toString()))) ++ resourceJson ++ toJson(metadata).asInstanceOf[JsObject]
 
     //combine the two json objects and return
     if (contextJson.isEmpty) metadataJson else contextJson.get ++ metadataJson

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ object JSONLD {`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`//convert metadata to json using implicit writes in Metadata model`
`66`		`- val metadataJson = resourceJson ++ toJson(metadata).asInstanceOf[JsObject]`
	`66`	`+ //include metadata ID in the json`
	`67`	`+ val metadataJson = JsObject(Seq("id" -> JsString(metadata.id.toString()))) ++ resourceJson ++ toJson(metadata).asInstanceOf[JsObject]`
`67`	`68`
`68`	`69`	`//combine the two json objects and return`
`69`	`70`	`if (contextJson.isEmpty) metadataJson else contextJson.get ++ metadataJson`