resolve merge conflicts

ekraffmiller · ekraffmiller · commit 9060988722a9 · 2025-02-05T09:58:42.000-05:00
diff --git a/src/collections/domain/models/CollectionItemSubset.ts b/src/collections/domain/models/CollectionItemSubset.ts
@@ -6,6 +6,7 @@ export interface CollectionItemSubset {
   items: (CollectionPreview | DatasetPreview | FilePreview)[]
   facets: CollectionItemsFacet[]
   totalItemCount: number
+  countPerObjectType: CountPerObjectType
 }
 
 export interface CollectionItemsFacet {
@@ -18,3 +19,9 @@ interface CollectionItemsFacetLabel {
   name: string
   count: number
 }
+
+interface CountPerObjectType {
+  dataverses: number
+  datasets: number
+  files: number
+}
diff --git a/src/collections/infra/repositories/CollectionsRepository.ts b/src/collections/infra/repositories/CollectionsRepository.ts
@@ -57,7 +57,8 @@ export enum GetCollectionItemsQueryParams {
   PER_PAGE = 'per_page',
   START = 'start',
   TYPE = 'type',
-  FILTERQUERY = 'fq'
+  FILTERQUERY = 'fq',
+  SHOW_TYPE_COUNTS = 'show_type_counts'
 }
 
 export class CollectionsRepository extends ApiRepository implements ICollectionsRepository {
@@ -135,7 +136,8 @@ export class CollectionsRepository extends ApiRepository implements ICollections
       [GetCollectionItemsQueryParams.QUERY]: '*',
       [GetCollectionItemsQueryParams.SHOW_FACETS]: 'true',
       [GetCollectionItemsQueryParams.SORT]: SortType.DATE,
-      [GetCollectionItemsQueryParams.ORDER]: OrderType.DESC
+      [GetCollectionItemsQueryParams.ORDER]: OrderType.DESC,
+      [GetCollectionItemsQueryParams.SHOW_TYPE_COUNTS]: 'true'
     })
 
     if (collectionId) {
diff --git a/src/collections/infra/repositories/transformers/CollectionItemsCountPerObjectTypePayload.ts b/src/collections/infra/repositories/transformers/CollectionItemsCountPerObjectTypePayload.ts
@@ -0,0 +1,5 @@
+export interface CollectionItemsCountPerObjectTypePayload {
+  Dataverses: number
+  Datasets: number
+  Files: number
+}
diff --git a/src/collections/infra/repositories/transformers/collectionTransformers.ts b/src/collections/infra/repositories/transformers/collectionTransformers.ts
@@ -25,6 +25,7 @@ import { CollectionPreview } from '../../../domain/models/CollectionPreview'
 import { CollectionContact } from '../../../domain/models/CollectionContact'
 import { CollectionType } from '../../../domain/models/CollectionType'
 import { CollectionItemsFacetPayload } from './CollectionItemsFacetsPayload'
+import { CollectionItemsCountPerObjectTypePayload } from './CollectionItemsCountPerObjectTypePayload'
 
 export const transformCollectionResponseToCollection = (response: AxiosResponse): Collection => {
   const collectionPayload = response.data.data
@@ -84,6 +85,9 @@ export const transformCollectionItemsResponseToCollectionItemSubset = (
   const responseDataPayload = response.data.data
   const itemsPayload = responseDataPayload.items
   const facetsPayload = responseDataPayload.facets as CollectionItemsFacetPayload
+  const countPerObjectTypePayload = responseDataPayload[
+    'total_count_per_object_type'
+  ] as CollectionItemsCountPerObjectTypePayload
 
   const items: (DatasetPreview | FilePreview | CollectionPreview)[] = []
 
@@ -116,10 +120,17 @@ export const transformCollectionItemsResponseToCollectionItemSubset = (
     })
   )
 
+  const countPerObjectType = {
+    dataverses: countPerObjectTypePayload['Dataverses'],
+    datasets: countPerObjectTypePayload['Datasets'],
+    files: countPerObjectTypePayload['Files']
+  }
+
   return {
     items,
     facets,
-    totalItemCount: responseDataPayload.total_count
+    totalItemCount: responseDataPayload.total_count,
+    countPerObjectType
   }
 }
 
diff --git a/src/datasets/domain/models/Dataset.ts b/src/datasets/domain/models/Dataset.ts
@@ -55,6 +55,14 @@ export interface TermsOfAccess {
   contactForAccess?: string
   sizeOfCollection?: string
   studyCompletion?: string
+  termsOfUse?: string
+  confidentialityDeclaration?: string
+  specialPermissions?: string
+  restrictions?: string
+  citationRequirements?: string
+  depositorRequirements?: string
+  conditions?: string
+  disclaimer?: string
 }
 
 export interface TermsOfUse {
diff --git a/src/datasets/infra/repositories/transformers/DatasetPayload.ts b/src/datasets/infra/repositories/transformers/DatasetPayload.ts
@@ -24,6 +24,14 @@ export interface DatasetPayload {
   contactForAccess?: string
   sizeOfCollection?: string
   studyCompletion?: string
+  termsOfUse?: string
+  confidentialityDeclaration?: string
+  specialPermissions?: string
+  restrictions?: string
+  citationRequirements?: string
+  depositorRequirements?: string
+  conditions?: string
+  disclaimer?: string
   files: FilePayload[]
   isPartOf: OwnerNodePayload
 }
diff --git a/test/functional/datasets/GetDataset.test.ts b/test/functional/datasets/GetDataset.test.ts
@@ -1,8 +1,12 @@
 import { ApiConfig, createDataset, getDataset, ReadError } from '../../../src'
 import { DataverseApiAuthMechanism } from '../../../src/core/infra/repositories/ApiConfig'
 import { DatasetDescription } from '../../../src/datasets/domain/models/Dataset'
-import { deleteUnpublishedDatasetViaApi } from '../../testHelpers/datasets/datasetHelper'
+import {
+  createDatasetVersionPayload,
+  deleteUnpublishedDatasetViaApi
+} from '../../testHelpers/datasets/datasetHelper'
 import { TestConstants } from '../../testHelpers/TestConstants'
+import { transformVersionPayloadToDataset } from '../../../src/datasets/infra/repositories/transformers/datasetTransformers'
 
 const testNewDataset = {
   metadataBlockValues: [
@@ -94,13 +98,13 @@ describe('execute', () => {
     const versionPayload = createDatasetVersionPayload()
     versionPayload.termsOfAccess = 'Hello <b>world</b>'
     const dataset = transformVersionPayloadToDataset(versionPayload, false)
-    expect(dataset.termsOfUse.termsOfAccess.termsOfAccessForRestrictedFiles).toBe('Hello **world**')
+    expect(dataset.termsOfUse.termsOfAccess).toBe('Hello **world**')
   })
 
   test('should return terms of use fields in html format when keepRawFields is true', async () => {
     const versionPayload = createDatasetVersionPayload()
     const dataset = transformVersionPayloadToDataset(versionPayload, true)
-    expect(dataset.termsOfUse.termsOfAccess.contactForAccess).toBe(versionPayload.contactForAccess)
+    expect(dataset.termsOfUse.termsOfAccess).toBe(versionPayload.termsOfAccess)
   })
 
   test('should not return metadata fields in markdown format when keepRawFields is true', async () => {
diff --git a/test/functional/metadataBlocks/GetAllFacetableMetadataFields.test.ts b/test/functional/metadataBlocks/GetAllFacetableMetadataFields.test.ts
@@ -18,7 +18,7 @@ describe('execute', () => {
     } catch (error) {
       throw new Error('Should not raise an error')
     } finally {
-      expect(metadataFieldInfos?.length).toBe(59)
+      expect(metadataFieldInfos?.length).toBe(64)
       expect(metadataFieldInfos?.[0].name).toBe('authorName')
       expect(metadataFieldInfos?.[0].displayName).toBe('Author Name')
     }
diff --git a/test/functional/metadataBlocks/GetAllMetadataBlocks.test.ts b/test/functional/metadataBlocks/GetAllMetadataBlocks.test.ts
@@ -19,7 +19,7 @@ describe('execute', () => {
       throw new Error('Should not raise an error')
     } finally {
       expect(metadataBlocks).not.toBeNull()
-      expect(metadataBlocks?.length).toBe(6)
+      expect(metadataBlocks?.length).toBe(7)
       expect(metadataBlocks?.[0].metadataFields.title.name).toBe('title')
     }
   })
diff --git a/test/integration/collections/CollectionsRepository.test.ts b/test/integration/collections/CollectionsRepository.test.ts
@@ -425,6 +425,9 @@ describe('CollectionsRepository', () => {
       expect(actualCollectionPreview.type).toBe(CollectionItemType.COLLECTION)
 
       expect(actual.totalItemCount).toBe(3)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       expect(actual.facets).toEqual(expectedFacetsAll)
 
@@ -446,6 +449,9 @@ describe('CollectionsRepository', () => {
       )
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as FilePreview).name).toBe(expectedFileName)
+      expect(actual.countPerObjectType.dataverses).toBe(0)
+      expect(actual.countPerObjectType.datasets).toBe(0)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       const collectionSearchCriteriaForDataset = new CollectionSearchCriteria().withSearchText(
         'This is the description'
@@ -458,6 +464,9 @@ describe('CollectionsRepository', () => {
       )
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as DatasetPreview).title).toBe(expectedDatasetDescription)
+      expect(actual.countPerObjectType.dataverses).toBe(0)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       const collectionSearchCriteriaForDatasetAndCollection =
         new CollectionSearchCriteria().withSearchText('the')
@@ -470,6 +479,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(2)
       expect((actual.items[0] as DatasetPreview).title).toBe(expectedDatasetDescription)
       expect((actual.items[1] as CollectionPreview).name).toBe(expectedCollectionsName)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       // Test search text, limit and offset
       actual = await sut.getCollectionItems(
@@ -481,6 +493,9 @@ describe('CollectionsRepository', () => {
       expect(actual.items.length).toBe(1)
       expect(actual.totalItemCount).toBe(2)
       expect((actual.items[0] as CollectionPreview).name).toBe(expectedCollectionsName)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       // Test type collection
       const collectionSearchCriteriaForCollectionType =
@@ -495,6 +510,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as CollectionPreview).name).toBe(expectedCollectionsName)
       expect(actual.facets).toEqual(expectedFacetsFromCollectionOnly)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(0)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       // Test type dataset
       const collectionSearchCriteriaForDatasetType = new CollectionSearchCriteria().withItemTypes([
@@ -510,6 +528,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as DatasetPreview).title).toBe(expectedDatasetDescription)
       expect(actual.facets).toEqual(expectedFacetsFromDatasetOnly)
+      expect(actual.countPerObjectType.dataverses).toBe(0)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       // Test type file
       const collectionSearchCriteriaForFileType = new CollectionSearchCriteria().withItemTypes([
@@ -525,6 +546,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as FilePreview).name).toBe(expectedFileName)
       expect(actual.facets).toEqual(expectedFacetsFromFileOnly)
+      expect(actual.countPerObjectType.dataverses).toBe(0)
+      expect(actual.countPerObjectType.datasets).toBe(0)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       // Test multiple types
       const collectionSearchCriteriaForMultiTypes = new CollectionSearchCriteria().withItemTypes([
@@ -542,6 +566,9 @@ describe('CollectionsRepository', () => {
       expect((actual.items[0] as FilePreview).name).toBe(expectedFileName)
       expect((actual.items[1] as CollectionPreview).name).toBe(expectedCollectionsName)
       expect(actual.facets).toEqual(expectedFacetsFromCollectionAndFile)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(0)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       // Test Sort by name ascending
       const collectionSearchCriteriaNameAscending = new CollectionSearchCriteria()
@@ -559,6 +586,9 @@ describe('CollectionsRepository', () => {
       expect((actual.items[0] as DatasetPreview).type).toBe(CollectionItemType.DATASET)
       expect((actual.items[1] as CollectionPreview).type).toBe(CollectionItemType.COLLECTION)
       expect((actual.items[2] as FilePreview).type).toBe(CollectionItemType.FILE)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       // Test Sort by name descending
       const collectionSearchCriteriaNameDescending = new CollectionSearchCriteria()
@@ -576,6 +606,9 @@ describe('CollectionsRepository', () => {
       expect((actual.items[0] as FilePreview).type).toBe(CollectionItemType.FILE)
       expect((actual.items[1] as CollectionPreview).type).toBe(CollectionItemType.COLLECTION)
       expect((actual.items[2] as DatasetPreview).type).toBe(CollectionItemType.DATASET)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       // Test Sort by date ascending
       const collectionSearchCriteriaDateAscending = new CollectionSearchCriteria()
@@ -593,6 +626,9 @@ describe('CollectionsRepository', () => {
       expect((actual.items[0] as CollectionPreview).type).toBe(CollectionItemType.COLLECTION)
       expect((actual.items[1] as DatasetPreview).type).toBe(CollectionItemType.DATASET)
       expect((actual.items[2] as FilePreview).type).toBe(CollectionItemType.FILE)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       // Test Sort by date descending
       const collectionSearchCriteriaDateDescending = new CollectionSearchCriteria()
@@ -610,6 +646,9 @@ describe('CollectionsRepository', () => {
       expect((actual.items[0] as FilePreview).type).toBe(CollectionItemType.FILE)
       expect((actual.items[1] as DatasetPreview).type).toBe(CollectionItemType.DATASET)
       expect((actual.items[2] as CollectionPreview).type).toBe(CollectionItemType.COLLECTION)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(1)
 
       // Test with Filter query related to the collection
       const collectionSearchCriteriaFilterQueryCollection =
@@ -625,6 +664,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as CollectionPreview).name).toBe(expectedCollectionsName)
       expect(actual.facets).toEqual(expectedFacetsFromCollectionOnly)
+      expect(actual.countPerObjectType.dataverses).toBe(1)
+      expect(actual.countPerObjectType.datasets).toBe(0)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       // Test with Filter query related to the dataset
       const collectionSearchCriteriaFilterQueryDataset =
@@ -642,6 +684,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as DatasetPreview).title).toBe(expectedDatasetDescription)
       expect(actual.facets).toEqual(expectedFacetsFromDatasetOnly)
+      expect(actual.countPerObjectType.dataverses).toBe(0)
+      expect(actual.countPerObjectType.datasets).toBe(1)
+      expect(actual.countPerObjectType.files).toBe(0)
 
       // Test with Filter query related to the file
       const collectionSearchCriteriaFilterQuerieCollAndFile =
@@ -658,6 +703,9 @@ describe('CollectionsRepository', () => {
       expect(actual.totalItemCount).toBe(1)
       expect((actual.items[0] as FilePreview).name).toBe(expectedFileName)
       expect(actual.facets).toEqual(expectedFacetsFromFileOnly)
+      expect(actual.countPerObjectType.dataverses).toBe(0)
+      expect(actual.countPerObjectType.datasets).toBe(0)
+      expect(actual.countPerObjectType.files).toBe(1)
     })
 
     test('should return error when collection does not exist', async () => {
diff --git a/test/integration/metadataBlocks/MetadataBlocksRepository.test.ts b/test/integration/metadataBlocks/MetadataBlocksRepository.test.ts
@@ -59,7 +59,7 @@ describe('MetadataBlocksRepository', () => {
   describe('getAllMetadataBlocks', () => {
     test('should return all metadata blocks', async () => {
       const actual = await sut.getAllMetadataBlocks()
-      expect(actual.length).toBe(6)
+      expect(actual.length).toBe(7)
       expect(actual[0].name).toBe(citationMetadataBlockName)
       expect(actual[0].metadataFields.title.name).toBe('title')
     })
diff --git a/test/integration/metadataBlocks/MetadataFieldsInfoRepository.test.ts b/test/integration/metadataBlocks/MetadataFieldsInfoRepository.test.ts
@@ -19,7 +19,7 @@ describe('getAllFacetableMetadataFields', () => {
   test('should return all facetable metadata fields', async () => {
     const actual = await sut.getAllFacetableMetadataFields()
 
-    expect(actual.length).toBe(59)
+    expect(actual.length).toBe(64)
     expect(actual[0].name).toBe('authorName')
     expect(actual[0].displayName).toBe('Author Name')
   })
diff --git a/test/testHelpers/datasets/datasetHelper.ts b/test/testHelpers/datasets/datasetHelper.ts
@@ -99,17 +99,6 @@ export const createDatasetModel = (
   }
   if (license !== undefined) {
     datasetModel.license = license
-  } else {
-    datasetModel.termsOfUse.customTerms = {
-      termsOfUse: 'Terms of use',
-      confidentialityDeclaration: 'Confidentiality declaration',
-      specialPermissions: 'Special permissions',
-      restrictions: 'Restrictions',
-      citationRequirements: 'Citation requirements',
-      depositorRequirements: 'Depositor requirements',
-      conditions: 'Conditions',
-      disclaimer: 'Disclaimer'
-    }
   }
   if (addOptionalParameters) {
     datasetModel.alternativePersistentId = 'doi:10.5072/FK2/HC6KTB'
diff --git a/test/unit/collections/CollectionsRepository.test.ts b/test/unit/collections/CollectionsRepository.test.ts
diff --git a/test/unit/collections/GetCollectionItems.test.ts b/test/unit/collections/GetCollectionItems.test.ts

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ describe('execute', () => {`
`18`	`18`	`} catch (error) {`
`19`	`19`	`throw new Error('Should not raise an error')`
`20`	`20`	`} finally {`
`21`		`- expect(metadataFieldInfos?.length).toBe(59)`
	`21`	`+ expect(metadataFieldInfos?.length).toBe(64)`
`22`	`22`	`expect(metadataFieldInfos?.[0].name).toBe('authorName')`
`23`	`23`	`expect(metadataFieldInfos?.[0].displayName).toBe('Author Name')`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ describe('execute', () => {`
`19`	`19`	`throw new Error('Should not raise an error')`
`20`	`20`	`} finally {`
`21`	`21`	`expect(metadataBlocks).not.toBeNull()`
`22`		`- expect(metadataBlocks?.length).toBe(6)`
	`22`	`+ expect(metadataBlocks?.length).toBe(7)`
`23`	`23`	`expect(metadataBlocks?.[0].metadataFields.title.name).toBe('title')`
`24`	`24`	`}`
`25`	`25`	`})`