Skip to content

Commit 1aa3e31

Browse files
committed
feat: add guestId to dataset
1 parent 88fb521 commit 1aa3e31

6 files changed

Lines changed: 33 additions & 4 deletions

File tree

src/datasets/domain/models/Dataset.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export interface Dataset {
1212
alternativePersistentId?: string
1313
publicationDate?: string
1414
citationDate?: string
15+
guestbookId?: number
1516
metadataBlocks: DatasetMetadataBlocks
1617
isPartOf: DvObjectOwnerNode
1718
datasetType?: string

src/datasets/infra/repositories/transformers/DatasetPayload.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export interface DatasetPayload {
1717
alternativePersistentId?: string
1818
publicationDate?: string
1919
citationDate?: string
20+
guestbookId?: number
2021
fileAccessRequest: boolean
2122
termsOfAccess?: string
2223
dataAccessPlace?: string

src/datasets/infra/repositories/transformers/datasetTransformers.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@ export const transformVersionPayloadToDataset = (
296296
if ('citationDate' in versionPayload) {
297297
datasetModel.citationDate = versionPayload.citationDate
298298
}
299+
if ('guestbookId' in versionPayload) {
300+
datasetModel.guestbookId = versionPayload.guestbookId
301+
}
299302
if ('datasetType' in versionPayload) {
300303
datasetModel.datasetType = versionPayload.datasetType
301304
}

test/environment/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
-Ddataverse.files.localstack1.access-key=default
3333
-Ddataverse.files.localstack1.secret-key=default
3434
ports:
35-
- '8080:8080'
35+
- '8081:8080'
3636
networks:
3737
- dataverse
3838
depends_on:

test/integration/guestbooks/GuestbooksRepository.test.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ import { ApiConfig, ReadError, WriteError } from '../../../src'
33
import { GuestbooksRepository } from '../../../src/guestbooks/infra/repositories/GuestbooksRepository'
44
import { CreateGuestbookDTO } from '../../../src/guestbooks/domain/dtos/CreateGuestbookDTO'
55
import { TestConstants } from '../../testHelpers/TestConstants'
6-
import { createDataset, CreatedDatasetIdentifiers } from '../../../src/datasets'
6+
import {
7+
createDataset,
8+
CreatedDatasetIdentifiers,
9+
DatasetNotNumberedVersion,
10+
getDataset
11+
} from '../../../src/datasets'
712
import { deleteUnpublishedDatasetViaApi } from '../../testHelpers/datasets/datasetHelper'
813
import {
914
createCollectionViaApi,
@@ -181,6 +186,17 @@ describe('GuestbooksRepository', () => {
181186
expect(actual).toBeUndefined()
182187
})
183188

189+
test('should return guestbookId in dataset response after assigning guestbook', async () => {
190+
await sut.assignDatasetGuestbook(testDatasetIds.numericId, assignableGuestbookId)
191+
192+
const dataset = await getDataset.execute(
193+
testDatasetIds.numericId,
194+
DatasetNotNumberedVersion.LATEST
195+
)
196+
197+
expect(dataset.guestbookId).toBe(assignableGuestbookId)
198+
})
199+
184200
test('should assign guestbook to dataset by persistent id', async () => {
185201
const actual = await sut.assignDatasetGuestbook(
186202
testDatasetIds.persistentId,

test/testHelpers/datasets/datasetHelper.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ const DATAVERSE_API_REQUEST_HEADERS = {
3939

4040
export const createDatasetModel = (
4141
license?: DatasetLicense,
42-
addOptionalParameters = false
42+
addOptionalParameters = false,
43+
guestbookId?: number
4344
): Dataset => {
4445
const datasetModel: Dataset = {
4546
id: 1,
@@ -119,12 +120,16 @@ export const createDatasetModel = (
119120
datasetModel.publicationDate = '2021-01-01'
120121
datasetModel.citationDate = '2021-01-01'
121122
}
123+
if (guestbookId !== undefined) {
124+
datasetModel.guestbookId = guestbookId
125+
}
122126
return datasetModel
123127
}
124128

125129
export const createDatasetVersionPayload = (
126130
license?: DatasetLicense,
127-
addOptionalProperties = false
131+
addOptionalProperties = false,
132+
guestbookId?: number
128133
): DatasetPayload => {
129134
const datasetPayload: DatasetPayload = {
130135
id: 19,
@@ -256,6 +261,9 @@ export const createDatasetVersionPayload = (
256261
datasetPayload.publicationDate = '2021-01-01'
257262
datasetPayload.citationDate = '2021-01-01'
258263
}
264+
if (guestbookId !== undefined) {
265+
datasetPayload.guestbookId = guestbookId
266+
}
259267
return datasetPayload
260268
}
261269

0 commit comments

Comments
 (0)