Skip to content

Commit 47d2561

Browse files
committed
fix: model and payload changes
1 parent 4ce6b26 commit 47d2561

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
export interface License {
22
id: number
33
name: string
4+
shortDescription?: string
45
uri: string
5-
iconUrl: string
6+
iconUri?: string
67
active: boolean
78
isDefault: boolean
9+
sortOrder: number
10+
rightsIdentifier?: string
11+
rightsIdentifierScheme?: string
12+
schemeUri?: string
13+
languageCode?: string
814
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
export interface LicensePayload {
22
id: number
33
name: string
4-
shortDescription: string
4+
shortDescription?: string
55
uri: string
6-
iconUrl: string
6+
iconUrl?: string
77
active: boolean
88
isDefault: boolean
99
sortOrder: number
10-
rightsIdentifier: string
11-
rightsIdentifierScheme: string
12-
schemeUri: string
13-
languageCode: string
10+
rightsIdentifier?: string
11+
rightsIdentifierScheme?: string
12+
schemeUri?: string
13+
languageCode?: string
1414
}

src/licenses/domain/repositories/transformers/licenseTransformers.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ import { AxiosResponse } from 'axios'
22
import { License } from '../../models/License'
33
import { LicensePayload } from './LicensePayload'
44

5-
export const transformLicensesResponseToLicenses = (response: AxiosResponse): License[] => {
5+
export const transformPayloadToLicense = (response: AxiosResponse): License[] => {
66
const payload = response.data.data as LicensePayload[]
7+
78
return payload.map((license: LicensePayload) => ({
89
id: license.id,
910
name: license.name,
11+
shortDescription: license.shortDescription,
1012
uri: license.uri,
11-
iconUrl: license.iconUrl,
13+
iconUri: license.iconUrl, // in payload, it is called iconUrl, but iconUri is the name matching everywhere else
1214
active: license.active,
13-
isDefault: license.isDefault
15+
isDefault: license.isDefault,
16+
sortOrder: license.sortOrder,
17+
rightsIdentifier: license.rightsIdentifier,
18+
rightsIdentifierScheme: license.rightsIdentifierScheme,
19+
schemeUri: license.schemeUri,
20+
languageCode: license.languageCode
1421
}))
1522
}

test/unit/licenses/GetAvailableStandardLicenses.test.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReadError } from '../../../src'
1+
import { License, ReadError } from '../../../src'
22
import { ILicensesRepository } from '../../../src/licenses/domain/repositories/ILicensesRepository'
33
import { GetAvailableStandardLicenses } from '../../../src/licenses/domain/useCases/GetAvailableStandardLicenses'
44

@@ -7,22 +7,32 @@ describe('GetAvailableStandardLicenses', () => {
77
test('should return licenses array on repository success', async () => {
88
const licensesRepositoryStub: ILicensesRepository = {} as ILicensesRepository
99

10-
const testLicenses = [
10+
const testLicenses: License[] = [
1111
{
1212
id: 1,
1313
name: 'CC0 1.0',
1414
uri: 'http://creativecommons.org/publicdomain/zero/1.0',
15-
iconUrl: 'https://licensebuttons.net/p/zero/1.0/88x31.png',
15+
iconUri: 'https://licensebuttons.net/p/zero/1.0/88x31.png',
1616
active: true,
17-
isDefault: true
17+
isDefault: true,
18+
sortOrder: 0,
19+
rightsIdentifier: 'CC0-1.0',
20+
rightsIdentifierScheme: 'SPDX',
21+
schemeUri: 'https://spdx.org/licenses/',
22+
languageCode: 'en'
1823
},
1924
{
2025
id: 2,
2126
name: 'CC BY 4.0',
2227
uri: 'http://creativecommons.org/licenses/by/4.0',
23-
iconUrl: 'https://licensebuttons.net/l/by/4.0/88x31.png',
28+
iconUri: 'https://licensebuttons.net/l/by/4.0/88x31.png',
2429
active: true,
25-
isDefault: false
30+
isDefault: false,
31+
sortOrder: 2,
32+
rightsIdentifier: 'CC-BY-4.0',
33+
rightsIdentifierScheme: 'SPDX',
34+
schemeUri: 'https://spdx.org/licenses/',
35+
languageCode: 'en'
2636
}
2737
]
2838

0 commit comments

Comments
 (0)