Skip to content

Commit 26ae6d7

Browse files
Kartikey15demKartikey15dem
committed
fix : merge conflicts resolved
fix : merge conflicts resolved fix : merge conflicts resolved
1 parent b61859a commit 26ae6d7

15 files changed

Lines changed: 40 additions & 62 deletions

File tree

‎core/data/src/commonMain/kotlin/com/mifos/core/data/mappers/loan/LoanAccountGeneralMapper.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import com.mifos.core.model.entity.loan.loanWithAssociations.LoanStatus
1414
import com.mifos.core.model.entity.loan.loanWithAssociations.LoanTimeline
1515
import com.mifos.core.model.entity.loan.loanWithAssociations.LoanType
1616
import com.mifos.core.model.entity.loan.loanWithAssociations.LoanWithAssociations
17-
import com.mifos.core.model.entity.loan.loanWithAssociations.LoansAccountSummary
17+
import com.mifos.core.model.entity.loan.loanWithAssociations.LoanAccountSummary
1818
import com.mifos.core.model.entity.loan.loanWithAssociations.SavingAccountCurrency
1919
import com.mifos.core.network.data.AbstractMapper
2020
import com.mifos.room.entities.accounts.loans.ActualDisbursementDateEntity
2121
import com.mifos.room.entities.accounts.loans.LoanStatusEntity
2222
import com.mifos.room.entities.accounts.loans.LoanTimelineEntity
2323
import com.mifos.room.entities.accounts.loans.LoanTypeEntity
2424
import com.mifos.room.entities.accounts.loans.LoanWithAssociationsEntity
25-
import com.mifos.room.entities.accounts.loans.LoansAccountSummaryEntity
25+
import com.mifos.room.entities.accounts.loans.LoanAccountSummaryEntity
2626
import com.mifos.room.entities.accounts.savings.SavingAccountCurrencyEntity
2727

2828
object LoanAccountGeneralMapper : AbstractMapper<LoanWithAssociationsEntity, LoanWithAssociations>() {
@@ -31,7 +31,7 @@ object LoanAccountGeneralMapper : AbstractMapper<LoanWithAssociationsEntity, Loa
3131
return LoanWithAssociations(
3232
id = entity.id,
3333
accountNo = entity.accountNo,
34-
status = entity.status.toModel(),
34+
status = entity.status.toDomain(),
3535
clientId = entity.clientId,
3636
clientName = entity.clientName,
3737
clientOfficeId = entity.clientOfficeId,
@@ -44,8 +44,8 @@ object LoanAccountGeneralMapper : AbstractMapper<LoanWithAssociationsEntity, Loa
4444
loanPurposeName = entity.loanPurposeName,
4545
loanOfficerId = entity.loanOfficerId,
4646
loanOfficerName = entity.loanOfficerName,
47-
loanType = entity.loanType.toModel(),
48-
currency = entity.currency.toModel(),
47+
loanType = entity.loanType.toDomain(),
48+
currency = entity.currency.toDomain(),
4949
principal = entity.principal,
5050
approvedPrincipal = entity.approvedPrincipal,
5151
proposedPrincipal = entity.proposedPrincipal,
@@ -63,8 +63,8 @@ object LoanAccountGeneralMapper : AbstractMapper<LoanWithAssociationsEntity, Loa
6363
transactionProcessingStrategyId = entity.transactionProcessingStrategyId,
6464
transactionProcessingStrategyName = entity.transactionProcessingStrategyName,
6565
syncDisbursementWithMeeting = entity.syncDisbursementWithMeeting,
66-
timeline = entity.timeline.toModel(),
67-
summary = entity.summary.toModel(),
66+
timeline = entity.timeline.toDomain(),
67+
summary = entity.summary.toDomain(),
6868
repaymentSchedule = entity.repaymentSchedule,
6969
transactions = entity.transactions,
7070
feeChargesAtDisbursementCharged = entity.feeChargesAtDisbursementCharged,
@@ -83,7 +83,7 @@ object LoanAccountGeneralMapper : AbstractMapper<LoanWithAssociationsEntity, Loa
8383
}
8484
}
8585

86-
private fun LoanStatusEntity.toModel(): LoanStatus {
86+
private fun LoanStatusEntity.toDomain(): LoanStatus {
8787
return LoanStatus(
8888
id = id,
8989
code = code,
@@ -99,15 +99,15 @@ private fun LoanStatusEntity.toModel(): LoanStatus {
9999
)
100100
}
101101

102-
private fun LoanTypeEntity.toModel(): LoanType {
102+
private fun LoanTypeEntity.toDomain(): LoanType {
103103
return LoanType(
104104
id = id,
105105
code = code,
106106
value = value,
107107
)
108108
}
109109

110-
private fun SavingAccountCurrencyEntity.toModel(): SavingAccountCurrency {
110+
private fun SavingAccountCurrencyEntity.toDomain(): SavingAccountCurrency {
111111
return SavingAccountCurrency(
112112
id = id,
113113
code = code,
@@ -120,7 +120,7 @@ private fun SavingAccountCurrencyEntity.toModel(): SavingAccountCurrency {
120120
)
121121
}
122122

123-
private fun LoanTimelineEntity.toModel(): LoanTimeline {
123+
private fun LoanTimelineEntity.toDomain(): LoanTimeline {
124124
return LoanTimeline(
125125
loanId = loanId,
126126
submittedOnDate = submittedOnDate,
@@ -132,7 +132,7 @@ private fun LoanTimelineEntity.toModel(): LoanTimeline {
132132
approvedByFirstname = approvedByFirstname,
133133
approvedByLastname = approvedByLastname,
134134
expectedDisbursementDate = expectedDisbursementDate,
135-
actualDisburseDate = actualDisburseDate?.toModel(),
135+
actualDisburseDate = actualDisburseDate?.toDomain(),
136136
actualDisbursementDate = actualDisbursementDate,
137137
disbursedByUsername = disbursedByUsername,
138138
disbursedByFirstname = disbursedByFirstname,
@@ -142,7 +142,7 @@ private fun LoanTimelineEntity.toModel(): LoanTimeline {
142142
)
143143
}
144144

145-
private fun ActualDisbursementDateEntity.toModel(): ActualDisbursementDate {
145+
private fun ActualDisbursementDateEntity.toDomain(): ActualDisbursementDate {
146146
return ActualDisbursementDate(
147147
loanId = loanId,
148148
year = year,
@@ -151,10 +151,10 @@ private fun ActualDisbursementDateEntity.toModel(): ActualDisbursementDate {
151151
)
152152
}
153153

154-
private fun LoansAccountSummaryEntity.toModel(): LoansAccountSummary {
155-
return LoansAccountSummary(
154+
private fun LoanAccountSummaryEntity.toDomain(): LoanAccountSummary {
155+
return LoanAccountSummary(
156156
loanId = loanId,
157-
currency = currency?.toModel(),
157+
currency = currency?.toDomain(),
158158
principalDisbursed = principalDisbursed,
159159
principalPaid = principalPaid,
160160
principalWaived = principalWaived,

‎core/database/src/androidMain/kotlin/com/mifos/room/MifosDatabase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.mifos.room.entities.accounts.loans.LoanStatusEntity
3131
import com.mifos.room.entities.accounts.loans.LoanTimelineEntity
3232
import com.mifos.room.entities.accounts.loans.LoanTypeEntity
3333
import com.mifos.room.entities.accounts.loans.LoanWithAssociationsEntity
34-
import com.mifos.room.entities.accounts.loans.LoansAccountSummaryEntity
34+
import com.mifos.room.entities.accounts.loans.LoanAccountSummaryEntity
3535
import com.mifos.room.entities.accounts.savings.SavingAccountCurrencyEntity
3636
import com.mifos.room.entities.accounts.savings.SavingAccountDepositTypeEntity
3737
import com.mifos.room.entities.accounts.savings.SavingsAccountEntity
@@ -90,7 +90,7 @@ import com.mifos.room.typeconverters.CustomTypeConverters
9090
LoanStatusEntity::class,
9191
LoanTypeEntity::class,
9292
LoanWithAssociationsEntity::class,
93-
LoansAccountSummaryEntity::class,
93+
LoanAccountSummaryEntity::class,
9494
LoanTimelineEntity::class,
9595
// savings package
9696
SavingAccountDepositTypeEntity::class,

‎core/database/src/commonMain/kotlin/com/mifos/room/entities/accounts/loans/Loan.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ data class Loan(
8383

8484
val timeline: LoanTimelineEntity? = null,
8585

86-
val summary: LoansAccountSummaryEntity? = null,
86+
val summary: LoanAccountSummaryEntity? = null,
8787

8888
val feeChargesAtDisbursementCharged: Double? = null,
8989

core/database/src/commonMain/kotlin/com/mifos/room/entities/accounts/loans/LoansAccountSummaryEntity.kt renamed to core/database/src/commonMain/kotlin/com/mifos/room/entities/accounts/loans/LoanAccountSummaryEntity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import template.core.base.database.PrimaryKey
2727
)
2828
@Serializable
2929
@Parcelize
30-
data class LoansAccountSummaryEntity(
30+
data class LoanAccountSummaryEntity(
3131
@PrimaryKey(autoGenerate = true)
3232
val loanId: Int? = null,
3333

‎core/database/src/commonMain/kotlin/com/mifos/room/entities/accounts/loans/LoanWithAssociationsEntity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import template.core.base.database.PrimaryKey
7171
deferred = false,
7272
),
7373
ForeignKey(
74-
entity = LoansAccountSummaryEntity::class,
74+
entity = LoanAccountSummaryEntity::class,
7575
parentColumns = ["loanId"],
7676
childColumns = ["summary"],
7777
onDelete = ForeignKeyAction.CASCADE,
@@ -163,7 +163,7 @@ data class LoanWithAssociationsEntity(
163163
val timeline: LoanTimelineEntity = LoanTimelineEntity(),
164164

165165
@ColumnInfo(index = true, name = INHERIT_FIELD_NAME, typeAffinity = UNDEFINED, collate = UNSPECIFIED, defaultValue = VALUE_UNSPECIFIED)
166-
val summary: LoansAccountSummaryEntity = LoansAccountSummaryEntity(),
166+
val summary: LoanAccountSummaryEntity = LoanAccountSummaryEntity(),
167167

168168
@IgnoredOnParcel
169169
val repaymentSchedule: RepaymentSchedule = RepaymentSchedule(),

‎core/database/src/commonMain/kotlin/com/mifos/room/typeconverters/CustomTypeConverters.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import com.mifos.room.entities.accounts.loans.ActualDisbursementDateEntity
3232
import com.mifos.room.entities.accounts.loans.LoanStatusEntity
3333
import com.mifos.room.entities.accounts.loans.LoanTimelineEntity
3434
import com.mifos.room.entities.accounts.loans.LoanTypeEntity
35-
import com.mifos.room.entities.accounts.loans.LoansAccountSummaryEntity
35+
import com.mifos.room.entities.accounts.loans.LoanAccountSummaryEntity
3636
import com.mifos.room.entities.accounts.savings.Charge
3737
import com.mifos.room.entities.accounts.savings.SavingAccountCurrencyEntity
3838
import com.mifos.room.entities.accounts.savings.SavingAccountDepositTypeEntity
@@ -68,7 +68,6 @@ import com.mifos.room.entities.templates.clients.OptionsEntity
6868
import com.mifos.room.entities.templates.clients.SavingProductOptionsEntity
6969
import com.mifos.room.entities.templates.clients.StaffOptionsEntity
7070
import com.mifos.room.entities.templates.loans.LoanType
71-
import kotlinx.serialization.encodeToString
7271
import kotlinx.serialization.json.Json
7372
import kotlinx.serialization.json.JsonObject
7473
import template.core.base.database.TypeConverter
@@ -470,12 +469,12 @@ class CustomTypeConverters {
470469
}
471470

472471
@TypeConverter
473-
fun fromSummary(summary: LoansAccountSummaryEntity?): String? {
472+
fun fromSummary(summary: LoanAccountSummaryEntity?): String? {
474473
return summary?.let { Json.encodeToString(it) }
475474
}
476475

477476
@TypeConverter
478-
fun toSummary(json: String?): LoansAccountSummaryEntity? {
477+
fun toSummary(json: String?): LoanAccountSummaryEntity? {
479478
return json?.let { Json.decodeFromString(it) }
480479
}
481480

‎core/database/src/commonMain/kotlin/com/mifos/room/typeconverters/LoanTypeConverters.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ import com.mifos.room.entities.accounts.loans.ActualDisbursementDateEntity
2525
import com.mifos.room.entities.accounts.loans.LoanStatusEntity
2626
import com.mifos.room.entities.accounts.loans.LoanTimelineEntity
2727
import com.mifos.room.entities.accounts.loans.LoanTypeEntity
28-
import com.mifos.room.entities.accounts.loans.LoansAccountSummaryEntity
28+
import com.mifos.room.entities.accounts.loans.LoanAccountSummaryEntity
2929
import com.mifos.room.entities.accounts.savings.SavingAccountCurrencyEntity
30-
import kotlinx.serialization.encodeToString
3130
import kotlinx.serialization.json.Json
3231
import template.core.base.database.TypeConverter
3332

@@ -98,12 +97,12 @@ class LoanTypeConverters {
9897
}
9998

10099
@TypeConverter
101-
fun fromSummary(summary: LoansAccountSummaryEntity?): String? {
100+
fun fromSummary(summary: LoanAccountSummaryEntity?): String? {
102101
return summary?.let { Json.encodeToString(it) }
103102
}
104103

105104
@TypeConverter
106-
fun toSummary(json: String?): LoansAccountSummaryEntity? {
105+
fun toSummary(json: String?): LoanAccountSummaryEntity? {
107106
return json?.let { Json.decodeFromString(it) }
108107
}
109108

‎core/database/src/desktopMain/kotlin/com/mifos/room/MifosDatabase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.mifos.room.entities.accounts.loans.LoanStatusEntity
3131
import com.mifos.room.entities.accounts.loans.LoanTimelineEntity
3232
import com.mifos.room.entities.accounts.loans.LoanTypeEntity
3333
import com.mifos.room.entities.accounts.loans.LoanWithAssociationsEntity
34-
import com.mifos.room.entities.accounts.loans.LoansAccountSummaryEntity
34+
import com.mifos.room.entities.accounts.loans.LoanAccountSummaryEntity
3535
import com.mifos.room.entities.accounts.savings.SavingAccountCurrencyEntity
3636
import com.mifos.room.entities.accounts.savings.SavingAccountDepositTypeEntity
3737
import com.mifos.room.entities.accounts.savings.SavingsAccountEntity
@@ -90,7 +90,7 @@ import com.mifos.room.typeconverters.CustomTypeConverters
9090
LoanStatusEntity::class,
9191
LoanTypeEntity::class,
9292
LoanWithAssociationsEntity::class,
93-
LoansAccountSummaryEntity::class,
93+
LoanAccountSummaryEntity::class,
9494
LoanTimelineEntity::class,
9595
// savings package
9696
SavingAccountDepositTypeEntity::class,

‎core/database/src/nativeMain/kotlin/com/mifos/room/MifosDatabase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import com.mifos.room.entities.accounts.loans.LoanStatusEntity
3333
import com.mifos.room.entities.accounts.loans.LoanTimelineEntity
3434
import com.mifos.room.entities.accounts.loans.LoanTypeEntity
3535
import com.mifos.room.entities.accounts.loans.LoanWithAssociationsEntity
36-
import com.mifos.room.entities.accounts.loans.LoansAccountSummaryEntity
36+
import com.mifos.room.entities.accounts.loans.LoanAccountSummaryEntity
3737
import com.mifos.room.entities.accounts.savings.SavingAccountCurrencyEntity
3838
import com.mifos.room.entities.accounts.savings.SavingAccountDepositTypeEntity
3939
import com.mifos.room.entities.accounts.savings.SavingsAccountEntity
@@ -92,7 +92,7 @@ import com.mifos.room.typeconverters.CustomTypeConverters
9292
LoanStatusEntity::class,
9393
LoanTypeEntity::class,
9494
LoanWithAssociationsEntity::class,
95-
LoansAccountSummaryEntity::class,
95+
LoanAccountSummaryEntity::class,
9696
LoanTimelineEntity::class,
9797
// savings package
9898
SavingAccountDepositTypeEntity::class,

core/model/src/commonMain/kotlin/com/mifos/core/model/entity/loan/loanWithAssociations/LoansAccountSummary.kt renamed to core/model/src/commonMain/kotlin/com/mifos/core/model/entity/loan/loanWithAssociations/LoanAccountSummary.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import kotlinx.serialization.Serializable
1515

1616
@Parcelize
1717
@Serializable
18-
data class LoansAccountSummary(
18+
data class LoanAccountSummary(
1919
val loanId: Int? = null,
2020
val currency: SavingAccountCurrency? = null,
2121
val principalDisbursed: Double? = null,

0 commit comments

Comments
 (0)