Skip to content

64 & 66 - Add optional dataset fields alternativePersistentId, publicationDate and citationDate #68

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 3 commits into from
Jun 21, 2023
Merged

64 & 66 - Add optional dataset fields alternativePersistentId, publicationDate and citationDate #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5920852
Added: dataset optional fields alternativePersistentId, publicationDa…
GPortas Jun 19, 2023
9d01d80
Refactor: datasetHelper constant extracted
GPortas Jun 19, 2023
8346aa4
Merge branch 'develop' of github.com:IQSS/dataverse-client-javascript…
GPortas Jun 21, 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
3 changes: 3 additions & 0 deletions src/datasets/domain/models/Dataset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ export interface Dataset {
versionId: number;
versionInfo: DatasetVersionInfo;
license?: DatasetLicense;
alternativePersistentId?: string;
publicationDate?: string;
citationDate?: string;
metadataBlocks: DatasetMetadataBlocks;
}

Expand Down
9 changes: 9 additions & 0 deletions src/datasets/infra/repositories/transformers/datasetTransformers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ const transformVersionPayloadToDataset = (versionPayload: any): Dataset => {
if ('license' in versionPayload) {
datasetModel.license = transformPayloadToDatasetLicense(versionPayload.license);
}
if ('alternativePersistentId' in versionPayload) {
datasetModel.alternativePersistentId = versionPayload.alternativePersistentId;
}
if ('publicationDate' in versionPayload) {
datasetModel.publicationDate = versionPayload.publicationDate;
}
if ('citationDate' in versionPayload) {
datasetModel.citationDate = versionPayload.citationDate;
}
return datasetModel;
};
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down
31 changes: 18 additions & 13 deletions test/testHelpers/datasets/datasetHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const DATASET_CREATE_TIME_STR = '2023-05-15T08:21:01Z';
const DATASET_UPDATE_TIME_STR = '2023-05-15T08:21:03Z';
const DATASET_RELEASE_TIME_STR = '2023-05-15T08:21:03Z';

const DATASET_PUBLICATION_DATE_STR = '2023-05-15';

const DATASET_HTML_DESCRIPTION =
'<div><h1 class="test-class-to-ignore">Title 1</h1><p>Test paragraph 1</p><p>Test paragraph 2</p><p>Hello world</p><h2>Title 2</h2><h3>Title 3</h3></div>';

Expand All @@ -23,6 +25,7 @@ export const createDatasetModel = (license?: DatasetLicense): Dataset => {
lastUpdateTime: new Date(DATASET_UPDATE_TIME_STR),
releaseTime: new Date(DATASET_RELEASE_TIME_STR),
},
publicationDate: DATASET_PUBLICATION_DATE_STR,
metadataBlocks: [
{
name: 'citation',
Expand All @@ -43,10 +46,11 @@ export const createDatasetModel = (license?: DatasetLicense): Dataset => {
{
dsDescriptionValue: turndownService.turndown(DATASET_HTML_DESCRIPTION),
},
], datasetContact: [
],
datasetContact: [
{
datasetContactName: 'Admin, Dataverse',
datasetContactEmail: 'someemail@test.com'
datasetContactName: 'Admin, Dataverse',
datasetContactEmail: 'someemail@test.com',
},
],
},
Expand All @@ -70,6 +74,7 @@ export const createDatasetVersionPayload = (license?: DatasetLicense): any => {
lastUpdateTime: DATASET_UPDATE_TIME_STR,
releaseTime: DATASET_RELEASE_TIME_STR,
createTime: DATASET_CREATE_TIME_STR,
publicationDate: DATASET_PUBLICATION_DATE_STR,
license: {
name: 'CC0 1.0',
uri: 'https://creativecommons.org/publicdomain/zero/1.0/',
Expand Down Expand Up @@ -142,25 +147,25 @@ export const createDatasetVersionPayload = (license?: DatasetLicense): any => {
],
},
{
typeName: "datasetContact",
typeName: 'datasetContact',
multiple: true,
typeClass: "compound",
typeClass: 'compound',
value: [
{
datasetContactName: {
typeName: "datasetContactName",
typeName: 'datasetContactName',
multiple: false,
typeClass: "primitive",
typeClass: 'primitive',
value: 'Admin, Dataverse',
},
datasetContactEmail: {
typeName: "datasetContactEmail",
typeName: 'datasetContactEmail',
multiple: false,
typeClass: "primitive",
value: 'someemail@test.com'
}
}
]
typeClass: 'primitive',
value: 'someemail@test.com',
},
},
],
},
],
},
Expand Down