From 9f4dff0e0334ad524be769c96ab1cbd4aa54bf1a Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Thu, 14 Dec 2023 18:07:45 +0100
Subject: [PATCH] reenabled startup logic
---
.../iem/dataprovider/StartUpHandler.kt | 40 ++++++++-----------
.../repository/service/RepositoryService.kt | 8 ++--
2 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/StartUpHandler.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/StartUpHandler.kt
index 847bdb5c..c3f509b8 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/StartUpHandler.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/StartUpHandler.kt
@@ -1,15 +1,12 @@
package de.fraunhofer.iem.dataprovider
import de.fraunhofer.iem.dataprovider.configuration.InitialProjects
-import de.fraunhofer.iem.dataprovider.gitlab.controller.GitlabController
import de.fraunhofer.iem.dataprovider.logger.getLogger
-import de.fraunhofer.iem.dataprovider.repository.controller.RepositoryController
+import de.fraunhofer.iem.dataprovider.repository.dto.RepositoryConsentDto
import de.fraunhofer.iem.dataprovider.repository.service.RepositoryService
import de.fraunhofer.iem.dataprovider.tool.service.ToolService
import de.fraunhofer.iem.dataprovider.toolRun.service.ToolRunService
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
import org.springframework.boot.context.event.ApplicationReadyEvent
import org.springframework.context.event.EventListener
import org.springframework.stereotype.Component
@@ -20,8 +17,6 @@ class StartUpHandler(
val initialProjects: InitialProjects,
val toolService: ToolService,
val repositoryService: RepositoryService,
- val gitlabController: GitlabController,
- val repositoryController: RepositoryController
) {
private val logger = getLogger(javaClass)
val coroutineScope = CoroutineScope(Dispatchers.Default)
@@ -34,24 +29,21 @@ class StartUpHandler(
logger.info("Creating tools in db")
toolService.createAllTools()
}
-//
-// gitlabController.repoChanged(RepositoryChangedRequestDto(159))
-// repositoryController.updateRepositoryConsent(159, RepositoryConsentDto(true))
-// logger.info("Loading initial projects $initialProjects")
+ logger.info("Loading initial projects $initialProjects")
-// val jobs = initialProjects.projectIds.mapNotNull { projectId ->
-// return@mapNotNull if (projectId >= 0) {
-// coroutineScope.launch {
-// toolRunService.createToolRunForRepository(projectId).join()
-// repositoryService.updateVisualizationConsent(projectId, RepositoryConsentDto(true))
-// }
-// } else {
-// null
-// }
-// }
-// coroutineScope.launch {
-// jobs.joinAll()
-// }
+ val jobs = initialProjects.projectIds.mapNotNull { projectId ->
+ return@mapNotNull if (projectId >= 0) {
+ coroutineScope.launch {
+ toolRunService.createToolRunForRepository(projectId).join()
+ repositoryService.updateVisualizationConsent(projectId, RepositoryConsentDto(true))
+ }
+ } else {
+ null
+ }
+ }
+ coroutineScope.launch {
+ jobs.joinAll()
+ }
}
}
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt
index 55e5ea3b..51850a7a 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt
@@ -90,9 +90,11 @@ class RepositoryService(
@Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW)
fun getToolRunByProjectId(projectId: Long): ToolRunDto? {
toolRunRepository.findFirstByRepository_ProjectIdOrderByCreatedAtDesc(projectId)?.let { toolRunEntity ->
- return ToolRunDto.getDtoFromEntity(
- toolRunEntity
- )
+ if (toolRunEntity.repository.visualizationConsent) {
+ return ToolRunDto.getDtoFromEntity(
+ toolRunEntity
+ )
+ }
}
return null
}
--
GitLab