Skip to content

Commit 5b57f4c

Browse files
committed
Naming Convention update
1 parent 0f7eab0 commit 5b57f4c

File tree

11 files changed

+28
-30
lines changed

11 files changed

+28
-30
lines changed

CHANGELOG.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,17 @@ This changelog follows the principles of [Keep a Changelog](https://keepachangel
88

99
### Added
1010

11-
- Datasets: Added `updateDatasetLicense` use case and repository method to support Dataverse endpoint `PUT /datasets/{id}/license`, for updating dataset license or custom terms
12-
11+
- Datasets: Added `updateDatasetLicense` use case and repository method to support Dataverse endpoint `PUT /datasets/{id}/license`, for updating dataset license or custom terms.
1312
- New Use Case: [Get Collections For Linking Use Case](./docs/useCases.md#get-collections-for-linking).
14-
1513
- New Use Case: [Create a Template](./docs/useCases.md#create-a-template) under Templates.
16-
1714
- New Use Case: [Get a Template](./docs/useCases.md#get-a-template) under Templates.
18-
1915
- New Use Case: [Delete a Template](./docs/useCases.md#delete-a-template) under Templates.
20-
2116
- New Use Case: [Update Terms of Access](./docs/useCases.md#update-terms-of-access).
2217

2318
### Changed
2419

25-
- Add pagination query parameters to Dataset Version Summeries and File Version Summaries use cases
20+
- Add pagination query parameters to Dataset Version Summeries and File Version Summaries use cases.
21+
- Templates: Rename `getDatasetTemplates` repository method to `getTemplatesByCollectionId`.
2622

2723
### Fixed
2824

docs/useCases.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,10 @@ Creates a template for a given Dataverse collection id or alias.
624624

625625
```typescript
626626
import { createTemplate } from '@iqss/dataverse-client-javascript'
627-
import { CreateDatasetTemplateDTO } from '@iqss/dataverse-client-javascript'
627+
import { CreateTemplateDTO } from '@iqss/dataverse-client-javascript'
628628

629629
const collectionAlias = ':root'
630-
const template: CreateDatasetTemplateDTO = {
630+
const template: CreateTemplateDTO = {
631631
name: 'Dataverse template',
632632
isDefault: true,
633633
fields: [

src/templates/domain/dtos/CreateDatasetTemplateDTO.ts renamed to src/templates/domain/dtos/CreateTemplateDTO.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { MetadataFieldTypeClass } from '../../../metadataBlocks/domain/models/MetadataBlock'
22

3-
export interface CreateDatasetTemplateDTO {
3+
export interface CreateTemplateDTO {
44
name: string
55
isDefault?: boolean
66
fields?: TemplateFieldDTO[]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { CreateDatasetTemplateDTO } from '../dtos/CreateDatasetTemplateDTO'
1+
import { CreateTemplateDTO } from '../dtos/CreateTemplateDTO'
22
import { Template } from '../models/Template'
33

44
export interface ITemplatesRepository {
55
createDatasetTemplate(
66
collectionIdOrAlias: number | string,
7-
template: CreateDatasetTemplateDTO
7+
template: CreateTemplateDTO
88
): Promise<void>
99
getTemplate(templateId: number): Promise<Template>
10-
getDatasetTemplates(collectionIdOrAlias: number | string): Promise<Template[]>
10+
getTemplatesByCollectionId(collectionIdOrAlias: number | string): Promise<Template[]>
1111
deleteTemplate(templateId: number): Promise<void>
1212
}

src/templates/domain/useCases/CreateTemplate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ROOT_COLLECTION_ID } from '../../../collections/domain/models/Collection'
22
import { UseCase } from '../../../core/domain/useCases/UseCase'
3-
import { CreateDatasetTemplateDTO } from '../dtos/CreateDatasetTemplateDTO'
3+
import { CreateTemplateDTO } from '../dtos/CreateTemplateDTO'
44
import { ITemplatesRepository } from '../repositories/ITemplatesRepository'
55

66
export class CreateTemplate implements UseCase<void> {
@@ -13,13 +13,13 @@ export class CreateTemplate implements UseCase<void> {
1313
/**
1414
* Creates a template in the specified collection.
1515
*
16-
* @param {CreateDatasetTemplateDTO} template - Template definition payload.
16+
* @param {CreateTemplateDTO} template - Template definition payload.
1717
* @param {number | string} [collectionIdOrAlias = ':root'] - A generic collection identifier, which can be either a string (for queries by CollectionAlias), or a number (for queries by CollectionId)
1818
* If this parameter is not set, the default value is: ':root'.
1919
* @returns {Promise<void>}
2020
*/
2121
async execute(
22-
template: CreateDatasetTemplateDTO,
22+
template: CreateTemplateDTO,
2323
collectionIdOrAlias: number | string = ROOT_COLLECTION_ID
2424
): Promise<void> {
2525
return await this.templatesRepository.createDatasetTemplate(collectionIdOrAlias, template)

src/templates/domain/useCases/GetDatasetTemplates.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export class GetDatasetTemplates implements UseCase<Template[]> {
1818
* @returns {Promise<Template[]>}
1919
*/
2020
async execute(collectionIdOrAlias: number | string = ROOT_COLLECTION_ID): Promise<Template[]> {
21-
return await this.templatesRepository.getDatasetTemplates(collectionIdOrAlias)
21+
return await this.templatesRepository.getTemplatesByCollectionId(collectionIdOrAlias)
2222
}
2323
}

src/templates/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ const getTemplate = new GetTemplate(templatesRepository)
1313

1414
export { createTemplate, deleteTemplate, getDatasetTemplates, getTemplate }
1515
export {
16-
CreateDatasetTemplateDTO,
16+
CreateTemplateDTO,
1717
TemplateFieldDTO,
1818
TemplateFieldValueDTO,
1919
TemplateFieldValuePrimitiveDTO,
2020
TemplateFieldValueCompoundDTO,
2121
TemplateFieldValueControlledVocabularyDTO,
2222
TemplateInstructionDTO
23-
} from './domain/dtos/CreateDatasetTemplateDTO'
23+
} from './domain/dtos/CreateTemplateDTO'
2424
export { Template, TemplateInstruction } from './domain/models/Template'

src/templates/infra/repositories/TemplatesRepository.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AxiosResponse } from 'axios'
22
import { ApiRepository } from '../../../core/infra/repositories/ApiRepository'
3-
import { CreateDatasetTemplateDTO } from '../../domain/dtos/CreateDatasetTemplateDTO'
3+
import { CreateTemplateDTO } from '../../domain/dtos/CreateTemplateDTO'
44
import { Template } from '../../domain/models/Template'
55
import { ITemplatesRepository } from '../../domain/repositories/ITemplatesRepository'
66
import { TemplatePayload } from './transformers/TemplatePayload'
@@ -14,7 +14,7 @@ export class TemplatesRepository extends ApiRepository implements ITemplatesRepo
1414

1515
public async createDatasetTemplate(
1616
collectionIdOrAlias: number | string,
17-
template: CreateDatasetTemplateDTO
17+
template: CreateTemplateDTO
1818
): Promise<void> {
1919
return this.doPost(
2020
`/${this.collectionsResourceName}/${collectionIdOrAlias}/templates`,
@@ -36,7 +36,9 @@ export class TemplatesRepository extends ApiRepository implements ITemplatesRepo
3636
})
3737
}
3838

39-
public async getDatasetTemplates(collectionIdOrAlias: number | string): Promise<Template[]> {
39+
public async getTemplatesByCollectionId(
40+
collectionIdOrAlias: number | string
41+
): Promise<Template[]> {
4042
return this.doGet(`/${this.collectionsResourceName}/${collectionIdOrAlias}/templates`, true)
4143
.then((response: AxiosResponse<{ data: TemplatePayload[] }>) =>
4244
transformTemplatePayloadsToTemplates(response.data.data)

test/functional/templates/createDatasetTemplate.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ApiConfig } from '../../../src'
22
import { DataverseApiAuthMechanism } from '../../../src/core/infra/repositories/ApiConfig'
33
import { TestConstants } from '../../testHelpers/TestConstants'
44
import { createTemplate, getDatasetTemplates } from '../../../src/templates'
5-
import { CreateDatasetTemplateDTO } from '../../../src/templates/domain/dtos/CreateDatasetTemplateDTO'
5+
import { CreateTemplateDTO } from '../../../src/templates/domain/dtos/CreateTemplateDTO'
66
import { MetadataFieldTypeClass } from '../../../src/metadataBlocks/domain/models/MetadataBlock'
77
import { deleteDatasetTemplateViaApi } from '../../testHelpers/datasets/datasetTemplatesHelper'
88

@@ -16,7 +16,7 @@ describe('CreateTemplate.execute', () => {
1616
})
1717

1818
test('should create a template in :root with provided JSON', async () => {
19-
const templateDto: CreateDatasetTemplateDTO = {
19+
const templateDto: CreateTemplateDTO = {
2020
name: 'TestDataverse template',
2121
isDefault: true,
2222
fields: [

test/integration/templates/TemplateRepository.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ApiConfig, MetadataFieldTypeClass, WriteError } from '../../../src'
22
import { createTemplate, getDatasetTemplates } from '../../../src/templates'
3-
import { CreateDatasetTemplateDTO } from '../../../src/templates/domain/dtos/CreateDatasetTemplateDTO'
3+
import { CreateTemplateDTO } from '../../../src/templates/domain/dtos/CreateTemplateDTO'
44
import { TemplatesRepository } from '../../../src/templates/infra/repositories/TemplatesRepository'
55
import { DataverseApiAuthMechanism } from '../../../src/core/infra/repositories/ApiConfig'
66
import { TestConstants } from '../../testHelpers/TestConstants'
@@ -28,7 +28,7 @@ describe('TemplatesRepository', () => {
2828
})
2929

3030
describe('createTemplate', () => {
31-
const templateDto: CreateDatasetTemplateDTO = {
31+
const templateDto: CreateTemplateDTO = {
3232
name: 'CollectionsRepository template',
3333
isDefault: false,
3434
fields: [
@@ -85,7 +85,7 @@ describe('TemplatesRepository', () => {
8585

8686
describe('getDatasetTemplates', () => {
8787
test('should return empty templates', async () => {
88-
const actual = await sut.getDatasetTemplates(testCollectionAlias)
88+
const actual = await sut.getTemplatesByCollectionId(testCollectionAlias)
8989

9090
expect(actual.length).toBe(0)
9191
})
@@ -126,7 +126,7 @@ describe('TemplatesRepository', () => {
126126
testCollectionAlias
127127
)
128128

129-
const actual = await sut.getDatasetTemplates(testCollectionAlias)
129+
const actual = await sut.getTemplatesByCollectionId(testCollectionAlias)
130130

131131
expect(actual.length).toBe(1)
132132

0 commit comments

Comments
 (0)