diff --git a/api.http b/api.http index aa3ebcb..000147f 100644 --- a/api.http +++ b/api.http @@ -386,3 +386,21 @@ Authorization: {{auth-token}} GET http://localhost:9001/api/vendor/incoming/next Content-Type: application/json Authorization: {{auth-token}} + +### +POST http://localhost:9001/api/expense/execute +Content-Type: application/json +Authorization: {{auth-token}} + +{ + "script": "vehicle.kts", + "fn": "execute", + "params": { + "a": "1", + "b": 2, + "c": { + "c1": 1, + "c2": "2024-04-20" + } + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index f3a5391..f915e7d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,19 +24,19 @@ dependencies { implementation("io.javalin:javalin:5.6.3") implementation("io.ebean:ebean:13.23.2") implementation("io.ebean:ebean-querybean:13.23.2") - implementation("org.postgresql:postgresql:42.6.0") + implementation("org.postgresql:postgresql:42.7.3") implementation("io.ebean:ebean-migration:13.11.1") implementation("io.ebean:ebean-ddl-generator:13.23.2") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.+") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.+") - implementation("ch.qos.logback:logback-core:1.4.12") + implementation("ch.qos.logback:logback-core:1.5.6") implementation("ch.qos.logback:logback-classic:1.4.12") implementation("org.bitbucket.b_c:jose4j:0.9.4") implementation("redis.clients:jedis:5.0.2") - implementation("org.bouncycastle:bcprov-jdk18on:1.76") - implementation("org.bouncycastle:bcpkix-jdk18on:1.76") + implementation("org.bouncycastle:bcprov-jdk18on:1.78.1") + implementation("org.bouncycastle:bcpkix-jdk18on:1.78.1") implementation("org.yaml:snakeyaml:2.2") - implementation("io.minio:minio:8.5.7") + implementation("io.minio:minio:8.5.11") implementation("org.apache.httpcomponents:httpclient:4.5.14") implementation("org.apache.poi:poi:5.2.3") implementation("org.apache.poi:poi-ooxml:5.2.3") @@ -45,6 +45,13 @@ dependencies { api("net.cactusthorn.config:config-yaml:0.81") kapt("net.cactusthorn.config:config-compiler:0.81") kapt("io.ebean:kotlin-querybean-generator:13.23.2") + implementation("org.graalvm.polyglot:polyglot:24.0.2") + implementation("org.graalvm.polyglot:js:24.0.2") + implementation(kotlin("script-runtime")) + implementation(kotlin("scripting-jsr223")) + //implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223:1.9.20") + //implementation("org.jetbrains.kotlin:kotlin-script-runtime:1.9.20") + } tasks.test { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2bbac7d..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# 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/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' +# 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 @@ -133,22 +131,29 @@ 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. + 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 @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then 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. + +# 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" \ @@ -205,6 +214,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 5241741..ced7e96 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,8 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" + id("de.fayard.refreshVersions") version "0.60.5" } rootProject.name = "rest_api" \ No newline at end of file diff --git a/src/main/kotlin/com/restapi/Main.kt b/src/main/kotlin/com/restapi/Main.kt index 73ce1d5..b19d0fb 100644 --- a/src/main/kotlin/com/restapi/Main.kt +++ b/src/main/kotlin/com/restapi/Main.kt @@ -296,9 +296,9 @@ fun main(args: Array) { post("/{entity}/next", Entities::getNextSeqNo, Roles(adminRole, viewRole, appAdmin)) get("/{entity}/{id}", Entities::view, Roles(adminRole, viewRole, appAdmin)) post("/{entity}/search", Entities::search, Roles(adminRole, viewRole, appAdmin)) + post("/{entity}/execute", Entities::execute, Roles(adminRole, createRole, appAdmin)) post("/{entity}", Entities::create, Roles(adminRole, createRole, appAdmin)) - put("/{entity}/{id}", Entities::update, Roles(adminRole, updateRole, appAdmin)) patch("/{entity}/{id}", Entities::patch, Roles(adminRole, updateRole, appAdmin)) delete("/{entity}/{id}", Entities::delete, Roles(adminRole, Role.Standard(Action.DELETE), appAdmin)) diff --git a/src/main/kotlin/com/restapi/controllers/Entities.kt b/src/main/kotlin/com/restapi/controllers/Entities.kt index 256438f..4279a6d 100644 --- a/src/main/kotlin/com/restapi/controllers/Entities.kt +++ b/src/main/kotlin/com/restapi/controllers/Entities.kt @@ -259,6 +259,25 @@ object Entities { ) } + data class Execute(val script: String, val fn: String, val params: Map) + + fun execute(ctx: Context) { + val entity = ctx.pathParam("entity") + + val body = ctx.bodyAsClass() + + //may be approval flow is configured? + val setupEntity = database.find(EntityModel::class.java) + .where() + .eq("name", entity) + .findOne() + + ctx.json( + Scripting.execute(body.script, body.fn, body.params, setupEntity) + ) + + } + fun create(ctx: Context) { val entity = ctx.pathParam("entity") @@ -346,7 +365,7 @@ object Entities { ) if (setupEntity != null && !setupEntity.postSaveScript.isNullOrEmpty()) { - Scripting.execute(setupEntity.postSaveScript!!, "postSave", dataModel) + Scripting.execute(setupEntity.postSaveScript!!, "postSave", dataModel, setupEntity) } diff --git a/src/main/kotlin/com/restapi/domain/db.kt b/src/main/kotlin/com/restapi/domain/db.kt index a062342..57e4373 100644 --- a/src/main/kotlin/com/restapi/domain/db.kt +++ b/src/main/kotlin/com/restapi/domain/db.kt @@ -30,6 +30,7 @@ import java.security.spec.PKCS8EncodedKeySpec import java.security.spec.X509EncodedKeySpec import java.time.LocalDateTime import java.util.* +import java.util.concurrent.ConcurrentHashMap import kotlin.jvm.optionals.getOrDefault @@ -185,8 +186,11 @@ object Session { private fun seqName(entity: String) = "sequence_${entity}_${currentTenant()}" + private val seqCreationCache = ConcurrentHashMap() fun creatSeq(entity: String): Int { - return database.sqlUpdate("CREATE SEQUENCE IF NOT EXISTS ${seqName(entity)} START 1;").execute() + return seqCreationCache.computeIfAbsent(entity){ + database.sqlUpdate("CREATE SEQUENCE IF NOT EXISTS ${seqName(entity)} START 1;").execute() + } } fun nextUniqId(entity: String): String { diff --git a/src/main/kotlin/com/restapi/integ/Scripting.kt b/src/main/kotlin/com/restapi/integ/Scripting.kt index 8755f9b..4b1452f 100644 --- a/src/main/kotlin/com/restapi/integ/Scripting.kt +++ b/src/main/kotlin/com/restapi/integ/Scripting.kt @@ -2,6 +2,7 @@ package com.restapi.integ import com.restapi.config.AppConfig.Companion.appConfig import com.restapi.domain.DataModel +import com.restapi.domain.EntityModel import com.restapi.domain.Session.currentTenant import com.restapi.domain.Session.currentUser import com.restapi.domain.Session.database @@ -21,11 +22,11 @@ object Scripting { engine as Invocable } - fun execute(scriptName: String, fnName: String, params: Map): Any { - return getEngine(scriptName).invokeFunction(fnName, params, database, logger, currentUser(), currentTenant()) + fun execute(scriptName: String, fnName: String, params: Map, entityModel: EntityModel?,): Any { + return getEngine(scriptName).invokeFunction(fnName, params, entityModel, database, logger, currentUser(), currentTenant()) } - fun execute(scriptName: String, fnName: String, dataModel: DataModel): Any { - return getEngine(scriptName).invokeFunction(fnName, dataModel, database, logger, currentUser(), currentTenant()) + fun execute(scriptName: String, fnName: String, dataModel: DataModel, entityModel: EntityModel?,): Any { + return getEngine(scriptName).invokeFunction(fnName, dataModel, entityModel, database, logger, currentUser(), currentTenant()) } } \ No newline at end of file diff --git a/src/main/resources/scripts/vehicle.kts b/src/main/resources/scripts/vehicle.kts index 47b43ca..51455b6 100644 --- a/src/main/resources/scripts/vehicle.kts +++ b/src/main/resources/scripts/vehicle.kts @@ -1,17 +1,18 @@ import com.restapi.domain.DataModel +import com.restapi.domain.EntityModel import io.ebean.Database import org.slf4j.Logger -fun execute(d: Map, db: Database, logger: Logger, user: String, tenant: String): Map { +fun execute(d: Map, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String): Map { println("execute on $d") return d } -fun preSave(d: DataModel, db: Database, logger: Logger, user: String, tenant: String): Boolean { +fun preSave(d: DataModel, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String): Boolean { logger.warn("PreSave $d") return true } -fun postSave(d: DataModel, db: Database, logger: Logger, user: String, tenant: String) { +fun postSave(d: DataModel, entityModel: EntityModel?, db: Database, logger: Logger, user: String, tenant: String) { println("PostSave $d") } \ No newline at end of file diff --git a/versions.properties b/versions.properties new file mode 100644 index 0000000..a5b1c6b --- /dev/null +++ b/versions.properties @@ -0,0 +1,10 @@ +#### Dependencies and Plugin versions with their available updates. +#### Generated by `./gradlew refreshVersions` version 0.60.5 +#### +#### Don't manually edit or split the comments that start with four hashtags (####), +#### they will be overwritten by refreshVersions. +#### +#### suppress inspection "SpellCheckingInspection" for whole file +#### suppress inspection "UnusedProperty" for whole file + +version.kotlin=2.0.0 \ No newline at end of file