Skip to content

Commit da13b85

Browse files
authored
Merge pull request eu-digital-identity-wallet#456 from niscy-eudiw/main
refactor: Rename issuerCredentialId to credentialIssuerId
2 parents a473f63 + d20d755 commit da13b85

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

issuance-feature/src/main/java/eu/europa/ec/issuancefeature/interactor/AddDocumentInteractor.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class AddDocumentInteractorImpl(
122122
))
123123
.map { doc ->
124124
AddDocumentUi(
125-
issuerCredentialId = doc.credentialIssuerId,
125+
credentialIssuerId = doc.credentialIssuerId,
126126
itemData = ListItemDataUi(
127127
itemId = doc.configurationId,
128128
mainContentData = ListItemMainContentDataUi.Text(text = doc.name),
@@ -132,7 +132,7 @@ class AddDocumentInteractorImpl(
132132
)
133133
)
134134
}
135-
.groupBy { it.issuerCredentialId }
135+
.groupBy { it.credentialIssuerId }
136136
.entries
137137
.map { (issuer, items) -> issuer to items }
138138

issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/add/AddDocumentScreen.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ private fun IssuanceAddDocumentScreenPreview() {
383383
"issuer1",
384384
listOf(
385385
AddDocumentUi(
386-
issuerCredentialId = "issuer1",
386+
credentialIssuerId = "issuer1",
387387
itemData = ListItemDataUi(
388388
itemId = "configId1",
389389
mainContentData = ListItemMainContentDataUi.Text(text = "National ID"),
@@ -398,7 +398,7 @@ private fun IssuanceAddDocumentScreenPreview() {
398398
"issuer2",
399399
listOf(
400400
AddDocumentUi(
401-
issuerCredentialId = "issuer2",
401+
credentialIssuerId = "issuer2",
402402
itemData = ListItemDataUi(
403403
itemId = "configId2",
404404
mainContentData = ListItemMainContentDataUi.Text(text = "Driving Licence"),
@@ -440,7 +440,7 @@ private fun DashboardAddDocumentScreenPreview() {
440440
"issuer1",
441441
listOf(
442442
AddDocumentUi(
443-
issuerCredentialId = "issuer1",
443+
credentialIssuerId = "issuer1",
444444
itemData = ListItemDataUi(
445445
itemId = "configId1",
446446
mainContentData = ListItemMainContentDataUi.Text(text = "National ID"),
@@ -455,7 +455,7 @@ private fun DashboardAddDocumentScreenPreview() {
455455
"issuer2",
456456
listOf(
457457
AddDocumentUi(
458-
issuerCredentialId = "issuer2",
458+
credentialIssuerId = "issuer2",
459459
itemData = ListItemDataUi(
460460
itemId = "configId2",
461461
mainContentData = ListItemMainContentDataUi.Text(text = "Driving Licence"),

issuance-feature/src/main/java/eu/europa/ec/issuancefeature/ui/add/model/AddDocumentUi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ package eu.europa.ec.issuancefeature.ui.add.model
1919
import eu.europa.ec.uilogic.component.ListItemDataUi
2020

2121
data class AddDocumentUi(
22-
val issuerCredentialId: String,
22+
val credentialIssuerId: String,
2323
val itemData: ListItemDataUi,
2424
)

issuance-feature/src/test/java/eu/europa/ec/issuancefeature/util/TestData.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ internal const val mockedIssuerId = "issuerId"
5959
private const val mockedConfigIssuerId = "configurationId"
6060

6161
internal val mockedPidOptionItemUi = AddDocumentUi(
62-
issuerCredentialId = mockedIssuerId,
62+
credentialIssuerId = mockedIssuerId,
6363
itemData = ListItemDataUi(
6464
itemId = mockedConfigIssuerId,
6565
mainContentData = ListItemMainContentDataUi.Text(text = mockedPidDocName),
@@ -68,7 +68,7 @@ internal val mockedPidOptionItemUi = AddDocumentUi(
6868
)
6969

7070
internal val mockedMdlOptionItemUi = AddDocumentUi(
71-
issuerCredentialId = mockedIssuerId,
71+
credentialIssuerId = mockedIssuerId,
7272
itemData = ListItemDataUi(
7373
itemId = mockedConfigIssuerId,
7474
mainContentData = ListItemMainContentDataUi.Text(text = mockedMdlDocName),
@@ -77,7 +77,7 @@ internal val mockedMdlOptionItemUi = AddDocumentUi(
7777
)
7878

7979
internal val mockedAgeOptionItemUi = AddDocumentUi(
80-
issuerCredentialId = mockedIssuerId,
80+
credentialIssuerId = mockedIssuerId,
8181
itemData = ListItemDataUi(
8282
itemId = mockedConfigIssuerId,
8383
mainContentData = ListItemMainContentDataUi.Text(text = mockedAgeVerificationDocName),
@@ -86,7 +86,7 @@ internal val mockedAgeOptionItemUi = AddDocumentUi(
8686
)
8787

8888
internal val mockedPhotoIdOptionItemUi = AddDocumentUi(
89-
issuerCredentialId = mockedIssuerId,
89+
credentialIssuerId = mockedIssuerId,
9090
itemData = ListItemDataUi(
9191
itemId = mockedConfigIssuerId,
9292
mainContentData = ListItemMainContentDataUi.Text(text = mockedPhotoIdDocName),

0 commit comments

Comments
 (0)