diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..e28a7c2 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,43 @@ +val ktor_version: String by project +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 "1.9.20" + id("io.ktor.plugin") version "2.3.6" + id("org.jetbrains.kotlin.plugin.serialization") version "1.9.20" +} + +group = "amine.bou" +version = "0.0.1" + +application { + mainClass.set("amine.bou.ApplicationKt") + + 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-server-content-negotiation-jvm") + implementation("io.ktor:ktor-serialization-kotlinx-json-jvm") + implementation("org.jetbrains.exposed:exposed-core:$exposed_version") + implementation("org.jetbrains.exposed:exposed-jdbc:$exposed_version") + implementation("org.jetbrains.exposed:exposed-java-time:$exposed_version") + implementation("org.jetbrains.exposed:exposed-dao:$exposed_version") + implementation("org.xerial:sqlite-jdbc:3.30.1") + implementation("io.ktor:ktor-server-compression-jvm") + implementation("io.ktor:ktor-server-resources") + implementation("io.ktor:ktor-server-auth-jvm") + implementation("io.ktor:ktor-server-netty-jvm") + implementation("ch.qos.logback:logback-classic:$logback_version") + testImplementation("io.ktor:ktor-server-tests-jvm") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..71a08f2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +ktor_version=2.3.6 +kotlin_version=1.9.20 +logback_version=1.4.11 +kotlin.code.style=official +exposed_version=0.41.1 +h2_version=2.1.214 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..ca6a6dd --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "habits-api" diff --git a/src/main/kotlin/amine/bou/Application.kt b/src/main/kotlin/amine/bou/Application.kt new file mode 100644 index 0000000..7736489 --- /dev/null +++ b/src/main/kotlin/amine/bou/Application.kt @@ -0,0 +1,19 @@ +package amine.bou + +import amine.bou.plugins.* +import io.ktor.server.application.* +import io.ktor.server.engine.* +import io.ktor.server.netty.* + +fun main() { + embeddedServer(Netty, port = 8083, host = "0.0.0.0", module = Application::module) + .start(wait = true) +} + +fun Application.module() { + configureSerialization() + configureDatabases() + configureHTTP() + configureSecurity() + configureRouting() +} diff --git a/src/main/kotlin/amine/bou/DB/DB.kt b/src/main/kotlin/amine/bou/DB/DB.kt new file mode 100644 index 0000000..ff6df84 --- /dev/null +++ b/src/main/kotlin/amine/bou/DB/DB.kt @@ -0,0 +1,85 @@ +package amine.bou.DB + +import amine.bou.models.HabitOccurrenceView +import amine.bou.models.HabitView +import amine.bou.models.toView +import io.ktor.server.plugins.* +import org.jetbrains.exposed.sql.and +import org.jetbrains.exposed.sql.transactions.transaction +import java.time.LocalDate + +class DB { + fun createHabit(request: HabitView): HabitView { + return transaction { + val h = Habit.new { + name = request.name + color = request.color + recurrence = request.recurrence + } + h.toView() + } + } + + fun getAllHabits(): List { + return transaction { + return@transaction Habit.all().map {it.toView()}.toList() + } + } + + fun getOneHabit(id: Int): HabitView { + return transaction { + val habit = Habit.findById(id) ?: throw NotFoundException() + return@transaction habit.toView() + } + } + + fun deleteHabit(id: Int) { + return transaction { + return@transaction Habit.findById(id)?.delete() ?: throw NotFoundException() + } + } + + fun updateHabit(id: Int, request: HabitView): HabitView { + return transaction { + val habit = Habit.findById(id) ?: throw NotFoundException() + + if (habit.color != request.color) { + habit.color = request.color + } + + if (habit.name != request.name) { + habit.name = request.name + } + + if (habit.recurrence != request.recurrence) { + habit.recurrence = request.recurrence + } + + // TODO: Handle occurrences on recurrence change ? + + return@transaction habit.toView() + } + } + + fun createOccurrence(habitId: Int, request: HabitOccurrenceView): HabitOccurrenceView { + return transaction { + val h = Habit.findById(habitId) ?: throw NotFoundException() + + val o = HabitOccurrence.new { + occurence = LocalDate.parse(request.date) + habit = h + } + + // TODO: maybe handle streaks + return@transaction o.toView() + } + } + + fun deleteOccurrence(habitId: Int, id: Long): Any { + return transaction { + val h = Habit.findById(habitId) ?: throw NotFoundException() + + return@transaction HabitOccurrence.find { HabitOccurrences.id eq id and (HabitOccurrences.habit eq habitId) }.firstOrNull()?.delete() ?: throw NotFoundException() + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/DB/Habit.kt b/src/main/kotlin/amine/bou/DB/Habit.kt new file mode 100644 index 0000000..e774579 --- /dev/null +++ b/src/main/kotlin/amine/bou/DB/Habit.kt @@ -0,0 +1,23 @@ +package amine.bou.DB + +import amine.bou.models.RecurrenceViewEnum +import org.jetbrains.exposed.dao.IntEntity +import org.jetbrains.exposed.dao.IntEntityClass +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.dao.id.IntIdTable + +object Habits : IntIdTable() { + val name = varchar("name", 256) + val color = varchar("color", 6) + val recurrence = enumerationByName("every", 12) +} + +class Habit(id: EntityID) : IntEntity(id) { + companion object : IntEntityClass(Habits) + + var name by Habits.name + var color by Habits.color + var recurrence by Habits.recurrence + + val occurences by HabitOccurrence referrersOn HabitOccurrences.habit +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/DB/HabitOccurrences.kt b/src/main/kotlin/amine/bou/DB/HabitOccurrences.kt new file mode 100644 index 0000000..ad0346f --- /dev/null +++ b/src/main/kotlin/amine/bou/DB/HabitOccurrences.kt @@ -0,0 +1,20 @@ +package amine.bou.DB + +import org.jetbrains.exposed.dao.LongEntity +import org.jetbrains.exposed.dao.LongEntityClass +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.dao.id.LongIdTable +import org.jetbrains.exposed.sql.javatime.date + + +object HabitOccurrences : LongIdTable() { + val occurence = date("date") + val habit = reference("habit", Habits) +} + +class HabitOccurrence(id: EntityID) : LongEntity(id) { + companion object : LongEntityClass(HabitOccurrences) + + var occurence by HabitOccurrences.occurence + var habit by Habit referencedOn HabitOccurrences.habit +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/DB/Migration.kt b/src/main/kotlin/amine/bou/DB/Migration.kt new file mode 100644 index 0000000..8ebeac9 --- /dev/null +++ b/src/main/kotlin/amine/bou/DB/Migration.kt @@ -0,0 +1,18 @@ +package DB + +import org.jetbrains.exposed.dao.IntEntity +import org.jetbrains.exposed.dao.IntEntityClass +import org.jetbrains.exposed.dao.id.EntityID +import org.jetbrains.exposed.dao.id.IntIdTable + +object Migrations : IntIdTable() { + val identifier = varchar("identifier", 256) + val done = bool("done").default(false) +} + +class Migration(id: EntityID) : IntEntity(id) { + companion object : IntEntityClass(Migrations) + + var identifier by Migrations.identifier + var done by Migrations.done +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/controllers/HabitController.kt b/src/main/kotlin/amine/bou/controllers/HabitController.kt new file mode 100644 index 0000000..5510159 --- /dev/null +++ b/src/main/kotlin/amine/bou/controllers/HabitController.kt @@ -0,0 +1,20 @@ +package amine.bou.controllers + +import amine.bou.DB.DB +import amine.bou.models.HabitView + +class HabitController { + private val db: DB = DB() + + fun createHabit(request: HabitView) = db.createHabit(request) + + fun updateHabit(id: Int, request: HabitView) = db.updateHabit(id, request) + + fun getAllHabits() = db.getAllHabits() + + fun getOneHabit(id: Int) = db.getOneHabit(id) + + fun deleteHabit(id: Int) = db.deleteHabit(id) + + +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/controllers/HabitOccurrenceController.kt b/src/main/kotlin/amine/bou/controllers/HabitOccurrenceController.kt new file mode 100644 index 0000000..20272b6 --- /dev/null +++ b/src/main/kotlin/amine/bou/controllers/HabitOccurrenceController.kt @@ -0,0 +1,16 @@ +package amine.bou.controllers + +import amine.bou.DB.DB +import amine.bou.DB.HabitOccurrences +import amine.bou.models.HabitOccurrenceView +import amine.bou.models.HabitView + +class HabitOccurrenceController { + private val db: DB = DB() + + fun createOccurrence(habitId: Int, request: HabitOccurrenceView) = db.createOccurrence(habitId, request) + + fun deleteOccurrence(habitId: Int, id: Long) = db.deleteOccurrence(habitId, id) + + +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/controllers/MigrationController.kt b/src/main/kotlin/amine/bou/controllers/MigrationController.kt new file mode 100644 index 0000000..36a01cf --- /dev/null +++ b/src/main/kotlin/amine/bou/controllers/MigrationController.kt @@ -0,0 +1,39 @@ +import DB.Migration +import DB.Migrations +import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.sql.update + +class MigrationsController { + private val migrations: Map Boolean> = mapOf( + ) + + fun checkMigrationsToDo() { + this.migrations.forEach { + transaction { + val migrationWithName = Migration.find { Migrations.identifier eq it.key }.firstOrNull() + if (migrationWithName == null) { + Migration.new { + identifier = it.key + } + println("Migration ${it.key} will start now.") + it.value() + Migrations.update({Migrations.identifier eq it.key}) { + it[done] = true + } + println("Migration ${it.key} done.") + } else if (!migrationWithName.done) { + println("Migration ${it.key} not done yet. Redoing.") + it.value() + Migrations.update({Migrations.identifier eq it.key}) { + it[done] = true + } + println("Migration ${it.key} done.") + } else { + println("Migration ${it.key} already done.") + } + } + } + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/models/HabitOccurrenceView.kt b/src/main/kotlin/amine/bou/models/HabitOccurrenceView.kt new file mode 100644 index 0000000..74bc5bc --- /dev/null +++ b/src/main/kotlin/amine/bou/models/HabitOccurrenceView.kt @@ -0,0 +1,10 @@ +package amine.bou.models + +import amine.bou.DB.HabitOccurrence +import io.ktor.server.http.* +import kotlinx.serialization.Serializable + +@Serializable +data class HabitOccurrenceView(val id: Long?, val date: String) + +fun HabitOccurrence.toView(): HabitOccurrenceView = HabitOccurrenceView(this.id.value, this.occurence.toString()) diff --git a/src/main/kotlin/amine/bou/models/HabitView.kt b/src/main/kotlin/amine/bou/models/HabitView.kt new file mode 100644 index 0000000..81645f6 --- /dev/null +++ b/src/main/kotlin/amine/bou/models/HabitView.kt @@ -0,0 +1,10 @@ +package amine.bou.models + +import amine.bou.DB.Habit +import kotlinx.serialization.Serializable + +@Serializable +data class HabitView(val id: Int?, val name: String, val color: String, val recurrence: RecurrenceViewEnum, val occurrences: List) + + +fun Habit.toView() : HabitView = HabitView(this.id.value, this.name, this.color, this.recurrence, this.occurences.map {it.toView()}) \ No newline at end of file diff --git a/src/main/kotlin/amine/bou/models/RecurrenceViewEnum.kt b/src/main/kotlin/amine/bou/models/RecurrenceViewEnum.kt new file mode 100644 index 0000000..61e652e --- /dev/null +++ b/src/main/kotlin/amine/bou/models/RecurrenceViewEnum.kt @@ -0,0 +1,5 @@ +package amine.bou.models + +enum class RecurrenceViewEnum { + DAILY, MULTI_DAILY, WEEKLY, DO_NOT +} diff --git a/src/main/kotlin/amine/bou/plugins/Databases.kt b/src/main/kotlin/amine/bou/plugins/Databases.kt new file mode 100644 index 0000000..1fd1ef7 --- /dev/null +++ b/src/main/kotlin/amine/bou/plugins/Databases.kt @@ -0,0 +1,25 @@ +package amine.bou.plugins + +import DB.Migrations +import MigrationsController +import amine.bou.DB.HabitOccurrences +import amine.bou.DB.Habits +import io.ktor.http.* +import io.ktor.server.application.* +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() { + var migrationsController = MigrationsController() + + val database = Database.connect("jdbc:sqlite:habits.db", "org.sqlite.JDBC") + transaction { + SchemaUtils.create (Habits) + SchemaUtils.create (HabitOccurrences) + SchemaUtils.create (Migrations) + migrationsController.checkMigrationsToDo() + } +} diff --git a/src/main/kotlin/amine/bou/plugins/HTTP.kt b/src/main/kotlin/amine/bou/plugins/HTTP.kt new file mode 100644 index 0000000..53bc4cb --- /dev/null +++ b/src/main/kotlin/amine/bou/plugins/HTTP.kt @@ -0,0 +1,16 @@ +package amine.bou.plugins + +import io.ktor.server.application.* +import io.ktor.server.plugins.compression.* + +fun Application.configureHTTP() { + install(Compression) { + gzip { + priority = 1.0 + } + deflate { + priority = 10.0 + minimumSize(1024) // condition + } + } +} diff --git a/src/main/kotlin/amine/bou/plugins/Routing.kt b/src/main/kotlin/amine/bou/plugins/Routing.kt new file mode 100644 index 0000000..9b89f98 --- /dev/null +++ b/src/main/kotlin/amine/bou/plugins/Routing.kt @@ -0,0 +1,52 @@ +package amine.bou.plugins + +import amine.bou.controllers.HabitController +import amine.bou.controllers.HabitOccurrenceController +import amine.bou.models.HabitOccurrenceView +import amine.bou.models.HabitView +import io.ktor.server.application.* +import io.ktor.server.request.* +import io.ktor.server.resources.Resources +import io.ktor.server.response.* +import io.ktor.server.routing.* +import java.lang.Long.parseLong + +fun Application.configureRouting() { + val habitController = HabitController() + val habitOccurrenceController = HabitOccurrenceController() + install(Resources) + routing { + route("/habits") { + get { + call.respond(habitController.getAllHabits()) + } + + post { + call.respond(habitController.createHabit(call.receive())) + } + + route("/{id}") { + get { + call.respond(habitController.getOneHabit(Integer.parseInt(call.parameters["id"]))) + } + + put { + call.respond(habitController.updateHabit(Integer.parseInt(call.parameters["id"]), call.receive())) + } + + delete { + call.respond(habitController.deleteHabit(Integer.parseInt(call.parameters["id"]))) + } + + post("/occurrence") { + call.respond(habitOccurrenceController.createOccurrence(Integer.parseInt(call.parameters["id"]), call.receive())) + } + + delete("/occurrence/{occId}") { + call.respond(habitOccurrenceController.deleteOccurrence(Integer.parseInt(call.parameters["id"]), parseLong(call.parameters["occId"]))) + } + } + } + + } +} diff --git a/src/main/kotlin/amine/bou/plugins/Security.kt b/src/main/kotlin/amine/bou/plugins/Security.kt new file mode 100644 index 0000000..4b2067c --- /dev/null +++ b/src/main/kotlin/amine/bou/plugins/Security.kt @@ -0,0 +1,23 @@ +package amine.bou.plugins + +import io.ktor.server.application.* +import io.ktor.server.auth.* +import io.ktor.server.response.* +import io.ktor.server.routing.* +import io.ktor.util.* + +fun Application.configureSecurity() { + authentication { + val myRealm = "MyRealm" + val usersInMyRealmToHA1: Map = mapOf( + // pass="test", HA1=MD5("test:MyRealm:pass")="fb12475e62dedc5c2744d98eb73b8877" + "test" to hex("fb12475e62dedc5c2744d98eb73b8877") + ) + + digest("myDigestAuth") { + digestProvider { userName, realm -> + usersInMyRealmToHA1[userName] + } + } + } +} diff --git a/src/main/kotlin/amine/bou/plugins/Serialization.kt b/src/main/kotlin/amine/bou/plugins/Serialization.kt new file mode 100644 index 0000000..3f413c9 --- /dev/null +++ b/src/main/kotlin/amine/bou/plugins/Serialization.kt @@ -0,0 +1,16 @@ +package amine.bou.plugins + +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.response.* +import kotlinx.serialization.json.Json + +fun Application.configureSerialization() { + install(ContentNegotiation) { + json(Json { + prettyPrint = true + isLenient = true + }) + } +} 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