Handle saving failed transformation results

Author: Su5eD

base/src/main/kotlin/org/sinytra/probe/base/db/Project.kt

@@ -13,7 +13,6 @@ data class Project(
     val id: String,
 
     val internalModId: Long,
-    val modid: String?,
 
     val internalId: Long? = null
 )

core/src/main/kotlin/org/sinytra/probe/core/db/ProjectMapping.kt

@@ -27,6 +27,5 @@ fun daoToModel(dao: ProjectDAO) = Project(
     ProjectPlatform.valueOf(dao.platform),
     dao.projectId,
     dao.mod.id.value,
-    dao.mod.modid,
-    dao.id.value,
+    dao.id.value
 )

core/src/main/kotlin/org/sinytra/probe/core/model/ModRepository.kt

@@ -9,6 +9,7 @@ import org.sinytra.probe.core.db.suspendTransaction
 
 interface ModRepository {
     suspend fun allMods(): List<Mod>
+    suspend fun modById(id: Long): Mod?
     suspend fun modByModid(modid: String): Mod?
     suspend fun addMod(mod: Mod): Mod
     suspend fun removeMod(modid: String): Boolean
@@ -18,6 +19,10 @@ class PostgresModRepository : ModRepository {
     override suspend fun allMods(): List<Mod> = suspendTransaction {
         ModDAO.all().map(::daoToModel)
     }
+    
+    override suspend fun modById(id: Long): Mod? = suspendTransaction {
+        ModDAO.findById(id)?.let(::daoToModel)
+    }
 
     override suspend fun modByModid(modid: String): Mod? = suspendTransaction {
         ModDAO

core/src/main/kotlin/org/sinytra/probe/core/model/ProjectRepository.kt

@@ -33,7 +33,7 @@ class PostgresProjectRepository : ProjectRepository {
     }
 
     override suspend fun addProject(project: Project): Project = suspendTransaction {
-        val dbMod = ModDAO.find { ModTable.modid eq project.modid }.single()
+        val dbMod = ModDAO.find { ModTable.id eq project.internalModId }.single()
         ProjectDAO.new {
             platform = project.platform.toString()
             projectId = project.id

core/src/main/kotlin/org/sinytra/probe/core/service/AsyncTransformationRunner.kt

@@ -58,7 +58,9 @@ class AsyncTransformationRunner(
 
     suspend fun computeAndSave(project: PlatformProject, resolved: ResolvedProject, testEnvironment: TestEnvironment): TestResult {
         val result = transfomer.runTransformation(resolved, testEnvironment.gameVersion)
-        val testResult = mutex.withLock { persistence.saveResult(project, result.modid, result.version, result.success, testEnvironment) }
+        val testResult = mutex.withLock { 
+            persistence.saveResult(project, result.modid, result.version, result.success, testEnvironment)
+        }
         return testResult
     }
 }

core/src/main/kotlin/org/sinytra/probe/core/service/PersistenceService.kt

@@ -1,5 +1,6 @@
 package org.sinytra.probe.core.service
 
+import kotlinx.coroutines.coroutineScope
 import org.sinytra.probe.base.db.Project
 import org.sinytra.probe.core.model.*
 import org.sinytra.probe.core.platform.PlatformProject
@@ -22,12 +23,14 @@ class PersistenceService(
         return results.getTestResultFor(dbProject.internalModId, testEnvironment)
     }
 
-    // TODO Account for failed transformations
-    suspend fun saveResult(project: PlatformProject, modid: String, versionId: String, passing: Boolean, testEnvironment: TestEnvironment): TestResult {
-        val mod = mods.modByModid(modid) ?: mods.addMod(Mod(id = 0, modid = modid, projects = listOf()))
-
-        val dbProject = projects.projectByPlatformAndId(project.platform, project.id)
-            ?: projects.addProject(Project(platform = project.platform, id = project.id, internalModId = mod.id, modid = mod.modid))
+    suspend fun saveResult(project: PlatformProject, modid: String?, versionId: String, passing: Boolean, testEnvironment: TestEnvironment): TestResult {
+        val (dbProject, mod) = projects.projectByPlatformAndId(project.platform, project.id)
+            ?.let { it to mods.modById(it.internalModId)!! }
+            ?: coroutineScope {
+                val mod = mods.addMod(Mod(id = 0, modid = modid, projects = listOf()))
+                val saved = projects.addProject(Project(platform = project.platform, id = project.id, internalModId = mod.id))
+                saved to mod
+            }
 
         if (dbProject !in mod.projects) {
             projects.assignModToProject(dbProject, mod)

core/src/main/kotlin/org/sinytra/probe/core/service/TransformationService.kt

@@ -19,7 +19,7 @@ data class TransformationResult(
     val version: String,
     val dependencyProjectId: List<String>,
     val success: Boolean,
-    val modid: String
+    val modid: String?
 )
 
 @OptIn(ExperimentalPathApi::class)
@@ -47,16 +47,21 @@ class TransformationService(
         }
         workDir.createDirectories()
 
-        val result = runTransformer(workDir, allFiles, gameFiles.cleanFile, classPath, gameVersion)
+        val result = try {
+            runTransformer(workDir, allFiles, gameFiles.cleanFile, classPath, gameVersion)
+        } catch (e: Exception) {
+            LOGGER.error("Error transforming project ${mainFile.projectId} version ${mainFile.versionId}", e)
+            null
+        }
 
         workDir.deleteRecursively()
 
         return TransformationResult(
             project.version.projectId,
             project.version.versionId,
             otherFiles.map(ProjectVersion::projectId),
-            result.success,
-            result.primaryModid
+            result?.success ?: false,
+            result?.primaryModid
         )
     }