Skip to content

Commit bb967e9

Browse files
authored
Merge branch 'dev' into loanStandingInstructions
2 parents 5114fda + f81fab6 commit bb967e9

27 files changed

Lines changed: 11559 additions & 1299 deletions

File tree

core/database/schemas/com.mifos.room.MifosDatabase/1.json

Lines changed: 4191 additions & 0 deletions
Large diffs are not rendered by default.

core/database/schemas/com.mifos.room.MifosDatabase/2.json

Lines changed: 4201 additions & 0 deletions
Large diffs are not rendered by default.

core/database/schemas/com.mifos.room.db.MifosDatabase/1.json

Lines changed: 0 additions & 1178 deletions
This file was deleted.

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
package com.mifos.room
1111

12+
import androidx.room.AutoMigration
1213
import androidx.room.Database
1314
import androidx.room.RoomDatabase
1415
import androidx.room.TypeConverters
@@ -150,8 +151,10 @@ import com.mifos.room.typeconverters.CustomTypeConverters
150151
PaymentTypeOptionEntity::class,
151152
],
152153
version = MifosDatabase.VERSION,
153-
exportSchema = false,
154-
autoMigrations = [],
154+
exportSchema = true,
155+
autoMigrations = [
156+
AutoMigration(from = 1, to = 2),
157+
],
155158
)
156159
@TypeConverters(
157160
CustomTypeConverters::class,
@@ -169,6 +172,6 @@ actual abstract class MifosDatabase : RoomDatabase() {
169172
actual abstract val surveyDao: SurveyDao
170173

171174
companion object {
172-
const val VERSION = 1
175+
const val VERSION = 2
173176
}
174177
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@ data class LoanTimelineEntity(
8181
val closedOnDate: List<Int>? = null,
8282

8383
val expectedMaturityDate: List<Int>? = null,
84+
85+
val withdrawnOnDate: List<Int>? = null,
8486
) : Parcelable

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,6 @@ data class LoanWithAssociationsEntity(
184184
val inArrears: Boolean = false,
185185

186186
val isNPA: Boolean = false,
187+
188+
val overpaidOnDate: List<Int>? = null,
187189
) : Parcelable

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
package com.mifos.room
1111

12+
import androidx.room.AutoMigration
1213
import androidx.room.Database
1314
import androidx.room.RoomDatabase
1415
import androidx.room.TypeConverters
@@ -150,8 +151,8 @@ import com.mifos.room.typeconverters.CustomTypeConverters
150151
PaymentTypeOptionEntity::class,
151152
],
152153
version = MifosDatabase.VERSION,
153-
exportSchema = false,
154-
autoMigrations = [],
154+
exportSchema = true,
155+
autoMigrations = [AutoMigration(from = 1, to = 2)],
155156
)
156157
@TypeConverters(
157158
CustomTypeConverters::class,
@@ -169,6 +170,6 @@ actual abstract class MifosDatabase : RoomDatabase() {
169170
actual abstract val surveyDao: SurveyDao
170171

171172
companion object {
172-
const val VERSION = 1
173+
const val VERSION = 2
173174
}
174175
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
package com.mifos.room
1111

12+
import androidx.room.AutoMigration
1213
import androidx.room.ConstructedBy
1314
import androidx.room.Database
1415
import androidx.room.RoomDatabase
@@ -152,8 +153,8 @@ import com.mifos.room.typeconverters.CustomTypeConverters
152153
PaymentTypeOptionEntity::class,
153154
],
154155
version = MifosDatabase.VERSION,
155-
exportSchema = false,
156-
autoMigrations = [],
156+
exportSchema = true,
157+
autoMigrations = [AutoMigration(from = 1, to = 2)],
157158
)
158159
@TypeConverters(
159160
CustomTypeConverters::class,
@@ -172,7 +173,7 @@ actual abstract class MifosDatabase : RoomDatabase() {
172173
actual abstract val surveyDao: SurveyDao
173174

174175
companion object {
175-
const val VERSION = 1
176+
const val VERSION = 2
176177
}
177178
}
178179

0 commit comments

Comments
 (0)