Skip to content

Get Dataset Extension: add Terms of Use #243

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
ofahimIQSS merged 1 commit into from
Jan 27, 2025
Merged

Get Dataset Extension: add Terms of Use #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 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 @@ -6,6 +6,7 @@ export interface Dataset {
versionId: number
versionInfo: DatasetVersionInfo
license?: DatasetLicense
termsOfUse: TermsOfUse
alternativePersistentId?: string
publicationDate?: string
citationDate?: string
Expand Down Expand Up @@ -35,6 +36,17 @@ export interface DatasetLicense {
iconUri?: string
}

export interface TermsOfUse {
fileAccessRequest: boolean
termsOfAccess?: string
dataAccessPlace?: string
originalArchive?: string
availabilityStatus?: string
contactForAccess?: string
sizeOfCollection?: string
studyCompletion?: string
}

export type DatasetMetadataBlocks = [CitationMetadataBlock, ...DatasetMetadataBlock[]]

export interface DatasetMetadataBlock {
Expand Down
8 changes: 8 additions & 0 deletions src/datasets/infra/repositories/transformers/DatasetPayload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ export interface DatasetPayload {
alternativePersistentId?: string
publicationDate?: string
citationDate?: string
fileAccessRequest: boolean
termsOfAccess?: string
dataAccessPlace?: string
originalArchive?: string
availabilityStatus?: string
contactForAccess?: string
sizeOfCollection?: string
studyCompletion?: string
files: FilePayload[]
isPartOf: OwnerNodePayload
}
Expand Down
10 changes: 10 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 @@ -233,6 +233,16 @@ export const transformVersionPayloadToDataset = (
lastUpdateTime: new Date(versionPayload.lastUpdateTime),
releaseTime: new Date(versionPayload.releaseTime)
},
termsOfUse: {
fileAccessRequest: versionPayload.fileAccessRequest,
termsOfAccess: versionPayload.termsOfAccess,
dataAccessPlace: versionPayload.dataAccessPlace,
originalArchive: versionPayload.originalArchive,
availabilityStatus: versionPayload.availabilityStatus,
contactForAccess: versionPayload.contactForAccess,
sizeOfCollection: versionPayload.sizeOfCollection,
studyCompletion: versionPayload.studyCompletion
},
metadataBlocks: transformPayloadToDatasetMetadataBlocks(
versionPayload.metadataBlocks,
keepRawFields
Expand Down
18 changes: 18 additions & 0 deletions test/testHelpers/datasets/datasetHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ export const createDatasetModel = (
lastUpdateTime: new Date(DATASET_UPDATE_TIME_STR),
releaseTime: new Date(DATASET_RELEASE_TIME_STR)
},
termsOfUse: {
fileAccessRequest: true,
termsOfAccess: 'Terms of access',
dataAccessPlace: 'Data access place',
originalArchive: 'Original archive',
availabilityStatus: 'Availability status',
contactForAccess: 'Contact for access',
sizeOfCollection: 'Size of collection',
studyCompletion: 'Study completion'
},
publicationDate: DATASET_PUBLICATION_DATE_STR,
metadataBlocks: [
{
Expand Down Expand Up @@ -111,6 +121,14 @@ export const createDatasetVersionPayload = (
releaseTime: DATASET_RELEASE_TIME_STR,
createTime: DATASET_CREATE_TIME_STR,
publicationDate: DATASET_PUBLICATION_DATE_STR,
fileAccessRequest: true,
termsOfAccess: 'Terms of access',
dataAccessPlace: 'Data access place',
originalArchive: 'Original archive',
availabilityStatus: 'Availability status',
contactForAccess: 'Contact for access',
sizeOfCollection: 'Size of collection',
studyCompletion: 'Study completion',
metadataBlocks: {
citation: {
name: 'citation',
Expand Down
Loading