From def15fc28d1631765fe759d80b046defe49a46a8 Mon Sep 17 00:00:00 2001 From: okanmercan Date: Tue, 19 Nov 2024 10:52:17 +0300 Subject: [PATCH 1/2] :sparkles: feat: Delete project json before reload projects. --- .../scala/io/tofhir/server/service/ReloadService.scala | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala b/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala index 419d9136..783ef8a1 100644 --- a/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala +++ b/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala @@ -6,6 +6,8 @@ import io.tofhir.server.repository.mappingContext.MappingContextFolderRepository import io.tofhir.server.repository.schema.SchemaFolderRepository import io.tofhir.server.repository.terminology.TerminologySystemFolderRepository import io.tofhir.engine.Execution.actorSystem.dispatcher +import io.tofhir.engine.util.FileUtils +import io.tofhir.server.repository.project.ProjectFolderRepository import io.tofhir.server.service.db.FolderDBInitializer import scala.concurrent.Future @@ -31,6 +33,13 @@ class ReloadService(mappingRepository: ProjectMappingFolderRepository, mappingJobRepository.reloadJobDefinitions() mappingContextRepository.reloadMappingContextDefinitions() terminologySystemFolderRepository.reloadTerminologySystems() + + // Delete projects.json before reload projects + val file = FileUtils.getPath(ProjectFolderRepository.PROJECTS_JSON).toFile + if(file.exists()){ + file.delete() + } + folderDBInitializer.init() } } From 3faa62125701b09b45a1099a559d57dfb2eeff08 Mon Sep 17 00:00:00 2001 From: yemregurses Date: Tue, 19 Nov 2024 11:16:25 +0300 Subject: [PATCH 2/2] :recycle: create a method to remove project json file in FolderDBInitializer --- .../scala/io/tofhir/server/service/ReloadService.scala | 7 +------ .../tofhir/server/service/db/FolderDBInitializer.scala | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala b/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala index 783ef8a1..743a0cc9 100644 --- a/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala +++ b/tofhir-server/src/main/scala/io/tofhir/server/service/ReloadService.scala @@ -33,13 +33,8 @@ class ReloadService(mappingRepository: ProjectMappingFolderRepository, mappingJobRepository.reloadJobDefinitions() mappingContextRepository.reloadMappingContextDefinitions() terminologySystemFolderRepository.reloadTerminologySystems() - // Delete projects.json before reload projects - val file = FileUtils.getPath(ProjectFolderRepository.PROJECTS_JSON).toFile - if(file.exists()){ - file.delete() - } - + folderDBInitializer.removeProjectsJsonFile() folderDBInitializer.init() } } diff --git a/tofhir-server/src/main/scala/io/tofhir/server/service/db/FolderDBInitializer.scala b/tofhir-server/src/main/scala/io/tofhir/server/service/db/FolderDBInitializer.scala index ece7d041..3e817484 100644 --- a/tofhir-server/src/main/scala/io/tofhir/server/service/db/FolderDBInitializer.scala +++ b/tofhir-server/src/main/scala/io/tofhir/server/service/db/FolderDBInitializer.scala @@ -178,4 +178,14 @@ class FolderDBInitializer(schemaFolderRepository: SchemaFolderRepository, projects } + /** + * Removes the projects.json file. + */ + def removeProjectsJsonFile(): Unit = { + val file = FileUtils.getPath(ProjectFolderRepository.PROJECTS_JSON).toFile + if (file.exists()) { + file.delete() + } + } + }