Merge branch 'develop' into 138-dataset-cleanup-before-after-functional-and-it-run

Author: GPortas

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

@@ -2,6 +2,7 @@ import { Collection } from '../../../domain/models/Collection'
 import { AxiosResponse } from 'axios'
 import { CollectionPayload } from './CollectionPayload'
 import { transformPayloadToOwnerNode } from '../../../../core/infra/repositories/transformers/dvObjectOwnerNodeTransformer'
+import { transformHtmlToMarkdown } from '../../../../datasets/infra/repositories/transformers/datasetTransformers'
 
 export const transformCollectionResponseToCollection = (response: AxiosResponse): Collection => {
   const collectionPayload = response.data.data
@@ -14,7 +15,7 @@ const transformPayloadToCollection = (collectionPayload: CollectionPayload): Col
     alias: collectionPayload.alias,
     name: collectionPayload.name,
     affiliation: collectionPayload.affiliation,
-    description: collectionPayload.description,
+    description: transformHtmlToMarkdown(collectionPayload.description),
     ...(collectionPayload.isPartOf && {
       isPartOf: transformPayloadToOwnerNode(collectionPayload.isPartOf)
     })

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

@@ -141,6 +141,6 @@ const transformPayloadToDatasetMetadataSubfieldValue = (
   return result
 }
 
-const transformHtmlToMarkdown = (source: string): string => {
+export const transformHtmlToMarkdown = (source: string): string => {
   return turndownService.turndown(source)
 }

test/testHelpers/collections/collectionHelper.ts

@@ -10,7 +10,9 @@ const COLLECTION_ID = 11111
 const COLLECTION_ALIAS_STR = 'secondCollection'
 const COLLECTION_NAME_STR = 'Laboratory Research'
 const COLLECTION_AFFILIATION_STR = 'Laboratory Research Corporation'
-const COLLECTION_DESCRIPTION_STR = 'This is an example collection used for testing.'
+
+const COLLECTION_DESCRIPTION_HTML = 'This is an <b>example</b> collection used for testing.'
+const COLLECTION_DESCRIPTION_MARKDOWN = 'This is an **example** collection used for testing.'
 
 const DATAVERSE_API_REQUEST_HEADERS = {
   headers: { 'Content-Type': 'application/json', 'X-Dataverse-Key': process.env.TEST_API_KEY }
@@ -22,7 +24,7 @@ export const createCollectionModel = (): Collection => {
     alias: COLLECTION_ALIAS_STR,
     name: COLLECTION_NAME_STR,
     affiliation: COLLECTION_AFFILIATION_STR,
-    description: COLLECTION_DESCRIPTION_STR,
+    description: COLLECTION_DESCRIPTION_MARKDOWN,
     isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }
   }
   return collectionModel
@@ -34,7 +36,7 @@ export const createCollectionPayload = (): CollectionPayload => {
     alias: COLLECTION_ALIAS_STR,
     name: COLLECTION_NAME_STR,
     affiliation: COLLECTION_AFFILIATION_STR,
-    description: COLLECTION_DESCRIPTION_STR,
+    description: COLLECTION_DESCRIPTION_HTML,
     isPartOf: { type: DvObjectType.DATAVERSE, identifier: 'root', displayName: 'Root' }
   }
   return collectionPayload

test/unit/collections/CollectionsRepository.test.ts

@@ -46,7 +46,7 @@ describe('CollectionsRepository', () => {
         const actual = await sut.getCollection(testCollectionModel.id)
 
         expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
-        expect(actual).toStrictEqual(testCollectionModel)
+        expect(actual).toStrictEqual(createCollectionModel())
       })
 
       test('should return error on repository read error', async () => {
@@ -69,7 +69,7 @@ describe('CollectionsRepository', () => {
         const actual = await sut.getCollection(testCollectionModel.alias)
 
         expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
-        expect(actual).toStrictEqual(testCollectionModel)
+        expect(actual).toStrictEqual(createCollectionModel())
       })
 
       test('should return error on repository read error', async () => {
@@ -92,7 +92,7 @@ describe('CollectionsRepository', () => {
         const actual = await sut.getCollection()
 
         expect(axios.get).toHaveBeenCalledWith(expectedApiEndpoint, expectedRequestConfigApiKey)
-        expect(actual).toStrictEqual(testCollectionModel)
+        expect(actual).toStrictEqual(createCollectionModel())
       })
 
       test('should return error on repository read error', async () => {