commit a891322222a41059f9b278b921b967cc62dbde2e Author: KP9lKk Date: Wed Dec 18 19:41:45 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..9d10c3f --- /dev/null +++ b/README.md @@ -0,0 +1,44 @@ +# kidsapp + +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 | +| [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 | +| [Resources](https://start.ktor.io/p/resources) | Provides type-safe routing | + +## 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..7c931a9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,37 @@ + +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.exposed.core) + implementation(libs.exposed.jdbc) + implementation("org.postgresql:postgresql:42.7.4") + implementation("io.ktor:ktor-server-config-yaml-jvm:3.0.2") + implementation(libs.ktor.server.swagger) + implementation(libs.ktor.server.resources) + 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..3a4f125 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,27 @@ + +[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" + +[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" } +exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed-version" } +exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed-version" } +h2 = { module = "com.h2database:h2", version.ref = "h2-version" } +ktor-server-swagger = { module = "io.ktor:ktor-server-swagger-jvm", version.ref = "ktor-version" } +ktor-server-resources = { module = "io.ktor:ktor-server-resources-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/kidsapp.zip b/kidsapp.zip new file mode 100644 index 0000000..3aa7807 Binary files /dev/null and b/kidsapp.zip differ diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..3e5a696 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "kidsapp" diff --git a/src/main/kotlin/com/college/Application.kt b/src/main/kotlin/com/college/Application.kt new file mode 100644 index 0000000..1168930 --- /dev/null +++ b/src/main/kotlin/com/college/Application.kt @@ -0,0 +1,17 @@ +package com.college + +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.plugins.contentnegotiation.* + +fun main(args: Array) { + io.ktor.server.netty.EngineMain.main(args) +} + +fun Application.module() { + install(ContentNegotiation){ + json() + } + configureDatabases() + configureRouting() +} diff --git a/src/main/kotlin/com/college/Databases.kt b/src/main/kotlin/com/college/Databases.kt new file mode 100644 index 0000000..c5cf610 --- /dev/null +++ b/src/main/kotlin/com/college/Databases.kt @@ -0,0 +1,27 @@ +package com.college + +import com.college.UserService.Users +import io.ktor.http.* +import io.ktor.resources.* +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.plugins.swagger.* +import io.ktor.server.request.* +import io.ktor.server.resources.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import kotlinx.serialization.Serializable +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.transaction + +fun Application.configureDatabases() { + val database = Database.connect( + url = environment.config.property("ktor.db.url").getString(), + user = environment.config.property("ktor.db.user").getString(), + password = environment.config.property("ktor.db.password").getString(), + ) + transaction(database) { + SchemaUtils.create(Users) + } +} diff --git a/src/main/kotlin/com/college/HTTP.kt b/src/main/kotlin/com/college/HTTP.kt new file mode 100644 index 0000000..640e703 --- /dev/null +++ b/src/main/kotlin/com/college/HTTP.kt @@ -0,0 +1,53 @@ +package com.college + +import com.college.Requests.AuthorizeUserRequest +import com.college.Requests.RegisterUserRequest +import io.ktor.http.* +import io.ktor.resources.* +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.plugins.swagger.* +import io.ktor.server.request.* +import io.ktor.server.resources.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import kotlinx.serialization.Serializable +import org.jetbrains.exposed.sql.* + +fun Application.configureRouting() { + + val userService = UserService() + routing { + route("user") { + get { + val users = userService.getAllUsers() + call.respond(users) + } + put("{user_id}/clicks") { + val id = call.parameters["user_id"]?.toInt() + if (id != null) { + userService.registerClickByUser(id) + call.respond(HttpStatusCode.OK) + } + call.respond(HttpStatusCode.NotFound) + } + + + } + route("authorize") { + post("register") { + val user = call.receive() + val newUser: User? = userService.createUser(user) + if (newUser == null) call.respond(HttpStatusCode.Conflict) + call.respond(HttpStatusCode.OK, newUser!!) + } + post("auth") { + val user = call.receive() + val newUser: User? = userService.authorizeUser(user) + if (newUser == null) call.respond(HttpStatusCode.NotFound) + call.respond(HttpStatusCode.OK, newUser!!) + } + } + } +} diff --git a/src/main/kotlin/com/college/Requests/AuthorizeUserRequest.kt b/src/main/kotlin/com/college/Requests/AuthorizeUserRequest.kt new file mode 100644 index 0000000..e25b3be --- /dev/null +++ b/src/main/kotlin/com/college/Requests/AuthorizeUserRequest.kt @@ -0,0 +1,6 @@ +package com.college.Requests + +import kotlinx.serialization.Serializable + +@Serializable +data class AuthorizeUserRequest(val login:String, val password: String) diff --git a/src/main/kotlin/com/college/Requests/RegisterUserRequest.kt b/src/main/kotlin/com/college/Requests/RegisterUserRequest.kt new file mode 100644 index 0000000..a265ffd --- /dev/null +++ b/src/main/kotlin/com/college/Requests/RegisterUserRequest.kt @@ -0,0 +1,6 @@ +package com.college.Requests + +import kotlinx.serialization.Serializable + +@Serializable +data class RegisterUserRequest(val login:String, val password:String, var url:String?=null) \ No newline at end of file diff --git a/src/main/kotlin/com/college/UsersSchema.kt b/src/main/kotlin/com/college/UsersSchema.kt new file mode 100644 index 0000000..7ada587 --- /dev/null +++ b/src/main/kotlin/com/college/UsersSchema.kt @@ -0,0 +1,80 @@ +package com.college + +import com.college.Requests.AuthorizeUserRequest +import com.college.Requests.RegisterUserRequest +import kotlinx.coroutines.Dispatchers +import kotlinx.serialization.Serializable +import org.jetbrains.exposed.dao.id.IntIdTable +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction +import org.jetbrains.exposed.sql.transactions.transaction + +@Serializable +data class User(val id:Int, val nickname: String, val password: String, val clicks:Int, var url:String? = null ) + +class UserService() { + object Users : IntIdTable() { + val nickname = text("name") + val clicks = integer("clicks") + val password = text("password") + val url = text("url").nullable() + } + + + suspend fun getAllUsers(): List = dbQuery { + Users.selectAll().map { it -> User( + id = it[Users.id].value, + nickname = it[Users.nickname], + password = it[Users.password], + clicks = it[Users.clicks], + url = it[Users.url] + ) } + } + + suspend fun authorizeUser(userRequest:AuthorizeUserRequest): User? = dbQuery{ + val user = Users.selectAll().where{ + Users.nickname eq userRequest.login + }.andWhere { + Users.password eq userRequest.password + }.map { it -> User( + id = it[Users.id].value, + nickname = it[Users.nickname], + password = it[Users.password], + clicks = it[Users.clicks], + url = it[Users.url] + ) + }; + return@dbQuery user.firstOrNull() + } + + suspend fun createUser(user: RegisterUserRequest): User? = dbQuery { + val user = Users.insertReturning { + it[nickname] = user.login + it[password] = user.password + it[url] = user.url + it[clicks] = 0 + }.map { + it -> User( + id = it[Users.id].value, + nickname = it[Users.nickname], + password = it[Users.password], + clicks = it[Users.clicks], + url = it[Users.url],) + } + return@dbQuery user.firstOrNull() + } + + suspend fun registerClickByUser(userID: Int) { + dbQuery { + Users.update({ Users.id eq userID }) { + with(SqlExpressionBuilder){ + it[clicks] = clicks + 1 + } + } + } + } + + private suspend fun dbQuery(block: suspend () -> T): T = + newSuspendedTransaction(Dispatchers.IO) { block() } +} + diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf new file mode 100644 index 0000000..2516332 --- /dev/null +++ b/src/main/resources/application.conf @@ -0,0 +1,16 @@ +ktor{ + application{ + modules: + [com.college.ApplicationKt.module] + } + db{ + url ="jdbc:postgresql://localhost:5432/kids_app_db", + user ="postgres" + password = "123" + } + + deployment{ + port = 8080 + } +} + 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 diff --git a/src/main/resources/openapi/documentation.yaml b/src/main/resources/openapi/documentation.yaml new file mode 100644 index 0000000..4c04d7f --- /dev/null +++ b/src/main/resources/openapi/documentation.yaml @@ -0,0 +1,23 @@ +openapi: "3.0.3" +info: + title: "Application API" + description: "Application API" + version: "1.0.0" +servers: + - url: "http://0.0.0.0:8080" +paths: + /: + get: + description: "Hello World!" + responses: + "200": + description: "OK" + content: + text/plain: + schema: + type: "string" + examples: + Example#1: + value: "Hello World!" +components: + schemas: {} \ No newline at end of file diff --git a/src/test/kotlin/com/college/ApplicationTest.kt b/src/test/kotlin/com/college/ApplicationTest.kt new file mode 100644 index 0000000..4afbeb2 --- /dev/null +++ b/src/test/kotlin/com/college/ApplicationTest.kt @@ -0,0 +1,21 @@ +package com.college + +import io.ktor.client.request.* +import io.ktor.http.* +import io.ktor.server.testing.* +import kotlin.test.Test +import kotlin.test.assertEquals + +class ApplicationTest { + + @Test + fun testRoot() = testApplication { + application { + module() + } + client.get("/").apply { + assertEquals(HttpStatusCode.OK, status) + } + } + +}