generated from Astra-Interactive/AstraTemplate
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
1 parent
958b608
commit 01fbe62
Showing
14 changed files
with
224 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ makeevrserg.java.ktarget=21 | |
# Project | ||
makeevrserg.project.name=AspeKt | ||
makeevrserg.project.group=ru.astrainteractive.aspekt | ||
makeevrserg.project.version.string=2.25.2 | ||
makeevrserg.project.version.string=2.26.0 | ||
makeevrserg.project.description=Essentials plugin for EmpireProjekt | ||
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected] | ||
makeevrserg.project.url=https://empireprojekt.ru | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
.../src/main/kotlin/ru/astrainteractive/aspekt/module/moneydrop/database/dao/MoneyDropDao.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package ru.astrainteractive.aspekt.module.moneydrop.database.dao | ||
|
||
import ru.astrainteractive.aspekt.module.moneydrop.database.model.MoneyDropLocation | ||
|
||
internal interface MoneyDropDao { | ||
suspend fun addLocation(location: MoneyDropLocation) | ||
suspend fun isLocationExists(location: MoneyDropLocation): Boolean | ||
} |
56 changes: 56 additions & 0 deletions
56
.../kotlin/ru/astrainteractive/aspekt/module/moneydrop/database/dao/impl/MoneyDropDaoImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
package ru.astrainteractive.aspekt.module.moneydrop.database.dao.impl | ||
|
||
import kotlinx.coroutines.withContext | ||
import org.jetbrains.exposed.sql.Database | ||
import org.jetbrains.exposed.sql.and | ||
import org.jetbrains.exposed.sql.insert | ||
import org.jetbrains.exposed.sql.selectAll | ||
import org.jetbrains.exposed.sql.transactions.transaction | ||
import ru.astrainteractive.aspekt.module.moneydrop.database.dao.MoneyDropDao | ||
import ru.astrainteractive.aspekt.module.moneydrop.database.model.MoneyDropLocation | ||
import ru.astrainteractive.aspekt.module.moneydrop.database.table.MoneyDropLocationTable | ||
import ru.astrainteractive.astralibs.logging.JUtiltLogger | ||
import ru.astrainteractive.astralibs.logging.Logger | ||
import kotlin.coroutines.CoroutineContext | ||
|
||
internal class MoneyDropDaoImpl( | ||
private val database: Database, | ||
private val ioDispatcher: CoroutineContext | ||
) : MoneyDropDao, Logger by JUtiltLogger("MoneyDropDao") { | ||
override suspend fun addLocation(location: MoneyDropLocation) { | ||
if (isLocationExists(location)) return | ||
runCatching { | ||
withContext(ioDispatcher) { | ||
transaction(database) { | ||
MoneyDropLocationTable.insert { | ||
it[MoneyDropLocationTable.x] = location.x | ||
it[MoneyDropLocationTable.y] = location.y | ||
it[MoneyDropLocationTable.z] = location.z | ||
it[MoneyDropLocationTable.world] = location.world | ||
it[MoneyDropLocationTable.additionalConstraint] = location.additionalConstraint | ||
} | ||
} | ||
} | ||
}.onFailure { error { "#addLocation -> ${it.message}" } } | ||
} | ||
|
||
override suspend fun isLocationExists(location: MoneyDropLocation): Boolean { | ||
return runCatching { | ||
withContext(ioDispatcher) { | ||
transaction(database) { | ||
MoneyDropLocationTable | ||
.selectAll() | ||
.where { | ||
MoneyDropLocationTable.x.eq(location.x) | ||
.and(MoneyDropLocationTable.y.eq(location.y)) | ||
.and(MoneyDropLocationTable.z.eq(location.z)) | ||
.and(MoneyDropLocationTable.world.eq(location.world)) | ||
.and(MoneyDropLocationTable.additionalConstraint.eq(location.additionalConstraint)) | ||
}.count() > 0 | ||
} | ||
} | ||
} | ||
.onFailure { error { "#isLocationExists -> ${it.message}" } } | ||
.getOrElse { false } | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
...main/kotlin/ru/astrainteractive/aspekt/module/moneydrop/database/di/MoneyDropDaoModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
package ru.astrainteractive.aspekt.module.moneydrop.database.di | ||
|
||
import kotlinx.coroutines.runBlocking | ||
import org.jetbrains.exposed.sql.Database | ||
import org.jetbrains.exposed.sql.SchemaUtils | ||
import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger | ||
import org.jetbrains.exposed.sql.addLogger | ||
import org.jetbrains.exposed.sql.transactions.TransactionManager | ||
import org.jetbrains.exposed.sql.transactions.transaction | ||
import ru.astrainteractive.aspekt.module.moneydrop.database.dao.MoneyDropDao | ||
import ru.astrainteractive.aspekt.module.moneydrop.database.dao.impl.MoneyDropDaoImpl | ||
import ru.astrainteractive.aspekt.module.moneydrop.database.table.MoneyDropLocationTable | ||
import java.io.File | ||
import kotlin.coroutines.CoroutineContext | ||
|
||
internal interface MoneyDropDaoModule { | ||
val dao: MoneyDropDao | ||
|
||
class Default( | ||
dataFolder: File, | ||
ioDispatcher: CoroutineContext | ||
) : MoneyDropDaoModule { | ||
private val database by lazy { | ||
val path = dataFolder.resolve("moneydrops.db").absolutePath | ||
val database = Database.connect( | ||
url = "jdbc:sqlite:$path", | ||
driver = "org.sqlite.JDBC" | ||
) | ||
TransactionManager.manager.defaultIsolationLevel = java.sql.Connection.TRANSACTION_SERIALIZABLE | ||
runBlocking { | ||
transaction(database) { | ||
addLogger(Slf4jSqlDebugLogger) | ||
SchemaUtils.create( | ||
MoneyDropLocationTable, | ||
) | ||
} | ||
} | ||
database | ||
} | ||
override val dao: MoneyDropDao = MoneyDropDaoImpl( | ||
database = database, | ||
ioDispatcher = ioDispatcher | ||
) | ||
} | ||
} |
12 changes: 12 additions & 0 deletions
12
...in/kotlin/ru/astrainteractive/aspekt/module/moneydrop/database/model/MoneyDropLocation.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package ru.astrainteractive.aspekt.module.moneydrop.database.model | ||
|
||
import kotlinx.serialization.Serializable | ||
|
||
@Serializable | ||
internal data class MoneyDropLocation( | ||
val x: Int, | ||
val y: Int, | ||
val z: Int, | ||
val world: String, | ||
val additionalConstraint: String? = null | ||
) |
11 changes: 11 additions & 0 deletions
11
...tlin/ru/astrainteractive/aspekt/module/moneydrop/database/table/MoneyDropLocationTable.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package ru.astrainteractive.aspekt.module.moneydrop.database.table | ||
|
||
import org.jetbrains.exposed.dao.id.LongIdTable | ||
|
||
internal object MoneyDropLocationTable : LongIdTable(name = "MONEY_DROP_LOCATION") { | ||
val x = integer("x") | ||
val y = integer("y") | ||
val z = integer("z") | ||
val world = text("world") | ||
val additionalConstraint = text("additional_constraint").nullable() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.