added runner type and share vertical for testing

Author: trKhaled

modules/fbs-core/api/src/main/kotlin/de/thm/ii/fbs/controller/v2/PlaygroundController.kt

@@ -14,7 +14,6 @@ import de.thm.ii.fbs.services.v2.persistence.*
 import de.thm.ii.fbs.utils.v2.annotations.CurrentToken
 import de.thm.ii.fbs.utils.v2.exceptions.NotFoundException
 import org.springframework.http.HttpStatus
-import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 
 @RestController
@@ -75,15 +74,9 @@ class PlaygroundController(
 
     @PostMapping("/{dbId}/dump")
     @ResponseBody
-    fun createSharePlayground(@CurrentToken currentToken: LegacyToken, @PathVariable("dbId") dbId: Int): ResponseEntity<String> {
-        return try {
-            val selectedDb = databaseRepository.findByOwner_IdAndIdAndDeleted(currentToken.id, dbId, false)
-                ?: throw NotFoundException()
-            val dumpUri = sqlPlaygroundCheckerService.createSharePlayground(selectedDb)
-            return ResponseEntity.ok(dumpUri)
-        } catch (e: Exception) {
-            ResponseEntity.badRequest().body(e.message)
-        }
+    fun createSharePlayground(@CurrentToken currentToken: LegacyToken, @PathVariable("dbId") dbId: Int): String {
+        val currentActiveDb = databaseRepository.findByOwner_IdAndIdAndDeleted(currentToken.id, dbId, false) ?: throw NotFoundException()
+        return sqlPlaygroundCheckerService.createSharePlayground(currentActiveDb)
     }
 
     @PostMapping("/{dbId}/reset")

modules/fbs-core/api/src/main/kotlin/de/thm/ii/fbs/model/v2/checker/RunnerType.kt

@@ -3,5 +3,6 @@ package de.thm.ii.fbs.model.v2.checker
 import com.fasterxml.jackson.annotation.JsonValue
 
 enum class RunnerType(@JsonValue val label: String) {
-    SQL_PLAYGROUND("sql-playground")
+    SQL_PLAYGROUND("sql-playground"),
+    SHARE_PLAYGROUND("share")
 }

modules/fbs-core/api/src/main/kotlin/de/thm/ii/fbs/model/v2/checker/SharePlaygroundArguments.kt

@@ -6,5 +6,7 @@ data class SharePlaygroundArguments(
     @JsonProperty("user")
     val user: RunnerUser,
     @JsonProperty("database")
-    val database: RunnerDatabase
+    val database: RunnerDatabase,
+    @JsonProperty("runner")
+    val runner: Runner = Runner(RunnerType.SHARE_PLAYGROUND)
 ) : RunnerArguments()

modules/fbs-core/api/src/main/kotlin/de/thm/ii/fbs/services/v2/checker/RemoteCheckerV2Service.kt

@@ -1,7 +1,6 @@
 package de.thm.ii.fbs.services.v2.checker
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import de.thm.ii.fbs.model.v2.checker.SharePlaygroundArguments
 import de.thm.ii.fbs.model.v2.checker.RunnerArguments
 import de.thm.ii.fbs.utils.v2.helpers.RestTemplateFactory
 import org.springframework.beans.factory.annotation.Value
@@ -33,14 +32,4 @@ abstract class RemoteCheckerV2Service(
             throw Exception("invalid status code from runner: ${res.statusCode}")
         }
     }
-
-    protected fun sendDumpRequest(dumpArguments: SharePlaygroundArguments): String {
-        val body = objectMapper.writeValueAsString(dumpArguments)
-        val res = restTemplate.postForEntity("$masterRunnerURL/runner/start", body, String::class.java) //path maybe needs to change
-
-        if (res.statusCode != HttpStatus.ACCEPTED) {
-            throw Exception("Invalid status code from runner: ${res.statusCode}")
-        }
-        return res.body ?: throw IllegalStateException("Runner did not return any response")
-    }
 }

modules/fbs-core/api/src/main/kotlin/de/thm/ii/fbs/services/v2/checker/SqlPlaygroundCheckerService.kt

@@ -7,7 +7,6 @@ import de.thm.ii.fbs.model.v2.security.SharePlaygroundToken
 import de.thm.ii.fbs.services.v2.persistence.SharePlaygroundTokenRepository
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
-import java.io.IOException
 import java.time.LocalDateTime
 import java.util.*
 
@@ -34,19 +33,16 @@ class SqlPlaygroundCheckerService(
         )
     }
 
-    @Throws(IOException::class, InterruptedException::class)
     fun createSharePlayground(db: SqlPlaygroundDatabase): String {
         val token = UUID.randomUUID().toString()
-        val expiryTime = LocalDateTime.now().plusSeconds(30)
-        val uri = this.sendDumpRequest(
+        val expiryTime = LocalDateTime.now()
+        val uri = this.sendToRunner(
             SharePlaygroundArguments(
                 RunnerUser(db.owner.id!!, db.owner.username),
                 RunnerDatabase(db.id!!, db.name)
             ))
-
-        sharePlaygroundTokenRepository.save(SharePlaygroundToken(token, db.owner.id!!, db.id!!, expiryTime, uri))
-
-        return uri
+        sharePlaygroundTokenRepository.save(SharePlaygroundToken(token, db.owner.id!!, db.id!!, expiryTime, uri.toString()))
+        return uri.toString()
     }
 
     fun deleteDatabase(database: SqlPlaygroundDatabase, userId: Int, username: String) {

modules/fbs-runner/checker/src/main/scala/de/thm/ii/fbs/services/runner/SQLPlaygroundService.scala

@@ -2,7 +2,7 @@ package de.thm.ii.fbs.services.runner
 
 import de.thm.ii.fbs.services.ExtendedResultsService
 import de.thm.ii.fbs.services.db.{DBOperationsService, PsqlOperationsService}
-import de.thm.ii.fbs.types.{OutputJsonStructure, SqlPlaygroundRunArgs}
+import de.thm.ii.fbs.types.{OutputJsonStructure, SharePlaygroundArgs, SqlPlaygroundRunArgs}
 import de.thm.ii.fbs.util.{DBTypes, DatabaseInformationService, PlaygroundDBConnections, SqlPlaygroundMode}
 import io.vertx.core.json.JsonObject
 import io.vertx.scala.ext.sql.ResultSet
@@ -21,6 +21,11 @@ object SQLPlaygroundService {
     OutputJsonStructure("triggers", Option("manipulation"))
   )
 
+// change this function with dump function
+  def test(): String = {
+    s"Test is working"
+  }
+
   def isPlaygroundResult(res: JsonObject): Boolean = res.getString("resultType", "").equals(PLAYGROUND_RESULT_TYPE)
 
   /**

modules/fbs-runner/checker/src/main/scala/de/thm/ii/fbs/verticles/HttpVerticle.scala

@@ -2,7 +2,7 @@ package de.thm.ii.fbs.verticles
 
 import de.thm.ii.fbs.services.runner.SQLPlaygroundService
 import de.thm.ii.fbs.verticles.HttpVerticle.SEND_COMPLETION
-import de.thm.ii.fbs.verticles.runner.{BashRunnerVerticle, SqlCheckerVerticle, SqlPlaygroundVerticle, SqlRunnerVerticle}
+import de.thm.ii.fbs.verticles.runner.{BashRunnerVerticle, SharePlaygroundVerticle, SqlCheckerVerticle, SqlPlaygroundVerticle, SqlRunnerVerticle}
 import io.vertx.lang.scala.json.JsonObject
 import io.vertx.lang.scala.{ScalaLogger, ScalaVerticle}
 import io.vertx.scala.core.eventbus.Message
@@ -94,6 +94,9 @@ class HttpVerticle extends ScalaVerticle {
       case "sql-playground" =>
         vertx.eventBus().send(SqlPlaygroundVerticle.RUN_ADDRESS, body)
         ctx.response().setStatusCode(202).end()
+      case "share" =>
+        vertx.eventBus().send(SharePlaygroundVerticle.RUN_ADDRESS, body)
+        ctx.response().setStatusCode(202).end()
       case _ => ctx.response().setStatusCode(404).end("Invalid Runner Type")
     }
   }

modules/fbs-runner/checker/src/main/scala/de/thm/ii/fbs/verticles/runner/SharePlaygroundVerticle.scala

@@ -0,0 +1,43 @@
+package de.thm.ii.fbs.verticles.runner
+
+import de.thm.ii.fbs.services.runner.SQLPlaygroundService
+import de.thm.ii.fbs.types._
+import de.thm.ii.fbs.verticles.runner.SharePlaygroundVerticle.RUN_ADDRESS
+import io.vertx.lang.scala.{ScalaLogger, ScalaVerticle}
+import io.vertx.scala.core.eventbus.Message
+import io.vertx.core.json.JsonObject
+
+import scala.concurrent.Future
+
+class SharePlaygroundVerticle extends ScalaVerticle {
+  private val logger = ScalaLogger.getLogger(getClass.getName)
+
+  override def startFuture(): Future[_] = {
+    vertx.eventBus().consumer(RUN_ADDRESS, handleTest).completionFuture()
+  }
+
+  //placeholder function
+  private def handleTest(msg: Message[JsonObject]): Future[Unit] = Future {
+    val argsJson = msg.body()
+
+    val userJson = argsJson.getJsonObject("user")
+    val databaseJson = argsJson.getJsonObject("database")
+
+    val userId = userJson.getInteger("id")
+    val username = userJson.getString("username")
+    val databaseName = databaseJson.getString("name")
+    val databaseid = databaseJson.getInteger("id")
+
+    val user = new User(userId, username)
+    val database = Database(databaseid, databaseName)
+
+    val args = SharePlaygroundArgs(user, database)
+
+    val response = SQLPlaygroundService.test()
+    msg.reply(response)
+  }
+}
+
+object SharePlaygroundVerticle {
+  val RUN_ADDRESS = "de.thm.ii.fbs.runner.share"
+}