Merge pull request #34 from Yuval-Roth/db_hotfix

Db hotfix

Author: Yuval-Roth

common/src/main/java/com/imsproject/common/dataAccess/abstracts/DAOBase.kt

@@ -179,10 +179,10 @@ abstract class DAOBase<T, PK : PrimaryKey> protected constructor(
     }
 
     fun buildQueryAndInsert(idColumnName: String, values: Array<out Any?>, transactionId: String?): Int {
-        val questionmarks = List(nonKeyColumnNames.size) { "?" }.joinToString(", "); //don't ask please
+        val questionmarks = List(nonKeyColumnNames.size) { "?" }.joinToString(", ");
         val insertQuery = "INSERT INTO $tableName (${nonKeyColumnNames.joinToString()}) VALUES (${questionmarks}) RETURNING $idColumnName"
         try {
-            val keysResultSet = cursor.executeInsert(insertQuery,values, transactionId)
+            val keysResultSet = cursor.executeInsert(insertQuery, values, transactionId)
             if(keysResultSet.next()) {
                 val id = keysResultSet.getInt(idColumnName)
                 if(id != null){

game_server/src/main/kotlin/com/imsproject/gameserver/api/RestApiController.kt

@@ -147,6 +147,23 @@ class RestApiController(
         }
     }
 
+    // todo: delete
+    @PostMapping("/data/experiment/{action}")
+    fun dataTest2(
+        @PathVariable action: String,
+        @RequestBody body: String): ResponseEntity<String> {
+        var obj = fromJson<ExperimentDTO>(body)
+
+        when(action) {
+            "insert" -> { daoController.handleInsert(obj) }
+            "delete" -> { daoController.handleDelete(obj) }
+            "update" -> { daoController.handleUpdate(obj) }
+            "select" -> { daoController.handleSelect(obj) }
+        }
+        return Response.getOk().toResponseEntity()
+    }
+
+
     private data class QnA(val question: String, val answer: String)
     private data class ExperimentFeedback(val expId: Int, val pid: Int, val qnas: List<QnA>)
     @PostMapping("/data/experiment/insert/feedback")

game_server/src/main/kotlin/com/imsproject/gameserver/dataAccess/implementations/ExperimentsDAO.kt

@@ -11,6 +11,8 @@ import com.imsproject.common.utils.Response
 import com.imsproject.gameserver.dataAccess.models.ExperimentDTO
 import com.imsproject.gameserver.dataAccess.models.ExperimentWithParticipantNamesDTO
 import org.springframework.stereotype.Component
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 @Component
 class ExperimentsDAO(cursor: SQLExecutor) : DAOBase<ExperimentDTO, ExperimentPK>(cursor, "Experiments", ExperimentPK.primaryColumnsList, arrayOf("pid1", "pid2", "date_time")) {
@@ -30,14 +32,14 @@ class ExperimentsDAO(cursor: SQLExecutor) : DAOBase<ExperimentDTO, ExperimentPK>
 
     @Throws(DaoException::class)
     override fun insert(obj: ExperimentDTO, transactionId: String?): Int {
-        val values = arrayOf(obj.pid1,obj.pid2)
+        val values = arrayOf(obj.pid1,obj.pid2, obj.dateTime ?: LocalDateTime.now())
         val idColName = primaryKeyColumnNames.joinToString()
         return buildQueryAndInsert(idColName, values, transactionId)
     }
 
     @Throws(DaoException::class)
     override fun update(obj: ExperimentDTO, transactionId: String?) {
-        val values = arrayOf(obj.pid1,obj.pid2)
+        val values = arrayOf(obj.pid1,obj.pid2,obj.dateTime)
         val id = obj.expId ?: throw IllegalArgumentException("Lobby ID must not be null")
         val idColName = primaryKeyColumnNames.joinToString()
         buildQueryAndUpdate(idColName, id, values, transactionId)