Skip to content

Commit 200d00c

Browse files
committed
feat: update deaccession reason to versionsSummary
1 parent 449bcd2 commit 200d00c

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

src/datasets/domain/models/DatasetVersionSummaryInfo.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,17 @@ export interface DatasetVersionSummaryInfo {
77
}
88

99
export type DatasetVersionSummary = {
10-
[key: string]: SummaryUpdates | SummaryUpdatesWithFields | FilesSummaryUpdates | boolean
10+
[key: string]:
11+
| SummaryUpdates
12+
| SummaryUpdatesWithFields
13+
| FilesSummaryUpdates
14+
| boolean
15+
| Deaccessioned
16+
}
17+
18+
interface Deaccessioned {
19+
reason: string
20+
url: string
1121
}
1222

1323
interface SummaryUpdates {
@@ -31,6 +41,5 @@ interface FilesSummaryUpdates {
3141
export enum DatasetVersionSummaryStringValues {
3242
firstPublished = 'firstPublished',
3343
firstDraft = 'firstDraft',
34-
versionDeaccessioned = 'versionDeaccessioned',
3544
previousVersionDeaccessioned = 'previousVersionDeaccessioned'
3645
}

test/integration/datasets/DatasetsRepository.test.ts

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ import {
3535
createCollectionViaApi,
3636
deleteCollectionViaApi,
3737
publishCollectionViaApi,
38-
ROOT_COLLECTION_ALIAS,
39-
setStorageDriverViaApi
38+
ROOT_COLLECTION_ALIAS
4039
} from '../../testHelpers/collections/collectionHelper'
4140
import {
4241
calculateBlobChecksum,
@@ -1122,7 +1121,6 @@ describe('DatasetsRepository', () => {
11221121
beforeAll(async () => {
11231122
await createCollectionViaApi(testDatasetVersionsCollectionAlias)
11241123
await publishCollectionViaApi(testDatasetVersionsCollectionAlias)
1125-
await setStorageDriverViaApi(testDatasetVersionsCollectionAlias, 'LocalStack')
11261124
})
11271125

11281126
afterAll(async () => {
@@ -1162,6 +1160,29 @@ describe('DatasetsRepository', () => {
11621160
await deletePublishedDatasetViaApi(testDatasetIds.persistentId)
11631161
})
11641162

1163+
test('should return dataset versions correctly after deaccessioned', async () => {
1164+
const testDatasetIds = await createDataset.execute(
1165+
TestConstants.TEST_NEW_DATASET_DTO,
1166+
testDatasetVersionsCollectionAlias
1167+
)
1168+
await publishDataset.execute(testDatasetIds.numericId, VersionUpdateType.MAJOR)
1169+
1170+
await waitForNoLocks(testDatasetIds.numericId, 10)
1171+
1172+
const deaccessionReason = {
1173+
deaccessioned: { reason: 'Test reason.' }
1174+
}
1175+
await deaccessionDatasetViaApi(testDatasetIds.numericId, '1.0')
1176+
1177+
const actual = await sut.getDatasetVersionsSummaries(testDatasetIds.numericId)
1178+
1179+
expect(actual.length).toBeGreaterThan(0)
1180+
expect(actual[0].versionNumber).toBe('1.0')
1181+
expect(actual[0].summary).toStrictEqual(deaccessionReason)
1182+
1183+
await deletePublishedDatasetViaApi(testDatasetIds.persistentId)
1184+
})
1185+
11651186
test('should return dataset versions correctly after 1st publish and metadata fields update', async () => {
11661187
const testDatasetIds = await createDataset.execute(
11671188
TestConstants.TEST_NEW_DATASET_DTO,

0 commit comments

Comments
 (0)