commit a39dd6978cb10d635d2f8cb1704ae5262b9b82af Author: KP9lKk Date: Fri Dec 20 19:23:31 2024 +0300 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c426c32 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..39fb0fc --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ +# presence + +This project was created using the [Ktor Project Generator](https://start.ktor.io). + +Here are some useful links to get you started: + +- [Ktor Documentation](https://ktor.io/docs/home.html) +- [Ktor GitHub page](https://github.com/ktorio/ktor) +- The [Ktor Slack chat](https://app.slack.com/client/T09229ZC6/C0A974TJ9). You'll need to [request an invite](https://surveys.jetbrains.com/s3/kotlin-slack-sign-up) to join. + +## Features + +Here's a list of features included in this project: + +| Name | Description | +| ------------------------------------------------------------------------|------------------------------------------------------------------------------------ | +| [Routing](https://start.ktor.io/p/routing) | Provides a structured routing DSL | +| [kotlinx.serialization](https://start.ktor.io/p/kotlinx-serialization) | Handles JSON serialization using kotlinx.serialization library | +| [Content Negotiation](https://start.ktor.io/p/content-negotiation) | Provides automatic content conversion according to Content-Type and Accept headers | +| [Postgres](https://start.ktor.io/p/postgres) | Adds Postgres database to your application | +| [Exposed](https://start.ktor.io/p/exposed) | Adds Exposed database to your application | +| [Swagger](https://start.ktor.io/p/swagger) | Serves Swagger UI for your project | +| [CORS](https://start.ktor.io/p/cors) | Enables Cross-Origin Resource Sharing (CORS) | +| [Authentication](https://start.ktor.io/p/auth) | Provides extension point for handling the Authorization header | +| [Authentication JWT](https://start.ktor.io/p/auth-jwt) | Handles JSON Web Token (JWT) bearer authentication scheme | + +## Building & Running + +To build or run the project, use one of the following tasks: + +| Task | Description | +| -------------------------------|---------------------------------------------------------------------- | +| `./gradlew test` | Run the tests | +| `./gradlew build` | Build everything | +| `buildFatJar` | Build an executable JAR of the server with all dependencies included | +| `buildImage` | Build the docker image to use with the fat JAR | +| `publishImageToLocalRegistry` | Publish the docker image locally | +| `run` | Run the server | +| `runDocker` | Run using the local docker image | + +If the server starts successfully, you'll see the following output: + +``` +2024-12-04 14:32:45.584 [main] INFO Application - Application started in 0.303 seconds. +2024-12-04 14:32:45.682 [main] INFO Application - Responding at http://0.0.0.0:8080 +``` + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..8a019c3 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,41 @@ + +plugins { + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.ktor) + alias(libs.plugins.kotlin.plugin.serialization) +} + +group = "com.college" +version = "0.0.1" + +application { + mainClass.set("io.ktor.server.netty.EngineMain") + + val isDevelopment: Boolean = project.ext.has("development") + applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") +} + +repositories { + mavenCentral() +} + +dependencies { + implementation(libs.ktor.server.core) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(libs.ktor.server.content.negotiation) + implementation(libs.postgresql) + implementation("io.insert-koin:koin-ktor:4.0.0") + implementation("org.jetbrains.exposed:exposed-java-time:0.57.0") + implementation(libs.exposed.core) + implementation("io.ktor:ktor-server-config-yaml-jvm:3.0.3") + implementation(libs.exposed.jdbc) + implementation(libs.ktor.server.swagger) + implementation(libs.ktor.server.cors) + implementation(libs.ktor.server.auth) + implementation(libs.ktor.server.auth.jwt) + implementation(libs.ktor.server.netty) + implementation(libs.logback.classic) + implementation(libs.ktor.server.config.yaml) + testImplementation(libs.ktor.server.test.host) + testImplementation(libs.kotlin.test.junit) +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7fc6f1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..25bba8b --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,31 @@ + +[versions] +exposed-version = "0.57.0" +h2-version = "2.3.232" +kotlin-version = "2.1.0" +ktor-version = "3.0.2" +logback-version = "1.4.14" +postgres-version = "42.7.4" + +[libraries] +ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor-version" } +ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json-jvm", version.ref = "ktor-version" } +ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation-jvm", version.ref = "ktor-version" } +postgresql = { module = "org.postgresql:postgresql", version.ref = "postgres-version" } +h2 = { module = "com.h2database:h2", version.ref = "h2-version" } +exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed-version" } +exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed-version" } +ktor-server-swagger = { module = "io.ktor:ktor-server-swagger-jvm", version.ref = "ktor-version" } +ktor-server-cors = { module = "io.ktor:ktor-server-cors-jvm", version.ref = "ktor-version" } +ktor-server-auth = { module = "io.ktor:ktor-server-auth-jvm", version.ref = "ktor-version" } +ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt-jvm", version.ref = "ktor-version" } +ktor-server-netty = { module = "io.ktor:ktor-server-netty-jvm", version.ref = "ktor-version" } +logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback-version" } +ktor-server-config-yaml = { module = "io.ktor:ktor-server-config-yaml-jvm", version.ref = "ktor-version" } +ktor-server-test-host = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktor-version" } +kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin-version" } + +[plugins] +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" } +ktor = { id = "io.ktor.plugin", version.ref = "ktor-version" } +kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e411586 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..304edbb --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "presence" diff --git a/src/main/kotlin/com/college/Application.kt b/src/main/kotlin/com/college/Application.kt new file mode 100644 index 0000000..07f1d72 --- /dev/null +++ b/src/main/kotlin/com/college/Application.kt @@ -0,0 +1,13 @@ +package com.college + +import io.ktor.server.application.* +import org.koin.ktor.plugin.Koin + +fun main(args: Array) { + io.ktor.server.netty.EngineMain.main(args) +} + +fun Application.module() { + install(Koin) + +} diff --git a/src/main/kotlin/com/college/data/DbSettings.kt b/src/main/kotlin/com/college/data/DbSettings.kt new file mode 100644 index 0000000..5acccaf --- /dev/null +++ b/src/main/kotlin/com/college/data/DbSettings.kt @@ -0,0 +1,20 @@ +package com.college.data + +import io.ktor.server.application.* +import io.ktor.server.engine.* +import org.jetbrains.exposed.sql.Database +import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction + +object DbSettings { + val db by lazy { + Database.connect( + url = "jdbc:postgresql://localhost:5432/presence", + user = "postgres", + password = "123" + ) + } + + suspend fun query(block: suspend () -> T): T = + newSuspendedTransaction { block() } + +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/mapper/mappers.kt b/src/main/kotlin/com/college/data/mapper/mappers.kt new file mode 100644 index 0000000..e5ff78a --- /dev/null +++ b/src/main/kotlin/com/college/data/mapper/mappers.kt @@ -0,0 +1,34 @@ +package com.college.data.mapper + +import com.college.data.table.RoleIdTable +import com.college.data.table.UserUuidTable +import com.college.domain.model.Role +import com.college.domain.model.User +import org.jetbrains.exposed.sql.ResultRow + +fun resultRowToRole(result: ResultRow): Role { + return Role( + id = result[RoleIdTable.id].value, + name = result[RoleIdTable.role] + ) +} + +fun resultRowToUser(result: ResultRow):User { + return User( + uuid = result[UserUuidTable.id].value, + login = result[UserUuidTable.login], + password = result[UserUuidTable.password], + ) +} + +fun resultRowToUserWithJoinRole(result: ResultRow):User{ + return User( + uuid = result[UserUuidTable.id].value, + login = result[UserUuidTable.login], + password = result[UserUuidTable.password], + role = Role ( + result[RoleIdTable.id].value, + result[RoleIdTable.role] + ) + ) +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/repositorty/RoleRepository.kt b/src/main/kotlin/com/college/data/repositorty/RoleRepository.kt new file mode 100644 index 0000000..d38e58d --- /dev/null +++ b/src/main/kotlin/com/college/data/repositorty/RoleRepository.kt @@ -0,0 +1,9 @@ +package com.college.data.repositorty + +import com.college.domain.model.Role + +interface RoleRepository { + suspend fun getAllRoles():Role + suspend fun removeRoleById(rolId: Int): Boolean + suspend fun changeName(rolId: Int, nameRole:String) +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/repositorty/UserRepository.kt b/src/main/kotlin/com/college/data/repositorty/UserRepository.kt new file mode 100644 index 0000000..9a5797d --- /dev/null +++ b/src/main/kotlin/com/college/data/repositorty/UserRepository.kt @@ -0,0 +1,13 @@ +package com.college.data.repositorty + +import com.college.domain.model.User +import com.college.domain.request.UserCreateRequest +import java.util.UUID + +interface UserRepository { + suspend fun getUserByUuid(userUuid: UUID): User? + suspend fun removeUserByUuid(userUuid: UUID): Boolean + suspend fun addUser(userCreateRequest: UserCreateRequest): User + suspend fun getAllUsers(): List? + suspend fun updateUser(userUuid: UUID, updatedUser: User): Boolean +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/repositorty/UserRepositoryImpl.kt b/src/main/kotlin/com/college/data/repositorty/UserRepositoryImpl.kt new file mode 100644 index 0000000..05414ad --- /dev/null +++ b/src/main/kotlin/com/college/data/repositorty/UserRepositoryImpl.kt @@ -0,0 +1,58 @@ +package com.college.data.repositorty + +import com.college.data.DbSettings +import com.college.data.mapper.resultRowToUser +import com.college.data.mapper.resultRowToUserWithJoinRole +import com.college.data.table.RoleIdTable +import com.college.data.table.UserUuidTable +import com.college.domain.model.User +import com.college.domain.request.UserCreateRequest +import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.sql.insertReturning +import org.jetbrains.exposed.sql.selectAll +import org.jetbrains.exposed.sql.update +import java.util.* + +class UserRepositoryImpl(val database: DbSettings): UserRepository { + override suspend fun getUserByUuid(userUuid: UUID): User? = database.query { + (UserUuidTable innerJoin RoleIdTable).selectAll().where { + UserUuidTable.id eq userUuid + } + .map(::resultRowToUserWithJoinRole) + .firstOrNull() + } + + override suspend fun removeUserByUuid(userUuid: UUID): Boolean = database.query{ + val result = UserUuidTable.deleteWhere { + UserUuidTable.id eq userUuid + } + result > 0 + } + + override suspend fun addUser(userCreateRequest: UserCreateRequest): User = database.query { + val result = UserUuidTable.insertReturning { + it[password] = userCreateRequest.password + it[login] = userCreateRequest.login + it[role] = userCreateRequest.role.id + } + resultRowToUser(result.first()) + } + + override suspend fun getAllUsers(): List = database.query{ + (UserUuidTable innerJoin RoleIdTable) + .selectAll() + .map(::resultRowToUserWithJoinRole) + } + + override suspend fun updateUser(userUuid: UUID, updatedUser: User): Boolean = database.query{ + val result = UserUuidTable.update({UserUuidTable.id eq userUuid}){ oldUser -> + oldUser[login] = updatedUser.login + oldUser[password] = updatedUser.password + val newRole = checkNotNull(updatedUser.role) + oldUser[role] = newRole.id + } + result > 0 + } + +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/AttendanceTypeIntTable.kt b/src/main/kotlin/com/college/data/table/AttendanceTypeIntTable.kt new file mode 100644 index 0000000..d7c6fdb --- /dev/null +++ b/src/main/kotlin/com/college/data/table/AttendanceTypeIntTable.kt @@ -0,0 +1,7 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.IntIdTable + +object AttendanceTypeIntTable: IntIdTable(name = "attendance_types") { + val attendanceTypeName = text("attendance_type_name") +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/GroupIntTable.kt b/src/main/kotlin/com/college/data/table/GroupIntTable.kt new file mode 100644 index 0000000..dcc9e3d --- /dev/null +++ b/src/main/kotlin/com/college/data/table/GroupIntTable.kt @@ -0,0 +1,7 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.IntIdTable + +object GroupIntTable:IntIdTable(name = "groups") { + val groupName = text("group_name") +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/PresenceAttendanceIntTable.kt b/src/main/kotlin/com/college/data/table/PresenceAttendanceIntTable.kt new file mode 100644 index 0000000..dace06f --- /dev/null +++ b/src/main/kotlin/com/college/data/table/PresenceAttendanceIntTable.kt @@ -0,0 +1,12 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.IntIdTable +import org.jetbrains.exposed.sql.javatime.date + +object PresenceAttendanceIntTable:IntIdTable(name = "presences") { + val user = reference("user_id", UserUuidTable ) + val attendanceType = reference("attendance_type_id", AttendanceTypeIntTable) + val date = date("presence_date").default(java.time.LocalDate.now()) + val subject = reference("subject_id", SubjectIntTable) + val lessonNumber = integer(name = "presence_lesson_number") +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/RoleIdTable.kt b/src/main/kotlin/com/college/data/table/RoleIdTable.kt new file mode 100644 index 0000000..042d46c --- /dev/null +++ b/src/main/kotlin/com/college/data/table/RoleIdTable.kt @@ -0,0 +1,7 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.IntIdTable + +object RoleIdTable:IntIdTable(name = "roles") { + val role = text(name = "role_name") +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/StudentUuidTable.kt b/src/main/kotlin/com/college/data/table/StudentUuidTable.kt new file mode 100644 index 0000000..7e01f0a --- /dev/null +++ b/src/main/kotlin/com/college/data/table/StudentUuidTable.kt @@ -0,0 +1,9 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.UUIDTable + +object StudentUuidTable:UUIDTable(name = "students") { + val studentName = text("student_name") + val studentGroup = reference("group_id", GroupIntTable) + val studentIsStudy = bool("student_is_study") +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/SubjectIntTable.kt b/src/main/kotlin/com/college/data/table/SubjectIntTable.kt new file mode 100644 index 0000000..5cebaca --- /dev/null +++ b/src/main/kotlin/com/college/data/table/SubjectIntTable.kt @@ -0,0 +1,7 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.IntIdTable + +object SubjectIntTable:IntIdTable(name = "subjects") { + val subjectName = text("subject_name") +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/data/table/UserUuidTable.kt b/src/main/kotlin/com/college/data/table/UserUuidTable.kt new file mode 100644 index 0000000..d6e615c --- /dev/null +++ b/src/main/kotlin/com/college/data/table/UserUuidTable.kt @@ -0,0 +1,9 @@ +package com.college.data.table + +import org.jetbrains.exposed.dao.id.UUIDTable + +object UserUuidTable:UUIDTable(name = "users") { + val password = text(name = "user_password") + val login = text(name = "user_login") + val role = reference("role_id", RoleIdTable) +} \ No newline at end of file diff --git a/src/main/kotlin/com/college/domain/model/Role.kt b/src/main/kotlin/com/college/domain/model/Role.kt new file mode 100644 index 0000000..11404df --- /dev/null +++ b/src/main/kotlin/com/college/domain/model/Role.kt @@ -0,0 +1,6 @@ +package com.college.domain.model + +data class Role ( + val id: Int, + val name: String +) \ No newline at end of file diff --git a/src/main/kotlin/com/college/domain/model/User.kt b/src/main/kotlin/com/college/domain/model/User.kt new file mode 100644 index 0000000..53908de --- /dev/null +++ b/src/main/kotlin/com/college/domain/model/User.kt @@ -0,0 +1,10 @@ +package com.college.domain.model + +import java.util.UUID + +data class User( + val uuid: UUID, + val login:String, + val password:String, + val role: Role? = null +) diff --git a/src/main/kotlin/com/college/domain/request/UserCreateRequest.kt b/src/main/kotlin/com/college/domain/request/UserCreateRequest.kt new file mode 100644 index 0000000..ec6ed1d --- /dev/null +++ b/src/main/kotlin/com/college/domain/request/UserCreateRequest.kt @@ -0,0 +1,9 @@ +package com.college.domain.request + +import com.college.domain.model.Role + +data class UserCreateRequest( + val login:String, + val password:String, + val role: Role +) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..00b5634 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,10 @@ +ktor: + application: + modules: + - com.college.ApplicationKt.module + deployment: + port: 8080 +postgres: + url: "jdbc:postgresql://localhost:5432/presence" + user: "postgres" + password: "123" diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..3e11d78 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file