Skip to content

Commit 5b0b8cd

Browse files
authored
Merge pull request #145 from IQSS/140-transform-html-to-markdown
140 transform html to markdown for Collection description
2 parents 53a5623 + 68760c1 commit 5b0b8cd

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Collection } from '../../../domain/models/Collection'
22
import { AxiosResponse } from 'axios'
33
import { CollectionPayload } from './CollectionPayload'
44
import { transformPayloadToOwnerNode } from '../../../../core/infra/repositories/transformers/dvObjectOwnerNodeTransformer'
5+
import { transformHtmlToMarkdown } from '../../../../datasets/infra/repositories/transformers/datasetTransformers'
56

67
export const transformCollectionResponseToCollection = (response: AxiosResponse): Collection => {
78
const collectionPayload = response.data.data
@@ -14,7 +15,7 @@ const transformPayloadToCollection = (collectionPayload: CollectionPayload): Col
1415
alias: collectionPayload.alias,
1516
name: collectionPayload.name,
1617
affiliation: collectionPayload.affiliation,
17-
description: collectionPayload.description,
18+
description: transformHtmlToMarkdown(collectionPayload.description),
1819
...(collectionPayload.isPartOf && {
1920
isPartOf: transformPayloadToOwnerNode(collectionPayload.isPartOf)
2021
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,6 @@ const transformPayloadToDatasetMetadataSubfieldValue = (
141141
return result
142142
}
143143

144-
const transformHtmlToMarkdown = (source: string): string => {
144+
export const transformHtmlToMarkdown = (source: string): string => {
145145
return turndownService.turndown(source)
146146
}

test/testHelpers/collections/collectionHelper.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ const COLLECTION_ID = 11111
66
const COLLECTION_ALIAS_STR = 'secondCollection'
77
const COLLECTION_NAME_STR = 'Laboratory Research'
88
const COLLECTION_AFFILIATION_STR = 'Laboratory Research Corporation'
9-
const COLLECTION_DESCRIPTION_STR = 'This is an example collection used for testing.'
10-
9+
const COLLECTION_DESCRIPTION_HTML = 'This is an <b>example</b> collection used for testing.'
10+
const COLLECTION_DESCRIPTION_MARKDOWN = 'This is an **example** collection used for testing.'
1111
export const createCollectionModel = (): Collection => {
1212
const collectionModel: Collection = {
1313
id: COLLECTION_ID,
1414
alias: COLLECTION_ALIAS_STR,
1515
name: COLLECTION_NAME_STR,
1616
affiliation: COLLECTION_AFFILIATION_STR,
17-
description: COLLECTION_DESCRIPTION_STR,
17+
description: COLLECTION_DESCRIPTION_MARKDOWN,
1818
isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }
1919
}
2020
return collectionModel
@@ -26,7 +26,7 @@ export const createCollectionPayload = (): CollectionPayload => {
2626
alias: COLLECTION_ALIAS_STR,
2727
name: COLLECTION_NAME_STR,
2828
affiliation: COLLECTION_AFFILIATION_STR,
29-
description: COLLECTION_DESCRIPTION_STR,
29+
description: COLLECTION_DESCRIPTION_HTML,
3030
isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }
3131
}
3232
return collectionPayload

test/unit/collections/CollectionsRepository.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('CollectionsRepository', () => {
4545
const actual = await sut.getCollection(testCollectionModel.id)
4646

4747
expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
48-
expect(actual).toStrictEqual(testCollectionModel)
48+
expect(actual).toStrictEqual(createCollectionModel())
4949
})
5050

5151
test('should return error on repository read error', async () => {
@@ -68,7 +68,7 @@ describe('CollectionsRepository', () => {
6868
const actual = await sut.getCollection(testCollectionModel.alias)
6969

7070
expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
71-
expect(actual).toStrictEqual(testCollectionModel)
71+
expect(actual).toStrictEqual(createCollectionModel())
7272
})
7373

7474
test('should return error on repository read error', async () => {
@@ -91,7 +91,7 @@ describe('CollectionsRepository', () => {
9191
const actual = await sut.getCollection()
9292

9393
expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
94-
expect(actual).toStrictEqual(testCollectionModel)
94+
expect(actual).toStrictEqual(createCollectionModel())
9595
})
9696

9797
test('should return error on repository read error', async () => {

0 commit comments

Comments
 (0)