diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..191b502 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +HELP.md +.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/ +.history/ \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4d93b09 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,56 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id("org.springframework.boot") version "3.2.2" + id("io.spring.dependency-management") version "1.1.4" + kotlin("jvm") version "1.9.22" + kotlin("plugin.spring") version "1.9.22" + kotlin("plugin.jpa") version "1.9.22" + kotlin("plugin.allopen") version "1.9.22" + kotlin("kapt") version "1.9.22" +} + +group = "com.example" +version = "0.0.1-SNAPSHOT" + +allOpen { + annotation("jakarta.persistence.Entity") + annotation("jakarta.persistence.Embeddable") + annotation("jakarta.persistence.MappedSuperclass") +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 +} + +repositories { + mavenCentral() +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-mustache") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + runtimeOnly("com.h2database:h2") + runtimeOnly("org.springframework.boot:spring-boot-devtools") + testImplementation("org.springframework.boot:spring-boot-starter-test") { + exclude(module = "mockito-core") + } + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + testImplementation("com.ninja-squad:springmockk:4.0.2") + kapt("org.springframework.boot:spring-boot-configuration-processor") +} + +tasks.withType { + kotlinOptions { + freeCompilerArgs += "-Xjsr305=strict" + jvmTarget = "17" + } +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 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..1af9e09 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..b161b11 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "blog" diff --git a/src/main/kotlin/com/example/blog/BlogApplication.kt b/src/main/kotlin/com/example/blog/BlogApplication.kt new file mode 100644 index 0000000..cfa96c3 --- /dev/null +++ b/src/main/kotlin/com/example/blog/BlogApplication.kt @@ -0,0 +1,15 @@ +package com.example.blog + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.context.properties.EnableConfigurationProperties +import org.springframework.boot.runApplication +import org.springframework.context.annotation.ComponentScan +import org.springframework.data.jpa.repository.config.EnableJpaRepositories + +@SpringBootApplication +@EnableConfigurationProperties(BlogProperties::class) +class BlogApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/src/main/kotlin/com/example/blog/BlogConfiguration.kt b/src/main/kotlin/com/example/blog/BlogConfiguration.kt new file mode 100644 index 0000000..4dc59ca --- /dev/null +++ b/src/main/kotlin/com/example/blog/BlogConfiguration.kt @@ -0,0 +1,28 @@ +package com.example.blog + +import org.springframework.boot.ApplicationRunner +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration + +@Configuration +class BlogConfiguration { + + @Bean + fun databaseInitializer(userRepository: UserRepository, + articleRepository: ArticleRepository) = ApplicationRunner { + + val johnDoe = userRepository.save(User("johnDoe", "John", "Doe")) + articleRepository.save(Article( + title = "Lorem", + headline = "Lorem", + content = "dolor sit amet", + author = johnDoe + )) + articleRepository.save(Article( + title = "Ipsum", + headline = "Ipsum", + content = "dolor sit amet", + author = johnDoe + )) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/blog/BlogProperties.kt b/src/main/kotlin/com/example/blog/BlogProperties.kt new file mode 100644 index 0000000..fdc402f --- /dev/null +++ b/src/main/kotlin/com/example/blog/BlogProperties.kt @@ -0,0 +1,8 @@ +package com.example.blog + +import org.springframework.boot.context.properties.ConfigurationProperties + +@ConfigurationProperties("blog") +data class BlogProperties(var title: String, val banner: Banner) { + data class Banner(val title: String? = null, val content: String) +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/blog/Entities.kt b/src/main/kotlin/com/example/blog/Entities.kt new file mode 100644 index 0000000..ff15174 --- /dev/null +++ b/src/main/kotlin/com/example/blog/Entities.kt @@ -0,0 +1,26 @@ +package com.example.blog + +import jakarta.persistence.Entity +import jakarta.persistence.GeneratedValue +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne +import toSlug +import java.time.LocalDateTime + +@Entity +class Article( + var title: String, + var headline: String, + var content: String, + @ManyToOne var author: User, + var slug: String = title.toSlug(), + var addedAt: LocalDateTime = LocalDateTime.now(), + @Id @GeneratedValue var id: Long? = null) + +@Entity +class User( + var login: String, + var firstname: String, + var lastname: String, + var description: String? = null, + @Id @GeneratedValue var id: Long? = null) \ No newline at end of file diff --git a/src/main/kotlin/com/example/blog/Extensions.kt b/src/main/kotlin/com/example/blog/Extensions.kt new file mode 100644 index 0000000..0b1e8b6 --- /dev/null +++ b/src/main/kotlin/com/example/blog/Extensions.kt @@ -0,0 +1,31 @@ +import java.time.LocalDateTime +import java.time.format.DateTimeFormatterBuilder +import java.time.temporal.ChronoField +import java.util.* + +fun LocalDateTime.format(): String = this.format(englishDateFormatter) + +private val daysLookup = (1..31).associate { it.toLong() to getOrdinal(it) } + +private val englishDateFormatter = DateTimeFormatterBuilder() + .appendPattern("yyyy-MM-dd") + .appendLiteral(" ") + .appendText(ChronoField.DAY_OF_MONTH, daysLookup) + .appendLiteral(" ") + .appendPattern("yyyy") + .toFormatter(Locale.ENGLISH) + +private fun getOrdinal(n: Int) = when { + n in 11..13 -> "${n}th" + n % 10 == 1 -> "${n}st" + n % 10 == 2 -> "${n}nd" + n % 10 == 3 -> "${n}rd" + else -> "${n}th" +} + +fun String.toSlug() = lowercase(Locale.getDefault()) + .replace("\n", " ") + .replace("[^a-z\\d\\s]".toRegex(), " ") + .split(" ") + .joinToString("-") + .replace("-+".toRegex(), "-") \ No newline at end of file diff --git a/src/main/kotlin/com/example/blog/HtmlController.kt b/src/main/kotlin/com/example/blog/HtmlController.kt new file mode 100644 index 0000000..dbec034 --- /dev/null +++ b/src/main/kotlin/com/example/blog/HtmlController.kt @@ -0,0 +1,54 @@ +package com.example.blog + +import format +import org.springframework.http.HttpStatus +import org.springframework.stereotype.Controller +import org.springframework.ui.Model +import org.springframework.ui.set +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.server.ResponseStatusException + +@Controller +class HtmlController( + private val repository: ArticleRepository, + private val properties: BlogProperties +) { + + @GetMapping("/") + fun blog(model: Model): String { + model["title"] = properties.title + model["banner"] = properties.banner + model["articles"] = repository.findAllByOrderByAddedAtDesc().map { it.render() } + return "blog" + } + + @GetMapping("/article/{slug}") + fun article(@PathVariable slug: String, model: Model): String { + val article = repository + .findBySlug(slug) + ?.render() + ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This article does not exist") + model["title"] = article.title + model["article"] = article + return "article" + } + + fun Article.render() = RenderedArticle( + slug, + title, + headline, + content, + author, + addedAt.format() + ) + + data class RenderedArticle( + val slug: String, + val title: String, + val headline: String, + val content: String, + val author: User, + val addedAt: String) + +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/blog/HttpControllers.kt b/src/main/kotlin/com/example/blog/HttpControllers.kt new file mode 100644 index 0000000..c02fff2 --- /dev/null +++ b/src/main/kotlin/com/example/blog/HttpControllers.kt @@ -0,0 +1,33 @@ +package com.example.blog + +import org.springframework.http.HttpStatus +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import org.springframework.web.server.ResponseStatusException + +@RestController +@RequestMapping("/api/article") +class ArticleController(private val repository: ArticleRepository) { + + @GetMapping("/") + fun findAll() = repository.findAllByOrderByAddedAtDesc() + + @GetMapping("/{slug}") + fun findOne(@PathVariable slug: String) = + repository.findBySlug(slug) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This article does not exist") + +} + +@RestController +@RequestMapping("/api/user") +class UserController(private val repository: UserRepository) { + + @GetMapping("/") + fun findAll() = repository.findAll() + + @GetMapping("/{login}") + fun findOne(@PathVariable login: String) = + repository.findByLogin(login) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "This user does not exist") +} \ No newline at end of file diff --git a/src/main/kotlin/com/example/blog/Repositories.kt b/src/main/kotlin/com/example/blog/Repositories.kt new file mode 100644 index 0000000..2bf96f4 --- /dev/null +++ b/src/main/kotlin/com/example/blog/Repositories.kt @@ -0,0 +1,12 @@ +package com.example.blog + +import org.springframework.data.repository.CrudRepository + +interface ArticleRepository: CrudRepository { + fun findBySlug(slug: String): Article? + fun findAllByOrderByAddedAtDesc(): Iterable
+} + +interface UserRepository: CrudRepository { + fun findByLogin(login: String): User? +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..3667b01 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.jpa.properties.hibernate.globally_quoted_identifiers=true +spring.jpa.properties.hibernate.globally_quoted_identifiers_skip_column_definitions=true +blog.title=Blog +blog.banner.title=Warning +blog.banner.content=The blog will be down tomorrow. \ No newline at end of file diff --git a/src/main/resources/templates/article.mustache b/src/main/resources/templates/article.mustache new file mode 100644 index 0000000..57618e8 --- /dev/null +++ b/src/main/resources/templates/article.mustache @@ -0,0 +1,16 @@ +{{> header}} + +
+
+

{{article.title}}

+ +
+ +
+ {{article.headline}} + + {{article.content}} +
+
+ +{{> footer}} \ No newline at end of file diff --git a/src/main/resources/templates/blog.mustache b/src/main/resources/templates/blog.mustache new file mode 100644 index 0000000..7842a58 --- /dev/null +++ b/src/main/resources/templates/blog.mustache @@ -0,0 +1,31 @@ +{{> header}} + +

{{title}}

+ +
+ + {{#banner.title}} +
+ + +
+ {{/banner.title}} + + {{#articles}} +
+
+

{{title}}

+ +
+
+ {{headline}} +
+
+ {{/articles}} +
+ +{{> footer}} \ No newline at end of file diff --git a/src/main/resources/templates/footer.mustache b/src/main/resources/templates/footer.mustache new file mode 100644 index 0000000..691287b --- /dev/null +++ b/src/main/resources/templates/footer.mustache @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/main/resources/templates/header.mustache b/src/main/resources/templates/header.mustache new file mode 100644 index 0000000..71e0b08 --- /dev/null +++ b/src/main/resources/templates/header.mustache @@ -0,0 +1,5 @@ + + + {{title}} + + \ No newline at end of file diff --git a/src/test/kotlin/com/example/blog/BlogApplicationTests.kt b/src/test/kotlin/com/example/blog/BlogApplicationTests.kt new file mode 100644 index 0000000..c95fcaf --- /dev/null +++ b/src/test/kotlin/com/example/blog/BlogApplicationTests.kt @@ -0,0 +1,13 @@ +package com.example.blog + +import org.junit.jupiter.api.Test +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +class BlogApplicationTests { + + @Test + fun contextLoads() { + } + +} diff --git a/src/test/kotlin/com/example/blog/HttpControllersTest.kt b/src/test/kotlin/com/example/blog/HttpControllersTest.kt new file mode 100644 index 0000000..503c877 --- /dev/null +++ b/src/test/kotlin/com/example/blog/HttpControllersTest.kt @@ -0,0 +1,48 @@ +package com.example.blog + +import com.ninjasquad.springmockk.MockkBean +import io.mockk.every +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest +import org.springframework.http.MediaType +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.* +import org.springframework.test.web.servlet.result.MockMvcResultMatchers.* + +@WebMvcTest +class HttpControllersTests(@Autowired val mockMvc: MockMvc) { + + @MockkBean + lateinit var userRepository: UserRepository + + @MockkBean + lateinit var articleRepository: ArticleRepository + + @Test + fun `List articles`() { + val johnDoe = User("johnDoe", "John", "Doe") + val lorem5Article = Article("Lorem", "Lorem", "dolor sit amet", johnDoe) + val ipsumArticle = Article("Ipsum", "Ipsum", "dolor sit amet", johnDoe) + every { articleRepository.findAllByOrderByAddedAtDesc() } returns listOf(lorem5Article, ipsumArticle) + mockMvc.perform(get("/api/article/").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("\$.[0].author.login").value(johnDoe.login)) + .andExpect(jsonPath("\$.[0].slug").value(lorem5Article.slug)) + .andExpect(jsonPath("\$.[1].author.login").value(johnDoe.login)) + .andExpect(jsonPath("\$.[1].slug").value(ipsumArticle.slug)) + } + + @Test + fun `List users`() { + val johnDoe = User("johnDoe", "John", "Doe") + val janeDoe = User("janeDoe", "Jane", "Doe") + every { userRepository.findAll() } returns listOf(johnDoe, janeDoe) + mockMvc.perform(get("/api/user/").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("\$.[0].login").value(johnDoe.login)) + .andExpect(jsonPath("\$.[1].login").value(janeDoe.login)) + } +} \ No newline at end of file diff --git a/src/test/kotlin/com/example/blog/IntegrationTest.kt b/src/test/kotlin/com/example/blog/IntegrationTest.kt new file mode 100644 index 0000000..5547632 --- /dev/null +++ b/src/test/kotlin/com/example/blog/IntegrationTest.kt @@ -0,0 +1,41 @@ +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.AfterAll +import org.junit.jupiter.api.BeforeAll +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.boot.test.web.client.getForEntity +import org.springframework.http.HttpStatus + +@SpringBootTest(classes = [com.example.blog.BlogApplication::class], webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class IntegrationTests(@Autowired val restTemplate: TestRestTemplate) { + + @BeforeAll + fun setup() { + println(">> Setup") + } + + @Test + fun `Assert blog page title, content and status code`() { + println(">> Assert blog page title, content and status code") + val entity = restTemplate.getForEntity("/") + assertThat(entity.statusCode).isEqualTo(HttpStatus.OK) + assertThat(entity.body).contains("

Blog

", "Lorem") + } + + @Test + fun `Assert article page title, content and status code`() { + println(">> Assert article page title, content and status code") + val title = "Lorem" + val entity = restTemplate.getForEntity("/article/${title.toSlug()}") + assertThat(entity.statusCode).isEqualTo(HttpStatus.OK) + assertThat(entity.body).contains(title, "Lorem", "dolor sit amet") + } + + @AfterAll + fun teardown() { + println(">> Tear down") + } + +} \ No newline at end of file diff --git a/src/test/kotlin/com/example/blog/RepositoriesTest.kt b/src/test/kotlin/com/example/blog/RepositoriesTest.kt new file mode 100644 index 0000000..7a9bbeb --- /dev/null +++ b/src/test/kotlin/com/example/blog/RepositoriesTest.kt @@ -0,0 +1,37 @@ +package com.example.blog +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager +import org.springframework.data.repository.findByIdOrNull + +@DataJpaTest +class RepositoriesTests @Autowired constructor( + val entityManager: TestEntityManager, + val userRepository: UserRepository, + val articleRepository: ArticleRepository) { + + @Test + fun `When findByIdOrNull then return Article`() { + val johnDoe = User("johnDoe", "John", "Doe") + entityManager.persist(johnDoe) + + val article = Article("Lorem", "Lorem", "dolor sit amet", johnDoe) + entityManager.persist(article) + + entityManager.flush() + + val found = articleRepository.findByIdOrNull(article.id!!) + assertThat(found).isEqualTo(article) + } + + @Test + fun `When findByLogin then return User`() { + val johnDoe = User("johnDoe", "John", "Doe") + entityManager.persist(johnDoe) + entityManager.flush() + val user = userRepository.findByLogin(johnDoe.login) + assertThat(user).isEqualTo(johnDoe) + } +} diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties new file mode 100644 index 0000000..e6d55f8 --- /dev/null +++ b/src/test/resources/junit-platform.properties @@ -0,0 +1 @@ +junit.jupiter.testinstance.lifecycle.default = per_class \ No newline at end of file