Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel

### Changed

- Add pagination query parameters to Dataset Version Summeries and File Version Summaries use cases

### Fixed

### Removed
Expand Down
15 changes: 10 additions & 5 deletions docs/useCases.md
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ The `DatasetPreviewSubset`returned instance contains a property called `totalDat

#### Get Dataset Versions Summaries

Returns an array of [DatasetVersionSummaryInfo](../src/datasets/domain/models/DatasetVersionSummaryInfo.ts) that contains information about what changed in every specific version.
Returns the total count of versions and an array of [DatasetVersionSummaryInfo](../src/datasets/domain/models/DatasetVersionSummaryInfo.ts) that contains information about what changed in every specific version.

##### Example call:

Expand All @@ -885,7 +885,7 @@ const datasetId = 'doi:10.77777/FK2/AAAAAA'

getDatasetVersionsSummaries
.execute(datasetId)
.then((datasetVersionsSummaries: DatasetVersionSummaryInfo[]) => {
.then((datasetVersionsSummaries: DatasetVersionSummarySubset) => {
/* ... */
})

Expand All @@ -894,7 +894,9 @@ getDatasetVersionsSummaries

_See [use case](../src/datasets/domain/useCases/GetDatasetVersionsSummaries.ts) implementation_.

The `datasetId` parameter can be a string, for persistent identifiers, or a number, for numeric identifiers.
- The `datasetId` parameter can be a string, for persistent identifiers, or a number, for numeric identifiers.
- **limit**: (number) Limit for pagination.
- **offset**: (number) Offset for pagination.

#### Get Dataset Linked Collections

Expand Down Expand Up @@ -2000,7 +2002,7 @@ The `fileId` parameter can be a string, for persistent identifiers, or a number,

#### Get File Version Summaries

Get the file versions summaries, return a list of summaries for each version
Get the file versions summaries, return a total count of versions and a list of summaries for each version

##### Example call:

Expand All @@ -2011,7 +2013,7 @@ import { getFileVersionSummaries } from '@iqss/dataverse-client-javascript'

const fileId = 1

getFileVersionSummaries.execute(fileId).then((fileVersionSummaries: fileVersionSummaryInfo[]) => {
getFileVersionSummaries.execute(fileId).then((fileVersionSummaries: fileVersionSummarySubset) => {
/* ... */
})

Expand All @@ -2020,6 +2022,9 @@ getFileVersionSummaries.execute(fileId).then((fileVersionSummaries: fileVersionS

_See [use case](../src/files/domain/useCases/GetFileVersionSummaries.ts) implementation_.

- **limit**: (number) Limit for pagination.
- **offset**: (number) Offset for pagination.

## Metadata Blocks

### Metadata Blocks read use cases
Expand Down
5 changes: 5 additions & 0 deletions src/datasets/domain/models/DatasetVersionSummaryInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ export interface DatasetVersionSummaryInfo {
publishedOn?: string
}

export interface DatasetVersionSummarySubset {
summaries: DatasetVersionSummaryInfo[]
totalCount: number
}

export type DatasetVersionSummary = {
[key: string]:
| SummaryUpdates
Expand Down
8 changes: 6 additions & 2 deletions src/datasets/domain/repositories/IDatasetsRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { DatasetDeaccessionDTO } from '../dtos/DatasetDeaccessionDTO'
import { MetadataBlock } from '../../../metadataBlocks'
import { DatasetVersionDiff } from '../models/DatasetVersionDiff'
import { DatasetDownloadCount } from '../models/DatasetDownloadCount'
import { DatasetVersionSummaryInfo } from '../models/DatasetVersionSummaryInfo'
import { DatasetVersionSummarySubset } from '../models/DatasetVersionSummaryInfo'
import { DatasetLinkedCollection } from '../models/DatasetLinkedCollection'
import { CitationFormat } from '../models/CitationFormat'
import { FormattedCitation } from '../models/FormattedCitation'
Expand Down Expand Up @@ -66,7 +66,11 @@ export interface IDatasetsRepository {
datasetId: number | string,
includeMDC?: boolean
): Promise<DatasetDownloadCount>
getDatasetVersionsSummaries(datasetId: number | string): Promise<DatasetVersionSummaryInfo[]>
getDatasetVersionsSummaries(
datasetId: number | string,
limit?: number,
offset?: number
): Promise<DatasetVersionSummarySubset>
deleteDatasetDraft(datasetId: number | string): Promise<void>
linkDataset(datasetId: number | string, collectionIdOrAlias: number | string): Promise<void>
unlinkDataset(datasetId: number | string, collectionIdOrAlias: number | string): Promise<void>
Expand Down
16 changes: 11 additions & 5 deletions src/datasets/domain/useCases/GetDatasetVersionsSummaries.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { UseCase } from '../../../core/domain/useCases/UseCase'
import { DatasetVersionSummaryInfo } from '../models/DatasetVersionSummaryInfo'
import { DatasetVersionSummarySubset } from '../models/DatasetVersionSummaryInfo'
import { IDatasetsRepository } from '../repositories/IDatasetsRepository'

export class GetDatasetVersionsSummaries implements UseCase<DatasetVersionSummaryInfo[]> {
export class GetDatasetVersionsSummaries implements UseCase<DatasetVersionSummarySubset> {
private datasetsRepository: IDatasetsRepository

constructor(datasetsRepository: IDatasetsRepository) {
Expand All @@ -14,9 +14,15 @@ export class GetDatasetVersionsSummaries implements UseCase<DatasetVersionSummar
* Draft versions will only be available to users who have permission to view unpublished drafts.
*
* @param {number | string} [datasetId] - The dataset identifier, which can be a string (for persistent identifiers), or a number (for numeric identifiers).
* @returns {Promise<DatasetVersionSummaryInfo[]>} - An array of DatasetVersionSummaryInfo.
* @param {number} [limit] - Limit for pagination (optional).
* @param {number} [offset] - Offset for pagination (optional).
* @returns {Promise<DatasetVersionSummarySubset>} - A DatasetVersionSummarySubset containing the summaries and total count.
*/
async execute(datasetId: number | string): Promise<DatasetVersionSummaryInfo[]> {
return await this.datasetsRepository.getDatasetVersionsSummaries(datasetId)
async execute(
datasetId: number | string,
limit?: number,
offset?: number
): Promise<DatasetVersionSummarySubset> {
return await this.datasetsRepository.getDatasetVersionsSummaries(datasetId, limit, offset)
}
}
3 changes: 2 additions & 1 deletion src/datasets/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ export { CreatedDatasetIdentifiers } from './domain/models/CreatedDatasetIdentif
export { VersionUpdateType } from './domain/models/Dataset'
export {
DatasetVersionSummaryInfo,
DatasetVersionSummaryStringValues
DatasetVersionSummaryStringValues,
DatasetVersionSummarySubset
} from './domain/models/DatasetVersionSummaryInfo'
export { DatasetLinkedCollection } from './domain/models/DatasetLinkedCollection'
export { DatasetType } from './domain/models/DatasetType'
Expand Down
26 changes: 21 additions & 5 deletions src/datasets/infra/repositories/DatasetsRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { transformDatasetPreviewsResponseToDatasetPreviewSubset } from './transf
import { DatasetVersionDiff } from '../../domain/models/DatasetVersionDiff'
import { transformDatasetVersionDiffResponseToDatasetVersionDiff } from './transformers/datasetVersionDiffTransformers'
import { DatasetDownloadCount } from '../../domain/models/DatasetDownloadCount'
import { DatasetVersionSummaryInfo } from '../../domain/models/DatasetVersionSummaryInfo'
import { DatasetVersionSummarySubset } from '../../domain/models/DatasetVersionSummaryInfo'
import { DatasetLinkedCollection } from '../../domain/models/DatasetLinkedCollection'
import { CitationFormat } from '../../domain/models/CitationFormat'
import { transformDatasetLinkedCollectionsResponseToDatasetLinkedCollection } from './transformers/datasetLinkedCollectionsTransformers'
Expand Down Expand Up @@ -306,13 +306,29 @@ export class DatasetsRepository extends ApiRepository implements IDatasetsReposi
}

public async getDatasetVersionsSummaries(
datasetId: string | number
): Promise<DatasetVersionSummaryInfo[]> {
datasetId: string | number,
limit?: number,
offset?: number
): Promise<DatasetVersionSummarySubset> {
const queryParams = new URLSearchParams()

if (limit) {
queryParams.set('limit', limit.toString())
}

if (offset) {
queryParams.set('offset', offset.toString())
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can follow same approach as here for limit and offset, using URLSearchParams

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the api returns totalCount but I didn't add it to use case. I modified the code to apply totalCount, please review again. Thank you! @g-saracca


return this.doGet(
this.buildApiEndpoint(this.datasetsResourceName, 'versions/compareSummary', datasetId),
true
true,
queryParams
)
.then((response) => response.data.data)
.then((response) => ({
summaries: response.data.data,
totalCount: response.data.totalCount
}))
.catch((error) => {
throw error
})
Expand Down
5 changes: 5 additions & 0 deletions src/files/domain/models/FileVersionSummaryInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ export interface FileVersionSummaryInfo {
versionNote?: string
}

export interface FileVersionSummarySubset {
summaries: FileVersionSummaryInfo[]
totalCount: number
}

export type FileDifferenceSummary = {
file?: FileChangeType
fileAccess?: 'Restricted' | 'Unrestricted'
Expand Down
8 changes: 6 additions & 2 deletions src/files/domain/repositories/IFilesRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FileUploadDestination } from '../models/FileUploadDestination'
import { UploadedFileDTO } from '../dtos/UploadedFileDTO'
import { UpdateFileMetadataDTO } from '../dtos/UpdateFileMetadataDTO'
import { RestrictFileDTO } from '../dtos/RestrictFileDTO'
import { FileVersionSummaryInfo } from '../models/FileVersionSummaryInfo'
import { FileVersionSummarySubset } from '../models/FileVersionSummaryInfo'

export interface IFilesRepository {
getDatasetFiles(
Expand Down Expand Up @@ -88,7 +88,11 @@ export interface IFilesRepository {
replace?: boolean
): Promise<void>

getFileVersionSummaries(fileId: number | string): Promise<FileVersionSummaryInfo[]>
getFileVersionSummaries(
fileId: number | string,
limit?: number,
offset?: number
): Promise<FileVersionSummarySubset>

isFileDeleted(fileId: number | string): Promise<boolean>
}
16 changes: 11 additions & 5 deletions src/files/domain/useCases/GetFileVersionSummaries.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { UseCase } from '../../../core/domain/useCases/UseCase'
import { FileVersionSummaryInfo } from '../models/FileVersionSummaryInfo'
import { FileVersionSummarySubset } from '../models/FileVersionSummaryInfo'
import { IFilesRepository } from '../repositories/IFilesRepository'

export class GetFileVersionSummaries implements UseCase<FileVersionSummaryInfo[]> {
export class GetFileVersionSummaries implements UseCase<FileVersionSummarySubset> {
private filesRepository: IFilesRepository

constructor(filesRepository: IFilesRepository) {
Expand All @@ -13,9 +13,15 @@ export class GetFileVersionSummaries implements UseCase<FileVersionSummaryInfo[]
* Returns a list of versions for a given file including a summary of differences between consecutive versions
*
* @param {number | string} [fileId] - The file identifier, which can be a string (for persistent identifiers), or a number (for numeric identifiers).
* @returns {Promise<FileVersionSummaryInfo[]>} - An array of FileVersionSummaryInfo.
* @param {number} [limit] - Limit for pagination (optional).
* @param {number} [offset] - Offset for pagination (optional).
* @returns {Promise<FileVersionSummarySubset>} - A FileVersionSummarySubset containing the summaries and total count.
*/
async execute(fileId: number | string): Promise<FileVersionSummaryInfo[]> {
return await this.filesRepository.getFileVersionSummaries(fileId)
async execute(
fileId: number | string,
limit?: number,
offset?: number
): Promise<FileVersionSummarySubset> {
return await this.filesRepository.getFileVersionSummaries(fileId, limit, offset)
}
}
7 changes: 7 additions & 0 deletions src/files/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,10 @@ export { FilesSubset } from './domain/models/FilesSubset'
export { FilePreview, FilePreviewChecksum } from './domain/models/FilePreview'
export { UploadedFileDTO } from './domain/dtos/UploadedFileDTO'
export { UpdateFileMetadataDTO } from './domain/dtos/UpdateFileMetadataDTO'
export {
FileVersionSummaryInfo,
FileDifferenceSummary,
FileChangeType,
FileMetadataChange,
FileVersionSummarySubset
} from './domain/models/FileVersionSummaryInfo'
21 changes: 18 additions & 3 deletions src/files/infra/repositories/FilesRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { UploadedFileDTO } from '../../domain/dtos/UploadedFileDTO'
import { UpdateFileMetadataDTO } from '../../domain/dtos/UpdateFileMetadataDTO'
import { ApiConstants } from '../../../core/infra/repositories/ApiConstants'
import { RestrictFileDTO } from '../../domain/dtos/RestrictFileDTO'
import { FileVersionSummaryInfo } from '../../domain/models/FileVersionSummaryInfo'
import { FileVersionSummarySubset } from '../../domain/models/FileVersionSummaryInfo'
import { transformFileVersionSummaryInfoResponseToFileVersionSummaryInfo } from './transformers/fileVersionSummaryInfoTransformers'

export interface GetFilesQueryParams {
Expand Down Expand Up @@ -423,10 +423,25 @@ export class FilesRepository extends ApiRepository implements IFilesRepository {
})
}

public async getFileVersionSummaries(fileId: number | string): Promise<FileVersionSummaryInfo[]> {
public async getFileVersionSummaries(
fileId: number | string,
limit?: number,
offset?: number
): Promise<FileVersionSummarySubset> {
const queryParams = new URLSearchParams()

if (limit) {
queryParams.set('limit', limit.toString())
}

if (offset) {
queryParams.set('offset', offset.toString())
}

return this.doGet(
this.buildApiEndpoint(this.filesResourceName, 'versionDifferences', fileId),
true
true,
queryParams
)
.then((response) => transformFileVersionSummaryInfoResponseToFileVersionSummaryInfo(response))
.catch((error) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { AxiosResponse } from 'axios'
import {
FileVersionSummaryInfo,
FileMetadataChange,
FileDifferenceSummary
FileDifferenceSummary,
FileVersionSummarySubset
} from '../../../domain/models/FileVersionSummaryInfo'
import { DatasetVersionState } from '../../../../datasets/domain/models/Dataset'

Expand All @@ -29,10 +30,11 @@ export interface FileVersionSummaryInfoPayload {

export const transformFileVersionSummaryInfoResponseToFileVersionSummaryInfo = (
response: AxiosResponse
): FileVersionSummaryInfo[] => {
): FileVersionSummarySubset => {
const payload = response.data.data
const totalCount = response.data.totalCount

return payload.map((item: FileVersionSummaryInfoPayload): FileVersionSummaryInfo => {
const summaries = payload.map((item: FileVersionSummaryInfoPayload): FileVersionSummaryInfo => {
const summary = item.fileDifferenceSummary || {}

const fileDifferenceSummary: FileDifferenceSummary = {
Expand All @@ -54,4 +56,9 @@ export const transformFileVersionSummaryInfoResponseToFileVersionSummaryInfo = (
versionNote: item.versionNote
}
})

return {
summaries,
totalCount
}
}
Loading