Feat/statistic (#44)

* Добавить зависимость для сессий

* Обновить версию ктора с 1.5.0 до 1.5.3

* Добавить статистику

Co-authored-by: Atabayev Muslim <[email protected]>

Author: SkyfaceD

.gitignore

@@ -2,7 +2,8 @@
 /.idea
 /out
 /build
-/_files
+/.files
+/.sessions
 /documentation
 *.iml
 *.ipr

Dockerfile

@@ -6,7 +6,8 @@ RUN adduser -D -g '' $USER
 
 # Creating work directory and giving permissions
 RUN mkdir /app \
-    && mkdir /app/_files \
+    && mkdir /app/.files \
+    && mkdir /app/.sessions \
     && mkdir /app/resources \
     && chown -R $USER /app \
     && chmod -R 755 /app

build.gradle

@@ -69,6 +69,7 @@ allprojects {
         //Ktor
         implementation "io.ktor:ktor-server-netty:$ktorVersion"
         implementation "io.ktor:ktor-server-core:$ktorVersion"
+        implementation "io.ktor:ktor-server-sessions:$ktorVersion"
         implementation "io.ktor:ktor-auth:$ktorVersion"
         implementation "io.ktor:ktor-auth-jwt:$ktorVersion"
         implementation "io.ktor:ktor-gson:$ktorVersion"

gradle.properties

@@ -3,7 +3,7 @@ kotlinVersion=1.4.31
 hikariVersion=3.4.5
 exposedVersion=0.29.1
 postgresqlVersion=42.2.16
-ktorVersion=1.5.0
+ktorVersion=1.5.3
 logbackVersion=1.2.1
 koinVersion=2.2.2
 shadowVersion=6.1.0

src/kz/seasky/tms/Application.kt

@@ -4,6 +4,7 @@ import io.ktor.application.*
 import io.ktor.features.*
 import io.ktor.gson.*
 import io.ktor.server.netty.*
+import io.ktor.sessions.*
 import kz.seasky.tms.di.modules.applicationModule
 import kz.seasky.tms.di.modules.authenticationModule
 import kz.seasky.tms.di.modules.databaseModule
@@ -13,8 +14,12 @@ import kz.seasky.tms.features.PermissionFeature
 import kz.seasky.tms.features.installAuthentication
 import kz.seasky.tms.features.installRouting
 import kz.seasky.tms.features.installStatusPages
+import kz.seasky.tms.model.statistic.Statistic
 import kz.seasky.tms.utils.BuildConfig
+import kz.seasky.tms.utils.COOKIE_STATISTIC_NAME
+import kz.seasky.tms.utils.SESSION_ROOT_DIR
 import org.koin.ktor.ext.Koin
+import java.io.File
 
 fun main(args: Array<String>) {
 //    EngineMain.main(args + arrayOf("-P:args=${args.toList()}"))
@@ -56,6 +61,16 @@ private fun Application.setRestAPI() {
     install(CallLogging)
     install(CORS)
 
+    install(Sessions) {
+        cookie<Statistic>(
+            name = COOKIE_STATISTIC_NAME,
+            storage = directorySessionStorage(File(SESSION_ROOT_DIR), true),
+            block = {
+                cookie.maxAgeInSeconds = 5 * 60 * 1000
+            }
+        )
+    }
+
     install(ContentNegotiation) {
         gson { serializeNulls() }
     }

src/kz/seasky/tms/di/modules/RepositoryModule.kt

@@ -2,6 +2,9 @@ package kz.seasky.tms.di.modules
 
 import kz.seasky.tms.repository.role.RoleRepository
 import kz.seasky.tms.repository.role.RoleService
+import kz.seasky.tms.repository.statistic.StatisticRepository
+import kz.seasky.tms.repository.statistic.StatisticService
+import kz.seasky.tms.repository.statistic.StatisticServiceImpl
 import kz.seasky.tms.repository.status.StatusRepository
 import kz.seasky.tms.repository.status.StatusService
 import kz.seasky.tms.repository.task.TaskRepository
@@ -10,6 +13,7 @@ import kz.seasky.tms.repository.user.UserRepository
 import kz.seasky.tms.repository.user.UserService
 import kz.seasky.tms.utils.FileHelper
 import org.koin.dsl.module
+import org.koin.experimental.builder.singleBy
 
 val repositoryModule = module {
     single { RoleRepository() }
@@ -29,4 +33,7 @@ val repositoryModule = module {
     single { UserRepository() }
 
     single { UserService(get(), get()) }
+
+    singleBy<StatisticService, StatisticServiceImpl>()
+    single { StatisticRepository(taskService = get(), fileHelper = get()) }
 }

src/kz/seasky/tms/model/statistic/Statistic.kt

@@ -0,0 +1,17 @@
+package kz.seasky.tms.model.statistic
+
+data class Statistic(
+    val task: Task,
+    val disk: Disk
+) {
+    data class Task(val all: Status, val actual: Status) {
+        data class Status(
+            val new: Long,
+            val inWork: Long,
+            val canceled: Long,
+            val closed: Long
+        )
+    }
+
+    data class Disk(val available: Long, val used: Long)
+}

src/kz/seasky/tms/repository/statistic/StatisticRepository.kt

@@ -0,0 +1,26 @@
+package kz.seasky.tms.repository.statistic
+
+import kz.seasky.tms.model.statistic.Statistic
+import kz.seasky.tms.repository.task.TaskService
+import kz.seasky.tms.utils.FileHelper
+
+class StatisticRepository(
+    private val taskService: TaskService,
+    private val fileHelper: FileHelper
+) {
+    suspend fun getTasksAll(): Statistic.Task.Status {
+        return taskService.getAllCount()
+    }
+
+    suspend fun getTasksActual(): Statistic.Task.Status {
+        return taskService.getActualCount()
+    }
+
+    suspend fun getFileUsedSpace(): Long {
+        return fileHelper.usedSpace()
+    }
+
+    suspend fun getFileAvailableSpace(): Long {
+        return fileHelper.availableSpace()
+    }
+}

src/kz/seasky/tms/repository/statistic/StatisticService.kt

@@ -0,0 +1,22 @@
+package kz.seasky.tms.repository.statistic
+
+import io.ktor.sessions.*
+import kz.seasky.tms.model.statistic.Statistic
+
+interface StatisticService {
+    suspend fun getAndUpdateSession(sessions: CurrentSession): Statistic
+}
+
+class StatisticServiceImpl(private val repository: StatisticRepository) : StatisticService {
+    @Suppress("UnnecessaryVariable")
+    override suspend fun getAndUpdateSession(sessions: CurrentSession): Statistic {
+        val statistic = Statistic(
+            task = Statistic.Task(repository.getTasksAll(), repository.getTasksActual()),
+            disk = Statistic.Disk(repository.getFileUsedSpace(), repository.getFileAvailableSpace())
+        )
+
+        sessions.set(statistic)
+
+        return statistic
+    }
+}

src/kz/seasky/tms/repository/task/TaskRepository.kt

@@ -18,8 +18,29 @@ import kz.seasky.tms.model.paging.Paging
 import kz.seasky.tms.model.task.*
 import org.jetbrains.exposed.exceptions.ExposedSQLException
 import org.jetbrains.exposed.sql.*
+import org.joda.time.DateTime
 
 class TaskRepository {
+    fun countAll(): Map<Short, Long> {
+        return TaskTable
+            .slice(TaskTable.status, TaskTable.status.count())
+            .selectAll()
+            .groupBy(TaskTable.status)
+            .associate { row ->
+                row[TaskTable.status].value to row[TaskTable.status.count()]
+            }
+    }
+
+    fun countAll(dueDate: DateTime): Map<Short, Long> {
+        return TaskTable
+            .slice(TaskTable.status, TaskTable.status.count())
+            .select { TaskTable.dueDate greaterEq dueDate }
+            .groupBy(TaskTable.status)
+            .associate { row ->
+                row[TaskTable.status].value to row[TaskTable.status.count()]
+            }
+    }
+
     fun countReceived(userId: UUID, statusId: Short): Long {
         return TaskInstanceEntity
             .find { (TaskInstanceTable.executor eq userId) and (TaskInstanceTable.status eq statusId) }

src/kz/seasky/tms/repository/task/TaskService.kt

@@ -6,16 +6,19 @@ import kotlinx.coroutines.withContext
 import kotlinx.uuid.UUID
 import kz.seasky.tms.database.TransactionService
 import kz.seasky.tms.database.tables.task.TaskInstanceEntity
+import kz.seasky.tms.enums.Status
 import kz.seasky.tms.exceptions.ErrorException
 import kz.seasky.tms.exceptions.WarningException
 import kz.seasky.tms.extensions.asUUID
 import kz.seasky.tms.model.file.FileInsert
 import kz.seasky.tms.model.paging.Paging
 import kz.seasky.tms.model.paging.PagingResponse
+import kz.seasky.tms.model.statistic.Statistic
 import kz.seasky.tms.model.task.*
 import kz.seasky.tms.utils.FILE_DEFAULT_SIZE
 import kz.seasky.tms.utils.FileHelper
 import kz.seasky.tms.utils.asMiB
+import org.joda.time.DateTime
 import java.io.File
 
 class TaskService(
@@ -321,4 +324,28 @@ class TaskService(
             return@transaction if (file.exists()) file else throw ErrorException("Нет такого файла :c")
         }
     }
+
+    suspend fun getAllCount(): Statistic.Task.Status {
+        return transactionService.transaction {
+            val countsByStatus = repository.countAll()
+            return@transaction countsByStatus.extract()
+        }
+    }
+
+    suspend fun getActualCount(): Statistic.Task.Status {
+        return transactionService.transaction {
+            val currentTime = DateTime.now()
+            val countsByStatus = repository.countAll(currentTime)
+            return@transaction countsByStatus.extract()
+        }
+    }
+
+    private fun Map<Short, Long>.extract(): Statistic.Task.Status {
+        return Statistic.Task.Status(
+            new = getOrDefault(Status.New.value, 0),
+            inWork = getOrDefault(Status.InWork.value, 0),
+            canceled = getOrDefault(Status.Canceled.value, 0),
+            closed = getOrDefault(Status.Closed.value, 0)
+        )
+    }
 }

src/kz/seasky/tms/route/api/v1/Root.kt

@@ -10,6 +10,8 @@ fun Route.v1() {
 
         authentication()
 
+        statistic()
+
         authenticate(JWT_NAME_STANDARD) {
             permission()
 
@@ -22,4 +24,4 @@ fun Route.v1() {
             user()
         }
     }
-}
+}

src/kz/seasky/tms/route/api/v1/Statistic.kt

@@ -0,0 +1,33 @@
+package kz.seasky.tms.route.api.v1
+
+import io.ktor.application.*
+import io.ktor.response.*
+import io.ktor.routing.*
+import io.ktor.sessions.*
+import kz.seasky.tms.extensions.success
+import kz.seasky.tms.model.statistic.Statistic
+import kz.seasky.tms.repository.statistic.StatisticService
+import org.koin.ktor.ext.inject
+
+fun Route.statistic() {
+    val service: StatisticService by inject()
+
+    get("/smile") { call.respondText("Smile") }
+
+    get("/sweet") { call.respondText("Sweet") }
+
+    get("/sister") { call.respondText("Sister") }
+
+    get("/statistic") {
+        val statistic = call.sessions.get<Statistic>()?.let { statistic ->
+            return@let statistic
+        } ?: service.getAndUpdateSession(call.sessions)
+        call.success(data = statistic)
+    }
+
+    get("/surprise") { call.respondText("Surprise") }
+
+    get("/service") { call.respondText("Service") }
+
+    get("/we-are-spirit") { call.respondText("We Are Spirit") }
+}

src/kz/seasky/tms/utils/Constants.kt

@@ -8,7 +8,10 @@ const val MAX_PASSWORD_LENGTH = 32
 const val JWT_NAME_STANDARD = "jwt-token"
 const val JWT_CLAIM_ID = "jwt-id"
 
-const val FILE_ROOT_DIR = "./_files"
+const val FILE_ROOT_DIR = "./.files"
 
 /** Equals 26214400 bytes or 25MiB */
-const val FILE_DEFAULT_SIZE: Long = 25 * 1024 * 1024
+const val FILE_DEFAULT_SIZE: Long = 25 * 1024 * 1024
+
+const val SESSION_ROOT_DIR = "./.sessions"
+const val COOKIE_STATISTIC_NAME = "cookie-statistic-name"

src/kz/seasky/tms/utils/FileHelper.kt

@@ -9,6 +9,8 @@ import java.io.File
 import java.io.InputStream
 
 class FileHelper {
+    private val directory = File(FILE_ROOT_DIR)
+
     companion object {
         const val KEY_SUCCESS = "success"
         const val KEY_ERROR = "error"
@@ -66,6 +68,14 @@ class FileHelper {
             return@withContext output.toByteArray()
         }
     }
+
+    suspend fun usedSpace(): Long = withContext(Dispatchers.IO) {
+        return@withContext directory.totalSpace - directory.usableSpace
+    }
+
+    suspend fun availableSpace(): Long = withContext(Dispatchers.IO) {
+        return@withContext directory.usableSpace
+    }
 }
 
 fun Long.asMiB() = this / (1024 * 1024)