Skip to content

9656 - API support for optional dataset parameters required by the frontend #9657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 6 commits into from
Jun 28, 2023
Merged

9656 - API support for optional dataset parameters required by the frontend #9657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b19b83
Merge branch 'develop' into 9656-api-optional-dataset-params
GPortas Jun 19, 2023
7314d5c
Added: dataset citation accordion optional parameters to dataset vers…
GPortas Jun 19, 2023
6b3e3d4
Create 9656-api-optional-dataset-params.md
pdurbin Jun 20, 2023
de52d94
Refactor: unnecessary null checks removed
GPortas Jun 20, 2023
da7bc43
Merge branch 'develop' of github.com:IQSS/dataverse into 9656-api-opt…
GPortas Jun 20, 2023
e80dabb
Merge branch '9656-api-optional-dataset-params' of github.com:IQSS/da…
GPortas Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions doc/release-notes/9656-api-optional-dataset-params.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The following fields are now available in the native JSON output:

- alternativePersistentId
- publicationDate
- citationDate
12 changes: 8 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,17 +373,21 @@ public static JsonObjectBuilder json(DatasetVersion dsv) {
}

public static JsonObjectBuilder json(DatasetVersion dsv, List<String> anonymizedFieldTypeNamesList) {
Dataset dataset = dsv.getDataset();
JsonObjectBuilder bld = jsonObjectBuilder()
.add("id", dsv.getId()).add("datasetId", dsv.getDataset().getId())
.add("datasetPersistentId", dsv.getDataset().getGlobalId().asString())
.add("storageIdentifier", dsv.getDataset().getStorageIdentifier())
.add("id", dsv.getId()).add("datasetId", dataset.getId())
.add("datasetPersistentId", dataset.getGlobalId().asString())
.add("storageIdentifier", dataset.getStorageIdentifier())
Comment on lines 377 to +380
Copy link
Member

@pdurbin pdurbin Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsonObjectBuilder() is already NullSafeJsonBuilder to it should be safe to add

.add("alternativePersistentId", dataset.getAlternativePersistentIdentifier())

for example.

.add("versionNumber", dsv.getVersionNumber()).add("versionMinorNumber", dsv.getMinorVersionNumber())
.add("versionState", dsv.getVersionState().name()).add("versionNote", dsv.getVersionNote())
.add("archiveNote", dsv.getArchiveNote()).add("deaccessionLink", dsv.getDeaccessionLink())
.add("distributionDate", dsv.getDistributionDate()).add("productionDate", dsv.getProductionDate())
.add("UNF", dsv.getUNF()).add("archiveTime", format(dsv.getArchiveTime()))
.add("lastUpdateTime", format(dsv.getLastUpdateTime())).add("releaseTime", format(dsv.getReleaseTime()))
.add("createTime", format(dsv.getCreateTime()));
.add("createTime", format(dsv.getCreateTime()))
.add("alternativePersistentId", dataset.getAlternativePersistentIdentifier())
.add("publicationDate", dataset.getPublicationDateFormattedYYYYMMDD())
.add("citationDate", dataset.getCitationDateFormattedYYYYMMDD());
License license = DatasetUtil.getLicense(dsv);
if (license != null) {
bld.add("license", jsonLicense(dsv));
Expand Down