Merge pull request #32 from Yuval-Roth/fg_db_fixes

Fg db fixes

Author: Yuval-Roth

common/src/main/java/com/imsproject/common/dataAccess/OfflineResultSet.kt

@@ -84,7 +84,12 @@ class OfflineResultSet(rs: ResultSet) {
 
     fun getLocalDateTime(columnName: String): LocalDateTime? {
         val obj = getObject(columnName) ?: return null
-        return LocalDateTime.parse(obj as String, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+        return when (obj) {
+            is LocalDateTime -> obj
+            is java.sql.Timestamp -> obj.toLocalDateTime()
+            is String -> LocalDateTime.parse(obj, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+            else -> throw IllegalArgumentException("Unsupported type for LocalDateTime: ${obj::class.java.name}")
+        }
     }
 
     inline fun <reified T> getEnum(columnName: String): T? {

database/init.sql

@@ -12,6 +12,7 @@ CREATE TABLE IF NOT EXISTS Experiments (
     exp_id SERIAL PRIMARY KEY,
     pid1 INT,
     pid2 INT,
+    date_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (pid1) REFERENCES Participants(pid),
     FOREIGN KEY (pid2) REFERENCES Participants(pid)
 );

game_server/src/main/kotlin/com/imsproject/gameserver/business/ExperimentOrchestrator.kt

@@ -55,7 +55,7 @@ class ExperimentOrchestrator(
         val pid1 = Integer.parseInt(player1Id)
         val pid2 = Integer.parseInt(player2Id)
 
-        val experimentDTO = ExperimentDTO(null,pid1,pid2)
+        val experimentDTO = ExperimentDTO(null,pid1,pid2,null)
         val expId = daoController.handleInsert(experimentDTO)
         experimentSessions.forEachIndexed { index, session ->
             if(session.dbId == null){

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

@@ -13,12 +13,13 @@ import com.imsproject.gameserver.dataAccess.models.ExperimentWithParticipantName
 import org.springframework.stereotype.Component
 
 @Component
-class ExperimentsDAO(cursor: SQLExecutor) : DAOBase<ExperimentDTO, ExperimentPK>(cursor, "Experiments", ExperimentPK.primaryColumnsList, arrayOf("pid1", "pid2")) {
+class ExperimentsDAO(cursor: SQLExecutor) : DAOBase<ExperimentDTO, ExperimentPK>(cursor, "Experiments", ExperimentPK.primaryColumnsList, arrayOf("pid1", "pid2", "date_time")) {
     override fun buildObjectFromResultSet(resultSet: OfflineResultSet): ExperimentDTO {
         return ExperimentDTO(
             expId = resultSet.getInt("exp_id"),
             pid1 = resultSet.getInt("pid1"),
-            pid2 = resultSet.getInt("pid2")
+            pid2 = resultSet.getInt("pid2"),
+            dateTime = resultSet.getLocalDateTime("date_time")
         )
 
     }
@@ -46,6 +47,7 @@ class ExperimentsDAO(cursor: SQLExecutor) : DAOBase<ExperimentDTO, ExperimentPK>
     fun selectWithParticipantNames(transactionId: String? = null): List<ExperimentWithParticipantNamesDTO> {
         val query = """
             SELECT e.exp_id AS eid,
+                   e.date_time AS date_time,
                    p1.first_name AS p1_name,
                    p2.first_name AS p2_name
             FROM experiments e
@@ -61,7 +63,8 @@ class ExperimentsDAO(cursor: SQLExecutor) : DAOBase<ExperimentDTO, ExperimentPK>
                     ExperimentWithParticipantNamesDTO(
                         expId = resultSet.getInt("eid")!!,
                         participant1Name = resultSet.getString("p1_name")!!,
-                        participant2Name = resultSet.getString("p2_name")!!
+                        participant2Name = resultSet.getString("p2_name")!!,
+                        dateTime = resultSet.getLocalDateTime("date_time")!!
                     )
                 )
             }

game_server/src/main/kotlin/com/imsproject/gameserver/dataAccess/models/Models.kt

@@ -1,6 +1,8 @@
 package com.imsproject.gameserver.dataAccess.models
 
 import com.imsproject.common.gameserver.SessionEvent
+import java.time.LocalDate
+import java.time.LocalDateTime
 import kotlin.math.exp
 
 data class ParticipantDTO(
@@ -16,7 +18,8 @@ data class ParticipantDTO(
 data class ExperimentDTO(
     val expId: Int?,
     val pid1: Int?,
-    val pid2: Int?
+    val pid2: Int?,
+    val dateTime: LocalDateTime?
 )
 
 data class ExperimentFeedbackDTO(
@@ -132,6 +135,7 @@ data class SessionData(
 
 data class ExperimentWithParticipantNamesDTO(
     val expId: Int,
+    val dateTime: LocalDateTime,
     val participant1Name: String,
     val participant2Name: String
-) //todo: add date?
+)