resolve merge conflicts

Author: ekraffmiller

CHANGELOG.md

@@ -8,6 +8,8 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
 
 ### Added
 
+- New Use Case: [Get Collections For Linking Use Case](./docs/useCases.md#get-collections-for-linking).
+
 - In GetAllNotificationsByUser use case, added support for filtering unread messages and pagination.
 
 ### Changed

docs/useCases.md

@@ -16,6 +16,7 @@ The different use cases currently available in the package are classified below,
     - [List All Collection Items](#list-all-collection-items)
     - [List My Data Collection Items](#list-my-data-collection-items)
     - [Get Collection Featured Items](#get-collection-featured-items)
+    - [Get Collections for Linking](#get-collections-for-linking)
   - [Collections write use cases](#collections-write-use-cases)
     - [Create a Collection](#create-a-collection)
     - [Update a Collection](#update-a-collection)
@@ -336,6 +337,69 @@ The `collectionIdOrAlias` is a generic collection identifier, which can be eithe
 
 If no collection identifier is specified, the default collection identifier; `:root` will be used. If you want to search for a different collection, you must add the collection identifier as a parameter in the use case call.
 
+#### Get Collections for Linking
+
+Returns an array of [CollectionSummary](../src/collections/domain/models/CollectionSummary.ts) (id, alias, displayName) representing the Dataverse collections to which a given Dataverse collection or Dataset may be linked.
+
+This use case supports an optional `searchTerm` to filter by collection name.
+
+##### Example calls:
+
+```typescript
+import { getCollectionsForLinking } from '@iqss/dataverse-client-javascript'
+
+/* ... */
+
+// Case 1: For a given Dataverse collection (by numeric id or alias)
+const collectionIdOrAlias: number | string = 'collectionAlias' // or 123
+const searchTerm = 'searchOn'
+
+getCollectionsForLinking
+  .execute('collection', collectionIdOrAlias, searchTerm)
+  .then((collections) => {
+    // collections: CollectionSummary[]
+    /* ... */
+  })
+  .catch((error: Error) => {
+    /* ... */
+  })
+
+/* ... */
+
+// Case 2: For a given Dataset (by persistent identifier)
+const persistentId = 'doi:10.5072/FK2/J8SJZB'
+
+getCollectionsForLinking
+  .execute('dataset', persistentId, searchTerm)
+  .then((collections) => {
+    // collections: CollectionSummary[]
+    /* ... */
+  })
+  .catch((error: Error) => {
+    /* ... */
+  })
+
+// Case 3: [alreadyLinked] Optional flag. When true, returns collections currently linked (candidates to unlink). Defaults to false.
+const alreadyLinked = true
+
+getCollectionsForLinking
+  .execute('dataset', persistentId, searchTerm, alreadyLinked)
+  .then((collections) => {
+    // collections: CollectionSummary[]
+    /* ... */
+  })
+  .catch((error: Error) => {
+    /* ... */
+  })
+```
+
+_See [use case](../src/collections/domain/useCases/GetCollectionsForLinking.ts) implementation_.
+
+Notes:
+
+- When the first argument is `'collection'`, the second argument can be a numeric collection id or a collection alias.
+- When the first argument is `'dataset'`, the second argument must be the dataset persistent identifier string (e.g., `doi:...`).
+
 ### Collections Write Use Cases
 
 #### Create a Collection

src/collections/domain/repositories/ICollectionsRepository.ts

@@ -10,6 +10,8 @@ import { CollectionUserPermissions } from '../models/CollectionUserPermissions'
 import { PublicationStatus } from '../../../core/domain/models/PublicationStatus'
 import { CollectionItemType } from '../../../collections/domain/models/CollectionItemType'
 import { CollectionLinks } from '../models/CollectionLinks'
+import { CollectionSummary } from '../models/CollectionSummary'
+import { LinkingObjectType } from '../useCases/GetCollectionsForLinking'
 
 export interface ICollectionsRepository {
   getCollection(collectionIdOrAlias: number | string): Promise<Collection>
@@ -60,4 +62,10 @@ export interface ICollectionsRepository {
     linkingCollectionIdOrAlias: number | string
   ): Promise<void>
   getCollectionLinks(collectionIdOrAlias: number | string): Promise<CollectionLinks>
+  getCollectionsForLinking(
+    objectType: LinkingObjectType,
+    id: number | string,
+    searchTerm: string,
+    alreadyLinked: boolean
+  ): Promise<CollectionSummary[]>
 }

src/collections/domain/useCases/GetCollectionsForLinking.ts

@@ -0,0 +1,34 @@
+import { UseCase } from '../../../core/domain/useCases/UseCase'
+import { ICollectionsRepository } from '../repositories/ICollectionsRepository'
+import { CollectionSummary } from '../models/CollectionSummary'
+
+export type LinkingObjectType = 'collection' | 'dataset'
+
+export class GetCollectionsForLinking implements UseCase<CollectionSummary[]> {
+  private collectionsRepository: ICollectionsRepository
+
+  constructor(collectionsRepository: ICollectionsRepository) {
+    this.collectionsRepository = collectionsRepository
+  }
+
+  /**
+   * Returns an array of CollectionSummary (id, alias, displayName) to which the given Dataverse collection or Dataset may be linked.
+   * @param objectType - 'collection' when providing a collection identifier/alias; 'dataset' when providing a dataset persistentId.
+   * @param id - For objectType 'collection', a numeric id or alias string. For 'dataset', the persistentId string (e.g., doi:...)
+   * @param searchTerm - Optional search term to filter by collection name. Defaults to empty string (no filtering).
+   * @param alreadyLinked - Optional flag. When true, returns collections currently linked (candidates to unlink). Defaults to false.
+   */
+  async execute(
+    objectType: LinkingObjectType,
+    id: number | string,
+    searchTerm = '',
+    alreadyLinked = false
+  ): Promise<CollectionSummary[]> {
+    return await this.collectionsRepository.getCollectionsForLinking(
+      objectType,
+      id,
+      searchTerm,
+      alreadyLinked
+    )
+  }
+}

src/collections/index.ts

@@ -15,6 +15,7 @@ import { DeleteCollectionFeaturedItem } from './domain/useCases/DeleteCollection
 import { LinkCollection } from './domain/useCases/LinkCollection'
 import { UnlinkCollection } from './domain/useCases/UnlinkCollection'
 import { GetCollectionLinks } from './domain/useCases/GetCollectionLinks'
+import { GetCollectionsForLinking } from './domain/useCases/GetCollectionsForLinking'
 
 const collectionsRepository = new CollectionsRepository()
 
@@ -34,6 +35,7 @@ const deleteCollectionFeaturedItem = new DeleteCollectionFeaturedItem(collection
 const linkCollection = new LinkCollection(collectionsRepository)
 const unlinkCollection = new UnlinkCollection(collectionsRepository)
 const getCollectionLinks = new GetCollectionLinks(collectionsRepository)
+const getCollectionsForLinking = new GetCollectionsForLinking(collectionsRepository)
 
 export {
   getCollection,
@@ -51,7 +53,8 @@ export {
   deleteCollectionFeaturedItem,
   linkCollection,
   unlinkCollection,
-  getCollectionLinks
+  getCollectionLinks,
+  getCollectionsForLinking
 }
 export { Collection, CollectionInputLevel } from './domain/models/Collection'
 export { CollectionFacet } from './domain/models/CollectionFacet'
@@ -62,3 +65,4 @@ export { CollectionItemType } from './domain/models/CollectionItemType'
 export { CollectionSearchCriteria } from './domain/models/CollectionSearchCriteria'
 export { FeaturedItem } from './domain/models/FeaturedItem'
 export { FeaturedItemsDTO } from './domain/dtos/FeaturedItemsDTO'
+export { CollectionSummary } from './domain/models/CollectionSummary'

src/collections/infra/repositories/CollectionsRepository.ts

@@ -38,6 +38,8 @@ import { ApiConstants } from '../../../core/infra/repositories/ApiConstants'
 import { PublicationStatus } from '../../../core/domain/models/PublicationStatus'
 import { ReadError } from '../../../core/domain/repositories/ReadError'
 import { CollectionLinks } from '../../domain/models/CollectionLinks'
+import { CollectionSummary } from '../../domain/models/CollectionSummary'
+import { LinkingObjectType } from '../../domain/useCases/GetCollectionsForLinking'
 
 export interface NewCollectionRequestPayload {
   alias: string
@@ -93,7 +95,6 @@ export enum GetMyDataCollectionItemsQueryParams {
 
 export class CollectionsRepository extends ApiRepository implements ICollectionsRepository {
   private readonly collectionsResourceName: string = 'dataverses'
-
   public async getCollection(
     collectionIdOrAlias: number | string = ROOT_COLLECTION_ID
   ): Promise<Collection> {
@@ -485,4 +486,46 @@ export class CollectionsRepository extends ApiRepository implements ICollections
         throw error
       })
   }
+
+  public async getCollectionsForLinking(
+    objectType: LinkingObjectType,
+    id: number | string,
+    searchTerm: string,
+    alreadyLinked: boolean
+  ): Promise<CollectionSummary[]> {
+    let path: string
+    const queryParams = new URLSearchParams()
+    if (objectType === 'collection') {
+      path = `/${this.collectionsResourceName}/${id}/dataverse/linkingDataverses`
+    } else {
+      path = `/${this.collectionsResourceName}/:persistentId/dataset/linkingDataverses`
+      queryParams.set('persistentId', String(id))
+    }
+
+    if (searchTerm) {
+      queryParams.set('searchTerm', searchTerm)
+    }
+
+    if (alreadyLinked) {
+      queryParams.set('alreadyLinking', 'true')
+    }
+
+    return this.doGet(path, true, queryParams)
+      .then((response) => {
+        const payload = response.data.data as {
+          id: number
+          alias: string
+          name: string
+        }[]
+
+        return payload.map((item) => ({
+          id: item.id,
+          alias: item.alias,
+          displayName: item.name
+        }))
+      })
+      .catch((error) => {
+        throw error
+      })
+  }
 }

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

@@ -159,7 +159,13 @@ export const transformCollectionLinksResponseToCollectionLinks = (
   const responseDataPayload = response.data.data
   const linkedCollections = responseDataPayload.linkedDataverses
   const collectionsLinkingToThis = responseDataPayload.dataversesLinkingToThis
-  const linkedDatasets = responseDataPayload.linkedDatasets
+  const linkedDatasets = responseDataPayload.linkedDatasets.map(
+    (ld: { identifier: string; title: string }) => ({
+      persistentId: ld.identifier,
+      title: ld.title
+    })
+  )
+
   return {
     linkedCollections,
     collectionsLinkingToThis,

src/datasets/domain/dtos/DatasetTypeDTO.ts

@@ -0,0 +1,3 @@
+import { DatasetType } from '../models/DatasetType'
+
+export type DatasetTypeDTO = Omit<DatasetType, 'id'>

src/datasets/domain/models/DatasetType.ts

@@ -1,5 +1,5 @@
 export interface DatasetType {
-  id?: number
+  id: number
   name: string
   linkedMetadataBlocks?: string[]
   availableLicenses?: string[]

src/datasets/domain/repositories/IDatasetsRepository.ts

@@ -14,6 +14,7 @@ import { CitationFormat } from '../models/CitationFormat'
 import { FormattedCitation } from '../models/FormattedCitation'
 import { DatasetTemplate } from '../models/DatasetTemplate'
 import { DatasetType } from '../models/DatasetType'
+import { DatasetTypeDTO } from '../dtos/DatasetTypeDTO'
 
 export interface IDatasetsRepository {
   getDataset(
@@ -67,8 +68,8 @@ export interface IDatasetsRepository {
   ): Promise<DatasetDownloadCount>
   getDatasetVersionsSummaries(datasetId: number | string): Promise<DatasetVersionSummaryInfo[]>
   deleteDatasetDraft(datasetId: number | string): Promise<void>
-  linkDataset(datasetId: number, collectionAlias: string): Promise<void>
-  unlinkDataset(datasetId: number, collectionAlias: string): Promise<void>
+  linkDataset(datasetId: number | string, collectionIdOrAlias: number | string): Promise<void>
+  unlinkDataset(datasetId: number | string, collectionIdOrAlias: number | string): Promise<void>
   getDatasetLinkedCollections(datasetId: number | string): Promise<DatasetLinkedCollection[]>
   getDatasetAvailableCategories(datasetId: number | string): Promise<string[]>
   getDatasetCitationInOtherFormats(
@@ -80,7 +81,7 @@ export interface IDatasetsRepository {
   getDatasetTemplates(collectionIdOrAlias: number | string): Promise<DatasetTemplate[]>
   getDatasetAvailableDatasetTypes(): Promise<DatasetType[]>
   getDatasetAvailableDatasetType(datasetTypeId: number | string): Promise<DatasetType>
-  addDatasetType(datasetType: DatasetType): Promise<DatasetType>
+  addDatasetType(datasetType: DatasetTypeDTO): Promise<DatasetType>
   linkDatasetTypeWithMetadataBlocks(
     datasetTypeId: number | string,
     metadataBlocks: string[]