summaryrefslogtreecommitdiff
path: root/nexus/src/main/kotlin/tech
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-06-08 15:01:52 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-06-08 15:01:52 +0530
commitdaecfe6cf5ce379a20ec10f9f65262cb770e3447 (patch)
tree5c28724ff50b1b87cdaacb127847266c8154bff5 /nexus/src/main/kotlin/tech
parenta35b35174a57f4db65807dd83a6c4594495f7056 (diff)
downloadlibeufin-daecfe6cf5ce379a20ec10f9f65262cb770e3447.tar.gz
libeufin-daecfe6cf5ce379a20ec10f9f65262cb770e3447.tar.bz2
libeufin-daecfe6cf5ce379a20ec10f9f65262cb770e3447.zip
make test case pass
Diffstat (limited to 'nexus/src/main/kotlin/tech')
-rw-r--r--nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt8
-rw-r--r--nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt2
2 files changed, 4 insertions, 6 deletions
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
index 67e09e8e..15a79bf3 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -143,7 +143,7 @@ class RawBankTransactionEntity(id: EntityID<Long>) : LongEntity(id) {
*/
object PreparedPaymentsTable : IdTable<String>() {
/** the UUID representing this payment in the system */
- override val id = varchar("id", ID_MAX_LENGTH).entityId().primaryKey()
+ override val id = varchar("id", ID_MAX_LENGTH).entityId()
val paymentId = long("paymentId")
val preparationDate = long("preparationDate")
val submissionDate = long("submissionDate").nullable()
@@ -188,7 +188,7 @@ class PreparedPaymentEntity(id: EntityID<String>) : Entity<String>(id) {
* This table holds triples of <iban, bic, holder name>.
*/
object NexusBankAccountsTable : IdTable<String>() {
- override val id = varchar("id", ID_MAX_LENGTH).primaryKey().entityId()
+ override val id = varchar("id", ID_MAX_LENGTH).entityId()
val accountHolder = text("accountHolder")
val iban = text("iban")
val bankCode = text("bankCode")
@@ -241,7 +241,6 @@ class EbicsSubscriberEntity(id: EntityID<Int>) : IntEntity(id) {
object NexusUsersTable : IdTable<String>() {
override val id = varchar("id", ID_MAX_LENGTH).entityId()
- override val primaryKey = PrimaryKey(id, name = "id")
val passwordHash = text("password")
val superuser = bool("superuser")
}
@@ -253,7 +252,7 @@ class NexusUserEntity(id: EntityID<String>) : Entity<String>(id) {
}
object NexusBankConnectionsTable : IdTable<String>() {
- override val id = NexusBankConnectionsTable.text("id").entityId().primaryKey()
+ override val id = NexusBankConnectionsTable.text("id").entityId()
val type = text("type")
val owner = reference("user", NexusUsersTable)
}
@@ -266,7 +265,6 @@ class NexusBankConnectionEntity(id: EntityID<String>) : Entity<String>(id) {
object FacadesTable : IdTable<String>() {
override val id = FacadesTable.text("id").entityId()
- override val primaryKey = PrimaryKey(id, name = "id")
val type = text("type")
val creator = reference("creator", NexusUsersTable)
val highestSeenMsgID = long("highestSeenMessageID").default(0)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index a8837a79..3cbcdfc5 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -430,7 +430,7 @@ fun serverMain(dbName: String) {
return@intercept
}
- schedulePeriodicWork()
+ //schedulePeriodicWork()
routing {
/**
* Shows information about the requesting user.