From 8db3c609804d4629ec447139873122720448d927 Mon Sep 17 00:00:00 2001 From: Dipannita Dey Date: Thu, 29 Aug 2024 21:06:28 -0500 Subject: [PATCH 1/2] Added license details to dataset object. This is required for migrating licenses to v2. --- app/models/Dataset.scala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/models/Dataset.scala b/app/models/Dataset.scala index 4c682963c..066331a1a 100644 --- a/app/models/Dataset.scala +++ b/app/models/Dataset.scala @@ -110,7 +110,17 @@ object Dataset { "thumbnail" -> datasetThumbnail, "authorId" -> dataset.author.id, "spaces" -> dataset.spaces, - "resource_type" -> "dataset") + "resource_type" -> "dataset", + "license" -> Json.obj( + "license_type" -> dataset.licenseData.m_licenseType, + "license_url" -> dataset.licenseData.m_licenseUrl, + "license_text" -> dataset.licenseData.m_licenseText, + "holders" -> dataset.licenseData.m_rightsHolder, + "ccAllowCommercial" -> dataset.licenseData.m_ccAllowCommercial, + "ccAllowDerivative" -> dataset.licenseData.m_ccAllowDerivative, + "ccRequireShareAlike" -> dataset.licenseData.m_ccRequireShareAlike + ) + ) } } } From a6412e5a3e2cfbb9e9a413f4fbe36fd019bce4b7 Mon Sep 17 00:00:00 2001 From: Dipannita Dey Date: Fri, 30 Aug 2024 11:15:27 -0500 Subject: [PATCH 2/2] modified changelog.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37eb95678..9de406e55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## 1.22.1 - 2023-11-10 +### Unreleased +- Added License details in dataset object response + ### Fixed - Fixed hearthbeat bug where if the owner was not set in extractors_info.json clowder would throw and error and the extractor would not get registered.