Skip to content

Commit 44ac744

Browse files
committed
fix: depends on reviews
1 parent d4104c5 commit 44ac744

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

test/functional/templates/SetTemplateAsDefault.test.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { TestConstants } from '../../testHelpers/TestConstants'
44
import {
55
createTemplate,
66
getTemplatesByCollectionId,
7-
setTemplateAsDefault,
8-
unsetTemplateAsDefault
7+
setTemplateAsDefault
98
} from '../../../src/templates'
109
import { CreateTemplateDTO } from '../../../src/templates/domain/dtos/CreateTemplateDTO'
1110
import { MetadataFieldTypeClass } from '../../../src/metadataBlocks/domain/models/MetadataBlock'
@@ -56,10 +55,6 @@ describe('SetTemplateAsDefault.execute', () => {
5655
]
5756
}
5857

59-
const templatesBefore = await getTemplatesByCollectionId.execute(collectionIdOrAlias)
60-
const originalDefaultTemplateId =
61-
templatesBefore.find((template) => template.isDefault)?.id ?? null
62-
6358
await createTemplate.execute(templateDto, collectionIdOrAlias)
6459
const templatesAfterCreate = await getTemplatesByCollectionId.execute(collectionIdOrAlias)
6560
const createdTemplate = templatesAfterCreate.find((template) => template.name === templateName)
@@ -75,12 +70,6 @@ describe('SetTemplateAsDefault.execute', () => {
7570

7671
expect(updatedTemplate?.isDefault).toBe(true)
7772

78-
if (originalDefaultTemplateId && originalDefaultTemplateId !== createdTemplate.id) {
79-
await setTemplateAsDefault.execute(originalDefaultTemplateId, collectionIdOrAlias)
80-
} else if (!originalDefaultTemplateId) {
81-
await unsetTemplateAsDefault.execute(collectionIdOrAlias)
82-
}
83-
8473
await deleteDatasetTemplateViaApi(createdTemplate.id)
8574
})
8675
})

test/functional/templates/UnsetTemplateAsDefault.test.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ describe('UnsetTemplateAsDefault.execute', () => {
5656
]
5757
}
5858

59-
const templatesBefore = await getTemplatesByCollectionId.execute(collectionIdOrAlias)
60-
const originalDefaultTemplateId =
61-
templatesBefore.find((template) => template.isDefault)?.id ?? null
62-
6359
await createTemplate.execute(templateDto, collectionIdOrAlias)
6460
const templatesAfterCreate = await getTemplatesByCollectionId.execute(collectionIdOrAlias)
6561
const createdTemplate = templatesAfterCreate.find((template) => template.name === templateName)
@@ -76,10 +72,6 @@ describe('UnsetTemplateAsDefault.execute', () => {
7672

7773
expect(hasDefaultTemplate).toBe(false)
7874

79-
if (originalDefaultTemplateId && originalDefaultTemplateId !== createdTemplate.id) {
80-
await setTemplateAsDefault.execute(originalDefaultTemplateId, collectionIdOrAlias)
81-
}
82-
8375
await deleteDatasetTemplateViaApi(createdTemplate.id)
8476
})
8577
})

test/integration/templates/TemplateRepository.test.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,9 @@ describe('TemplatesRepository', () => {
249249

250250
describe('setTemplateAsDefault', () => {
251251
test('should set a template as default for a collection', async () => {
252+
const existingTemplates = await getTemplatesByCollectionId.execute(testCollectionAlias)
253+
const previousDefaultTemplate = existingTemplates.find((template) => template.isDefault)
254+
const previousDefaultTemplateId = previousDefaultTemplate?.id
252255
await createTemplate.execute(
253256
{
254257
name: 'Template for setTemplateAsDefault',
@@ -294,7 +297,11 @@ describe('TemplatesRepository', () => {
294297

295298
expect(updatedTemplate?.isDefault).toBe(true)
296299

297-
await deleteDatasetTemplateViaApi(templateId)
300+
if (previousDefaultTemplateId !== undefined) {
301+
await sut.setTemplateAsDefault(testCollectionAlias, previousDefaultTemplateId)
302+
} else {
303+
await sut.unsetTemplateAsDefault(testCollectionAlias)
304+
}
298305
})
299306

300307
test('should return error when template does not exist', async () => {
@@ -343,6 +350,12 @@ describe('TemplatesRepository', () => {
343350
const templateId = templates[templates.length - 1].id
344351

345352
await sut.setTemplateAsDefault(testCollectionAlias, templateId)
353+
const templatesSetAsDefault = await getTemplatesByCollectionId.execute(testCollectionAlias)
354+
const templateSetAsDefault = templatesSetAsDefault.find(
355+
(template) => template.id === templateId
356+
)
357+
expect(templateSetAsDefault?.isDefault).toBe(true)
358+
346359
await sut.unsetTemplateAsDefault(testCollectionAlias)
347360

348361
const templatesAfter = await getTemplatesByCollectionId.execute(testCollectionAlias)

0 commit comments

Comments
 (0)