commit 3038eb5a0b30ba03a6c0738a929cb84991a83d2e Author: adm Date: Fri Oct 25 18:03:13 2024 +0300 git 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/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..0e012c7 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,50 @@ + +val kotlin_version: String by project +val logback_version: String by project +val exposed_version: String by project +val h2_version: String by project + +plugins { + kotlin("jvm") version "2.0.21" + id("io.ktor.plugin") version "3.0.0" + id("org.jetbrains.kotlin.plugin.serialization") version "2.0.21" +} + +group = "com.example" +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("io.ktor:ktor-server-core-jvm") + implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") + implementation("io.ktor:ktor-server-content-negotiation-jvm") + + implementation("org.jetbrains.exposed:exposed-core:$exposed_version") + implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version") + implementation ("org.jetbrains.exposed:exposed-dao:$exposed_version") + implementation("org.jetbrains.exposed:exposed-kotlin-datetime:$exposed_version") + + + implementation("org.postgresql:postgresql:42.7.4") + + implementation("io.insert-koin:koin-ktor:4.0.0") + + implementation("io.ktor:ktor-server-swagger-jvm") + implementation("io.ktor:ktor-server-auth-jvm") + implementation("io.ktor:ktor-server-auth-jwt-jvm") + implementation("io.ktor:ktor-server-netty-jvm") + implementation("ch.qos.logback:logback-classic:$logback_version") + implementation("io.ktor:ktor-server-config-yaml") + testImplementation("io.ktor:ktor-server-test-host-jvm") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5c0ab79 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +kotlin.code.style=official +ktor_version=3.0.0 +kotlin_version=2.0.21 +logback_version=1.4.14 +exposed_version=0.53.0 +h2_version=2.2.224 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 100644 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..d2fc562 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "com.example.presence" diff --git a/src/main/kotlin/com/example/Application.kt b/src/main/kotlin/com/example/Application.kt new file mode 100644 index 0000000..1a7cdc8 --- /dev/null +++ b/src/main/kotlin/com/example/Application.kt @@ -0,0 +1,17 @@ +package com.example + +import com.example.data.configureDatabases +import com.example.plugins.* +import io.ktor.server.application.* + +fun main(args: Array) { + io.ktor.server.netty.EngineMain.main(args) +} + +fun Application.module() { + + configureKoin() + configureSerialization() + configureDatabases() + configureRouting() +} diff --git a/src/main/kotlin/com/example/common/mapping.kt b/src/main/kotlin/com/example/common/mapping.kt new file mode 100644 index 0000000..cd7b7af --- /dev/null +++ b/src/main/kotlin/com/example/common/mapping.kt @@ -0,0 +1,21 @@ +package com.example.common + +import com.example.data.entity.GroupDAO +import com.example.data.entity.UserDAO +import com.example.domain.group.GroupModel +import com.example.domain.models.UserModel +import kotlinx.coroutines.Dispatchers +import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction + +suspend fun dbQuery(block: () -> T): T = + newSuspendedTransaction(Dispatchers.IO) { block() } + +fun daoGroupToModel(daoGroup: GroupDAO) = GroupModel( + id = daoGroup.id.value, + name = daoGroup.name, + users = daoGroup.users.map { daoUserToModel(it) } +) +fun daoUserToModel(daoUser: UserDAO) = UserModel( + uuid = daoUser.id.value.toString(), + name = daoUser.name +) \ No newline at end of file diff --git a/src/main/kotlin/com/example/controller/AdminRouter.kt b/src/main/kotlin/com/example/controller/AdminRouter.kt new file mode 100644 index 0000000..9a2f93f --- /dev/null +++ b/src/main/kotlin/com/example/controller/AdminRouter.kt @@ -0,0 +1,21 @@ +package com.example.controller + +import com.example.controller.requests.user.CreateUserWithGroupRequest +import com.example.data.models.UserCreateWithoutGroupRequest +import com.example.domain.admin.AdminService +import io.ktor.server.application.* +import io.ktor.server.request.* +import io.ktor.server.routing.* + + +fun Application.adminRouter(adminService: AdminService){ + + routing { + route("admin"){ + post { + val request = call.receive() + adminService.createGroupWithStudents(request.groupName, request.usersName.map { it -> UserCreateWithoutGroupRequest(it.name) }) + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/controller/GroupRouter.kt b/src/main/kotlin/com/example/controller/GroupRouter.kt new file mode 100644 index 0000000..9404d21 --- /dev/null +++ b/src/main/kotlin/com/example/controller/GroupRouter.kt @@ -0,0 +1,30 @@ +package com.example.controller + +import com.example.domain.group.GroupService +import io.ktor.server.application.* +import io.ktor.server.response.* +import io.ktor.server.routing.* + + +fun Application.groupRouter(groupUseCase: GroupService){ + routing { + route("group"){ + get { + val groups = groupUseCase.getAllGroups() + call.respond(groups) + } + get("/{id}"){ + + } + post { + + } + delete { + + } + put{ + + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/controller/PresenceRouter.kt b/src/main/kotlin/com/example/controller/PresenceRouter.kt new file mode 100644 index 0000000..549a586 --- /dev/null +++ b/src/main/kotlin/com/example/controller/PresenceRouter.kt @@ -0,0 +1,25 @@ +package com.example.controller + +import com.example.controller.requests.presence.CreatePresenceByGroupAndDayRequest +import com.example.domain.presence.PresenceService +import io.ktor.server.application.* +import io.ktor.server.request.* +import io.ktor.server.routing.* + + +fun Application.presenceRouter(presenceService: PresenceService){ + + routing { + route("presence"){ + post { + val presenceGenerate = call.receive() + presenceService.generatePresenceByGroupAndDay( + groupID = presenceGenerate.groupID, + date = presenceGenerate.date, + firstLesson = presenceGenerate.firstLessonNumber, + lastLesson = presenceGenerate.lastLessonNumber + ) + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/controller/requests/presence/CreatePresenceByGroupAndDayRequest.kt b/src/main/kotlin/com/example/controller/requests/presence/CreatePresenceByGroupAndDayRequest.kt new file mode 100644 index 0000000..a3a3199 --- /dev/null +++ b/src/main/kotlin/com/example/controller/requests/presence/CreatePresenceByGroupAndDayRequest.kt @@ -0,0 +1,13 @@ +package com.example.controller.requests.presence + +import kotlinx.datetime.LocalDate +import kotlinx.serialization.Serializable +import java.util.Date + +@Serializable +data class CreatePresenceByGroupAndDayRequest( + val groupID:Int, + val date: LocalDate, + val firstLessonNumber: Int = 1, + val lastLessonNumber: Int = 8 +) diff --git a/src/main/kotlin/com/example/controller/requests/user/CreateUserRequest.kt b/src/main/kotlin/com/example/controller/requests/user/CreateUserRequest.kt new file mode 100644 index 0000000..8a78939 --- /dev/null +++ b/src/main/kotlin/com/example/controller/requests/user/CreateUserRequest.kt @@ -0,0 +1,3 @@ +package com.example.controller.requests.user + +data class CreateUserRequest(val name: String, val groupId:Int) \ No newline at end of file diff --git a/src/main/kotlin/com/example/controller/requests/user/CreateUserRequestWithoutGroup.kt b/src/main/kotlin/com/example/controller/requests/user/CreateUserRequestWithoutGroup.kt new file mode 100644 index 0000000..4a9956c --- /dev/null +++ b/src/main/kotlin/com/example/controller/requests/user/CreateUserRequestWithoutGroup.kt @@ -0,0 +1,6 @@ +package com.example.controller.requests.user + +import kotlinx.serialization.Serializable + +@Serializable +data class CreateUserRequestWithoutGroup(val name: String) \ No newline at end of file diff --git a/src/main/kotlin/com/example/controller/requests/user/CreateUserWithGroupRequest.kt b/src/main/kotlin/com/example/controller/requests/user/CreateUserWithGroupRequest.kt new file mode 100644 index 0000000..35a0dbe --- /dev/null +++ b/src/main/kotlin/com/example/controller/requests/user/CreateUserWithGroupRequest.kt @@ -0,0 +1,6 @@ +package com.example.controller.requests.user + +import kotlinx.serialization.Serializable + +@Serializable +data class CreateUserWithGroupRequest(val groupName:String, val usersName: List) diff --git a/src/main/kotlin/com/example/data/Databases.kt b/src/main/kotlin/com/example/data/Databases.kt new file mode 100644 index 0000000..b449b28 --- /dev/null +++ b/src/main/kotlin/com/example/data/Databases.kt @@ -0,0 +1,32 @@ +package com.example.data + +import com.example.data.entity.Groups +import com.example.data.entity.Presences +import com.example.data.entity.Users +import io.ktor.http.* +import io.ktor.server.application.* +import io.ktor.server.config.* +import io.ktor.server.request.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.transaction + +fun Application.configureDatabases() { + + + + Database.connect( + url = environment.config.property("db.host").getString(), + user = environment.config.property("db.user").getString(), + password = environment.config.property("db.password").getString(), + + ) + run { + transaction { + SchemaUtils.create(Groups) + SchemaUtils.create(Users) + SchemaUtils.create(Presences) + } + } +} diff --git a/src/main/kotlin/com/example/data/entity/GroupEnitty.kt b/src/main/kotlin/com/example/data/entity/GroupEnitty.kt new file mode 100644 index 0000000..8b0b132 --- /dev/null +++ b/src/main/kotlin/com/example/data/entity/GroupEnitty.kt @@ -0,0 +1,19 @@ +package com.example.data.entity + +import org.jetbrains.exposed.dao.* +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.dao.id.IntIdTable +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.transaction + +object Groups: IntIdTable("groups"){ + + val name = text("group_name") +} + +class GroupDAO(id: EntityID): IntEntity(id){ + companion object : IntEntityClass(Groups) + var name by Groups.name + val users by UserDAO referrersOn Users.group +} + diff --git a/src/main/kotlin/com/example/data/entity/Presences.kt b/src/main/kotlin/com/example/data/entity/Presences.kt new file mode 100644 index 0000000..93ef513 --- /dev/null +++ b/src/main/kotlin/com/example/data/entity/Presences.kt @@ -0,0 +1,25 @@ +package com.example.data.entity + +import org.jetbrains.exposed.dao.CompositeEntity +import org.jetbrains.exposed.dao.CompositeEntityClass +import org.jetbrains.exposed.dao.id.CompositeID +import org.jetbrains.exposed.dao.id.CompositeIdTable +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.sql.kotlin.datetime.date + +object Presences: CompositeIdTable("presences"){ + var isAttendance = bool("presence_is_attendance") + val date = date("presence_date") + val userUUID = reference("user_uuid", Users.id) + val lessonNumber = integer("lessonNumber") + override val primaryKey: PrimaryKey = PrimaryKey(date, userUUID, lessonNumber, isAttendance) +} + +class PresenceDAO(id: EntityID): CompositeEntity(id){ + companion object: CompositeEntityClass(Presences) + var user by UserDAO referencedOn Presences.userUUID + var date by Presences.date + var userUUID by Presences.userUUID + var lessonNumber by Presences.lessonNumber + var isAttendance by Presences.isAttendance +} diff --git a/src/main/kotlin/com/example/data/entity/UsersEntity.kt b/src/main/kotlin/com/example/data/entity/UsersEntity.kt new file mode 100644 index 0000000..53af9dc --- /dev/null +++ b/src/main/kotlin/com/example/data/entity/UsersEntity.kt @@ -0,0 +1,20 @@ +package com.example.data.entity + +import com.example.data.entity.UserDAO.Companion.referrersOn +import org.jetbrains.exposed.dao.UUIDEntity +import org.jetbrains.exposed.dao.UUIDEntityClass +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.dao.id.UUIDTable +import java.util.UUID + +object Users: UUIDTable("users") { + val name = text("user_name") + val group = reference("group_id", Groups) +} + + +class UserDAO(uuid: EntityID): UUIDEntity(uuid){ + companion object: UUIDEntityClass(Users) + var name by Users.name + var group_id by Users.group +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/models/PresenceCreateRequest.kt b/src/main/kotlin/com/example/data/models/PresenceCreateRequest.kt new file mode 100644 index 0000000..1988c6c --- /dev/null +++ b/src/main/kotlin/com/example/data/models/PresenceCreateRequest.kt @@ -0,0 +1,10 @@ +package com.example.data.models + +import kotlinx.datetime.LocalDate +import java.util.UUID + +data class PresenceCreateRequest(val date:LocalDate, + val userUUID: UUID, + var isAttendance:Boolean = true, + val lessonNumber: Int + ) \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/models/UserCreateRequest.kt b/src/main/kotlin/com/example/data/models/UserCreateRequest.kt new file mode 100644 index 0000000..a204c5d --- /dev/null +++ b/src/main/kotlin/com/example/data/models/UserCreateRequest.kt @@ -0,0 +1,3 @@ +package com.example.data.models + +data class UserCreateRequest(val name: String, val groupID: Int) \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/models/UserCreateWithoutGroupRequest.kt b/src/main/kotlin/com/example/data/models/UserCreateWithoutGroupRequest.kt new file mode 100644 index 0000000..c9ce1a5 --- /dev/null +++ b/src/main/kotlin/com/example/data/models/UserCreateWithoutGroupRequest.kt @@ -0,0 +1,3 @@ +package com.example.data.models + +data class UserCreateWithoutGroupRequest(val name: String) \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/admin/AdminRepository.kt b/src/main/kotlin/com/example/data/repository/admin/AdminRepository.kt new file mode 100644 index 0000000..49f9568 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/admin/AdminRepository.kt @@ -0,0 +1,7 @@ +package com.example.data.repository.admin + +import com.example.data.models.UserCreateWithoutGroupRequest + +interface AdminRepository { + suspend fun createGroupWithStudents(groupName:String, users: List){} +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/admin/AdminRepositoryImpl.kt b/src/main/kotlin/com/example/data/repository/admin/AdminRepositoryImpl.kt new file mode 100644 index 0000000..97bfca0 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/admin/AdminRepositoryImpl.kt @@ -0,0 +1,19 @@ +package com.example.data.repository.admin + +import com.example.common.dbQuery +import com.example.data.entity.* +import com.example.data.models.UserCreateWithoutGroupRequest + +class AdminRepositoryImpl: AdminRepository { + override suspend fun createGroupWithStudents(groupName: String, users: List) = dbQuery { + val newGroup = GroupDAO.new { + name = groupName + } + users.forEach { newUser -> + UserDAO.new { + name = newUser.name + group_id = newGroup.id + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/group/GroupRepository.kt b/src/main/kotlin/com/example/data/repository/group/GroupRepository.kt new file mode 100644 index 0000000..e042de9 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/group/GroupRepository.kt @@ -0,0 +1,11 @@ +package com.example.data.repository.group + + +import com.example.domain.group.GroupModel + +interface GroupRepository { + suspend fun getAllGroups():List + suspend fun getGroupById(id:Int): GroupModel? + suspend fun updateGroupById(id:Int, group:GroupModel): Boolean + suspend fun removeGroupById(id: Int): Boolean +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/group/GroupRepositoryImpl.kt b/src/main/kotlin/com/example/data/repository/group/GroupRepositoryImpl.kt new file mode 100644 index 0000000..73052a7 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/group/GroupRepositoryImpl.kt @@ -0,0 +1,28 @@ +package com.example.data.repository.group + +import com.example.common.daoGroupToModel +import com.example.common.dbQuery +import com.example.data.entity.GroupDAO +import com.example.data.entity.Groups +import com.example.domain.group.GroupModel +import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.deleteWhere + +class GroupRepositoryImpl: GroupRepository { + override suspend fun getAllGroups(): List = dbQuery { + GroupDAO.all().map(::daoGroupToModel) + } + + override suspend fun getGroupById(id:Int): GroupModel? = dbQuery { + GroupDAO.findById(id)?.let { daoGroupToModel(it) } + } + + override suspend fun updateGroupById(id: Int, group:GroupModel): Boolean = dbQuery { + GroupDAO.findByIdAndUpdate(id, {it.name = group.name}) != null + } + + override suspend fun removeGroupById(id: Int): Boolean = dbQuery{ + val rowsDeleted = Groups.deleteWhere { Groups.id eq id } + rowsDeleted == 1 + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/presence/PresenceRepository.kt b/src/main/kotlin/com/example/data/repository/presence/PresenceRepository.kt new file mode 100644 index 0000000..f094537 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/presence/PresenceRepository.kt @@ -0,0 +1,9 @@ +package com.example.data.repository.presence + +import com.example.data.models.PresenceCreateRequest +import kotlinx.datetime.LocalDate +import java.util.Date + +interface PresenceRepository { + suspend fun insertPresences(presences: List) +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/presence/PresenceRepositoryImpl.kt b/src/main/kotlin/com/example/data/repository/presence/PresenceRepositoryImpl.kt new file mode 100644 index 0000000..5345452 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/presence/PresenceRepositoryImpl.kt @@ -0,0 +1,23 @@ +package com.example.data.repository.presence + +import com.example.common.dbQuery +import com.example.data.entity.PresenceDAO +import com.example.data.entity.Presences +import com.example.data.entity.Users +import com.example.data.models.PresenceCreateRequest +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.sql.insertAndGetId + +class PresenceRepositoryImpl: PresenceRepository { + override suspend fun insertPresences(presences: List) = dbQuery { + presences.forEach { presence -> + Presences.insert { presenceIns -> + presenceIns[date] = presence.date + presenceIns[isAttendance] = presence.isAttendance + presenceIns[userUUID] = presence.userUUID + presenceIns[lessonNumber] = presence.lessonNumber + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/user/UserRepository.kt b/src/main/kotlin/com/example/data/repository/user/UserRepository.kt new file mode 100644 index 0000000..dd38dd3 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/user/UserRepository.kt @@ -0,0 +1,11 @@ +package com.example.data.repository.user + +import com.example.domain.models.UserModel +import java.util.UUID + +interface UserRepository { + suspend fun getByGuid(uuid: UUID): UserModel? + suspend fun getAllUsers(): List + suspend fun updateUserByUUID(id:UUID, updatedUser: UserModel): Boolean + suspend fun removeUserByUUID(id: UUID): Boolean +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/data/repository/user/UserRepositoryImpl.kt b/src/main/kotlin/com/example/data/repository/user/UserRepositoryImpl.kt new file mode 100644 index 0000000..3c034e7 --- /dev/null +++ b/src/main/kotlin/com/example/data/repository/user/UserRepositoryImpl.kt @@ -0,0 +1,32 @@ +package com.example.data.repository.user + +import com.example.common.daoUserToModel +import com.example.common.dbQuery +import com.example.data.entity.Groups +import com.example.data.entity.UserDAO +import com.example.data.entity.Users +import com.example.domain.models.UserModel +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.deleteWhere +import java.util.* + +class UserRepositoryImpl: UserRepository { + override suspend fun getByGuid(uuid: UUID): UserModel? = dbQuery { + UserDAO.findById(uuid)?.let { daoUserToModel(it) } + } + override suspend fun getAllUsers(): List = dbQuery { + UserDAO.all().map(::daoUserToModel).toList() + } + + override suspend fun updateUserByUUID(id: UUID, updatedUser: UserModel): Boolean = dbQuery { + UserDAO.findByIdAndUpdate(id, { user -> + user.name = updatedUser.name + }) != null + } + + override suspend fun removeUserByUUID(id: UUID): Boolean = dbQuery{ + val result = Users.deleteWhere { Users.id eq id } + result > 0 + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/di/di.kt b/src/main/kotlin/com/example/di/di.kt new file mode 100644 index 0000000..338a304 --- /dev/null +++ b/src/main/kotlin/com/example/di/di.kt @@ -0,0 +1,23 @@ +package com.example.di + +import com.example.data.repository.admin.AdminRepository +import com.example.data.repository.admin.AdminRepositoryImpl +import com.example.data.repository.group.GroupRepository +import com.example.data.repository.group.GroupRepositoryImpl +import com.example.data.repository.presence.PresenceRepository +import com.example.data.repository.presence.PresenceRepositoryImpl +import com.example.domain.group.GroupService +import com.example.domain.admin.AdminService +import com.example.domain.presence.PresenceService +import org.koin.core.module.dsl.bind +import org.koin.core.module.dsl.singleOf +import org.koin.dsl.module + +val appModules = module { + singleOf(::GroupRepositoryImpl){bind()} + singleOf(::AdminRepositoryImpl){bind()} + singleOf(::PresenceRepositoryImpl){bind()} + singleOf(::GroupService) + singleOf(::AdminService) + singleOf(::PresenceService) +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/domain/admin/AdminService.kt b/src/main/kotlin/com/example/domain/admin/AdminService.kt new file mode 100644 index 0000000..0ba90f0 --- /dev/null +++ b/src/main/kotlin/com/example/domain/admin/AdminService.kt @@ -0,0 +1,12 @@ +package com.example.domain.admin + +import com.example.data.models.UserCreateWithoutGroupRequest +import com.example.data.repository.admin.AdminRepository +import com.example.data.repository.group.GroupRepository + +class AdminService(private val groupRepository: GroupRepository, + private val adminRepository: AdminRepository) { + suspend fun createGroupWithStudents(groupName : String, users: List){ + adminRepository.createGroupWithStudents(groupName, users.map { it -> UserCreateWithoutGroupRequest(it.name) }) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/domain/group/GroupModel.kt b/src/main/kotlin/com/example/domain/group/GroupModel.kt new file mode 100644 index 0000000..8a0fb2b --- /dev/null +++ b/src/main/kotlin/com/example/domain/group/GroupModel.kt @@ -0,0 +1,7 @@ +package com.example.domain.group + +import com.example.domain.models.UserModel +import kotlinx.serialization.Serializable + +@Serializable +data class GroupModel(val id: Int, val name: String, var users: List? = null) \ No newline at end of file diff --git a/src/main/kotlin/com/example/domain/group/GroupService.kt b/src/main/kotlin/com/example/domain/group/GroupService.kt new file mode 100644 index 0000000..81c529c --- /dev/null +++ b/src/main/kotlin/com/example/domain/group/GroupService.kt @@ -0,0 +1,10 @@ +package com.example.domain.group + +import com.example.data.repository.group.GroupRepository + +class GroupService(private val repository: GroupRepository) { + + suspend fun getAllGroups() = repository.getAllGroups() + + +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/domain/models/UserCreateWithGroupRequest.kt b/src/main/kotlin/com/example/domain/models/UserCreateWithGroupRequest.kt new file mode 100644 index 0000000..b83ba2f --- /dev/null +++ b/src/main/kotlin/com/example/domain/models/UserCreateWithGroupRequest.kt @@ -0,0 +1,3 @@ +package com.example.domain.models + +data class UserCreateWithGroupRequest(val name:String) diff --git a/src/main/kotlin/com/example/domain/models/UserModel.kt b/src/main/kotlin/com/example/domain/models/UserModel.kt new file mode 100644 index 0000000..0d8856d --- /dev/null +++ b/src/main/kotlin/com/example/domain/models/UserModel.kt @@ -0,0 +1,8 @@ +package com.example.domain.models + +import com.example.domain.group.GroupModel +import kotlinx.serialization.Serializable +import java.util.UUID + +@Serializable +data class UserModel(val uuid: String, val name: String) \ No newline at end of file diff --git a/src/main/kotlin/com/example/domain/presence/PresenceService.kt b/src/main/kotlin/com/example/domain/presence/PresenceService.kt new file mode 100644 index 0000000..df072cc --- /dev/null +++ b/src/main/kotlin/com/example/domain/presence/PresenceService.kt @@ -0,0 +1,30 @@ +package com.example.domain.presence + +import com.example.data.models.PresenceCreateRequest +import com.example.data.repository.group.GroupRepository +import com.example.data.repository.presence.PresenceRepository +import kotlinx.datetime.LocalDate +import java.util.* + +class PresenceService( + private val presenceRepository: PresenceRepository, + private val groupRepository: GroupRepository +) { + suspend fun generatePresenceByGroupAndDay(groupID:Int, + date:LocalDate, + firstLesson:Int, + lastLesson:Int){ + val generatedPresences = mutableListOf() + val users = groupRepository.getGroupById(groupID) + users?.users?.forEach { user -> + for (i in firstLesson..lastLesson){ + generatedPresences.add(PresenceCreateRequest( + date = date, + userUUID = UUID.fromString(user.uuid), + lessonNumber = i + )) + } + } + if(generatedPresences.isNotEmpty()) presenceRepository.insertPresences(generatedPresences) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/plugins/DI.kt b/src/main/kotlin/com/example/plugins/DI.kt new file mode 100644 index 0000000..8e8324c --- /dev/null +++ b/src/main/kotlin/com/example/plugins/DI.kt @@ -0,0 +1,12 @@ +package com.example.plugins + +import com.example.di.appModules +import io.ktor.server.application.* +import org.koin.ktor.plugin.Koin +import org.koin.ktor.plugin.koin + +fun Application.configureKoin(){ + install(Koin){ + modules(appModules) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/plugins/HTTP.kt b/src/main/kotlin/com/example/plugins/HTTP.kt new file mode 100644 index 0000000..6d011c3 --- /dev/null +++ b/src/main/kotlin/com/example/plugins/HTTP.kt @@ -0,0 +1,12 @@ +package com.example.plugins + +import io.ktor.server.application.* +import io.ktor.server.plugins.swagger.* +import io.ktor.server.response.* +import io.ktor.server.routing.* + +fun Application.configureHTTP() { + routing { + swaggerUI(path = "openapi") + } +} diff --git a/src/main/kotlin/com/example/plugins/Routing.kt b/src/main/kotlin/com/example/plugins/Routing.kt new file mode 100644 index 0000000..986f867 --- /dev/null +++ b/src/main/kotlin/com/example/plugins/Routing.kt @@ -0,0 +1,19 @@ +package com.example.plugins + +import com.example.controller.adminRouter +import com.example.controller.groupRouter +import com.example.controller.presenceRouter +import com.example.domain.admin.AdminService +import com.example.domain.group.GroupService +import com.example.domain.presence.PresenceService +import io.ktor.server.application.* +import org.koin.ktor.ext.inject + +fun Application.configureRouting() { + val groupService by inject() + val adminService by inject() + val presenceService by inject() + groupRouter(groupService) + adminRouter(adminService) + presenceRouter(presenceService) +} diff --git a/src/main/kotlin/com/example/plugins/Security.kt b/src/main/kotlin/com/example/plugins/Security.kt new file mode 100644 index 0000000..e6e597a --- /dev/null +++ b/src/main/kotlin/com/example/plugins/Security.kt @@ -0,0 +1,31 @@ +package com.example.plugins + +import com.auth0.jwt.JWT +import com.auth0.jwt.algorithms.Algorithm +import io.ktor.server.application.* +import io.ktor.server.auth.* +import io.ktor.server.auth.jwt.* +import io.ktor.server.response.* + +fun Application.configureSecurity() { + // Please read the jwt property from the config file if you are using EngineMain + val jwtAudience = "jwt-audience" + val jwtDomain = "https://jwt-provider-domain/" + val jwtRealm = "ktor sample app" + val jwtSecret = "secret" + authentication { + jwt { + realm = jwtRealm + verifier( + JWT + .require(Algorithm.HMAC256(jwtSecret)) + .withAudience(jwtAudience) + .withIssuer(jwtDomain) + .build() + ) + validate { credential -> + if (credential.payload.audience.contains(jwtAudience)) JWTPrincipal(credential.payload) else null + } + } + } +} diff --git a/src/main/kotlin/com/example/plugins/Serialization.kt b/src/main/kotlin/com/example/plugins/Serialization.kt new file mode 100644 index 0000000..a1422e5 --- /dev/null +++ b/src/main/kotlin/com/example/plugins/Serialization.kt @@ -0,0 +1,13 @@ +package com.example.plugins + +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.response.* +import io.ktor.server.routing.* + +fun Application.configureSerialization() { + install(ContentNegotiation) { + json() + } +} diff --git a/src/main/kotlin/com/example/plugins/UsersSchema.kt b/src/main/kotlin/com/example/plugins/UsersSchema.kt new file mode 100644 index 0000000..bd497dd --- /dev/null +++ b/src/main/kotlin/com/example/plugins/UsersSchema.kt @@ -0,0 +1,62 @@ +package com.example.plugins + +import com.example.common.dbQuery +import com.example.plugins.UserService.Users +import kotlinx.coroutines.Dispatchers +import kotlinx.serialization.Serializable +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq +import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction +import org.jetbrains.exposed.sql.transactions.transaction + +@Serializable +data class ExposedUser(val name: String, val age: Int) + +class UserService(database: Database) { + object Users : Table() { + val id = integer("id").autoIncrement() + val name = varchar("name", length = 50) + val age = integer("age") + + override val primaryKey = PrimaryKey(id) + } + + init { + transaction(database) { + SchemaUtils.create(Users) + } + } + + suspend fun create(user: ExposedUser): Int = dbQuery { + Users.insert { + it[name] = user.name + it[age] = user.age + }[Users.id] + } + + suspend fun read(id: Int): ExposedUser? { + return dbQuery { + Users.selectAll().where { Users.id eq id } + .map { ExposedUser(it[Users.name], it[Users.age]) } + .singleOrNull() + } + } + + suspend fun update(id: Int, user: ExposedUser) { + dbQuery { + Users.update({ Users.id eq id }) { + it[name] = user.name + it[age] = user.age + } + } + } + + suspend fun delete(id: Int) { + dbQuery { + Users.deleteWhere { Users.id.eq(id) } + } + } + + +} + diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..b0e6c13 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,14 @@ +ktor: + application: + modules: + - com.example.ApplicationKt.module + deployment: + port: 8080 +jwt: + domain: "https://jwt-provider-domain/" + audience: "jwt-audience" + realm: "ktor sample app" +db: + host: "jdbc:postgresql://localhost:5432/presence" + user: "postgres" + password: "123" \ No newline at end of file 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/example/ApplicationTest.kt b/src/test/kotlin/com/example/ApplicationTest.kt new file mode 100644 index 0000000..b4e0c54 --- /dev/null +++ b/src/test/kotlin/com/example/ApplicationTest.kt @@ -0,0 +1,21 @@ +package com.example + +import com.example.plugins.* +import io.ktor.client.request.* +import io.ktor.client.statement.* +import io.ktor.http.* +import io.ktor.server.testing.* +import kotlin.test.* + +class ApplicationTest { + @Test + fun testRoot() = testApplication { + application { + configureRouting() + } + client.get("/").apply { + assertEquals(HttpStatusCode.OK, status) + assertEquals("Hello World!", bodyAsText()) + } + } +}