Skip to content

Commit 4d41dc5

Browse files
committed
feat: add dvObjectDisplayName property
1 parent 5ca72db commit 4d41dc5

7 files changed

Lines changed: 27 additions & 20 deletions

File tree

src/collections/domain/models/CollectionFeaturedItem.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export interface DvObjectFeaturedItem {
1313
id: number
1414
type: DvObjectFeaturedItemType
1515
dvObjectIdentifier: string
16+
dvObjectDisplayName: string
1617
displayOrder: number
1718
}
1819

src/collections/infra/repositories/transformers/CollectionFeaturedItemPayload.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ export interface DvObjectFeaturedItemPayload {
1313
id: number
1414
type: 'dataverse' | 'dataset' | 'datafile'
1515
dvObjectIdentifier: string
16+
dvObjectDisplayName: string
1617
displayOrder: number
1718
}

src/collections/infra/repositories/transformers/collectionFeaturedItemsTransformer.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export const transformCollectionFeaturedItemsPayloadToCollectionFeaturedItems =
5555
id: item.id,
5656
type,
5757
dvObjectIdentifier: item.dvObjectIdentifier,
58+
dvObjectDisplayName: item.dvObjectDisplayName,
5859
displayOrder: item.displayOrder
5960
}
6061

test/functional/collections/GetCollectionFeaturedItems.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ describe('execute', () => {
9797
expect(featuredItemTwo.id).toBe(testFeaturedItemIds[1])
9898
expect(featuredItemTwo.type).toBe(DvObjectFeaturedItemType.COLLECTION)
9999
expect(featuredItemTwo.dvObjectIdentifier).toBe(featuredCollectionAlias)
100+
expect(featuredItemTwo.dvObjectDisplayName).toBe('Scientific Research')
100101
expect(featuredItemTwo.displayOrder).toBe(2)
101102
})
102103

test/functional/collections/UpdateCollectionFeaturedItems.test.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,21 @@ describe('execute', () => {
176176

177177
expect(fourthItemResponse.type).toBe(DvObjectFeaturedItemType.COLLECTION)
178178
expect(fourthItemResponse.dvObjectIdentifier).toBe(featuredCollectionAlias)
179+
expect(fourthItemResponse.dvObjectDisplayName).toBe('Scientific Research')
179180
expect(fourthItemResponse.displayOrder).toBe(newFeaturedItems[3].displayOrder)
180181
expect(fourthItemResponse.id).toBeDefined()
181182

182183
expect(fifthItemResponse.type).toBe(DvObjectFeaturedItemType.DATASET)
183184
expect(fifthItemResponse.dvObjectIdentifier).toBe(testDatasetIds.persistentId)
185+
expect(fifthItemResponse.dvObjectDisplayName).toBe(
186+
'Dataset created using the createDataset use case'
187+
)
184188
expect(fifthItemResponse.displayOrder).toBe(newFeaturedItems[4].displayOrder)
185189
expect(fifthItemResponse.id).toBeDefined()
186190

187191
expect(sixthItemResponse.type).toBe(DvObjectFeaturedItemType.FILE)
188192
expect(sixthItemResponse.dvObjectIdentifier).toBe(featuredFileId.toString())
193+
expect(sixthItemResponse.dvObjectDisplayName).toBe(testTextFile1Name)
189194
expect(sixthItemResponse.displayOrder).toBe(newFeaturedItems[5].displayOrder)
190195
expect(sixthItemResponse.id).toBeDefined()
191196
})

test/integration/collections/CollectionsRepository.test.ts

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,25 +1295,22 @@ describe('CollectionsRepository', () => {
12951295
).rejects.toThrow(expectedError)
12961296
})
12971297

1298-
// TODO:ME - Fix from API. getting 500 error right now instead of 400
1299-
1300-
// eslint-disable-next-line jest/no-commented-out-tests
1301-
// it('should return error when the dvObjectIdentifier of a file does not exist', async () => {
1302-
// const invalidFileId = '99'
1303-
// const newFeaturedItems: DvObjectFeaturedItemDTO[] = [
1304-
// {
1305-
// type: DvObjectFeaturedItemType.FILE,
1306-
// dvObjectIdentifier: invalidFileId,
1307-
// displayOrder: 0
1308-
// }
1309-
// ]
1310-
// const expectedError = new WriteError(
1311-
// `[400] Cant find Collection, Dataset, or Datafile with identifier: ${invalidFileId}.`
1312-
// )
1313-
// await expect(
1314-
// sut.updateCollectionFeaturedItems(testCollectionAlias, newFeaturedItems)
1315-
// ).rejects.toThrow(expectedError)
1316-
// })
1298+
it('should return error when the dvObjectIdentifier of a file does not exist', async () => {
1299+
const invalidFileId = '99'
1300+
const newFeaturedItems: DvObjectFeaturedItemDTO[] = [
1301+
{
1302+
type: DvObjectFeaturedItemType.FILE,
1303+
dvObjectIdentifier: invalidFileId,
1304+
displayOrder: 0
1305+
}
1306+
]
1307+
const expectedError = new WriteError(
1308+
`[400] Cant find Collection, Dataset, or Datafile with identifier: ${invalidFileId}.`
1309+
)
1310+
await expect(
1311+
sut.updateCollectionFeaturedItems(testCollectionAlias, newFeaturedItems)
1312+
).rejects.toThrow(expectedError)
1313+
})
13171314

13181315
it('should return error when the collection to feature is not published', async () => {
13191316
const unpublishedCollectionAlias = 'unpublished-collection-featured-item-test'

test/testHelpers/collections/collectionFeaturedItemsHelper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ export const createCollectionFeaturedItemsModel = (): CollectionFeaturedItem[] =
142142
id: 3,
143143
type: DvObjectFeaturedItemType.DATASET,
144144
displayOrder: 3,
145-
dvObjectIdentifier: 'doi:10.5072/FK2/8YOKQI'
145+
dvObjectIdentifier: 'doi:10.5072/FK2/8YOKQI',
146+
dvObjectDisplayName: 'Dataset Title'
146147
}
147148
]
148149
}

0 commit comments

Comments
 (0)