fix folderPath

pagopa · Jul 2, 2024 · 894d210 · 894d210
1 parent bf51e80
commit 894d210
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/scala/it/pagopa/interop/backendforfrontend/api/impl/EServicesApiServiceImpl.scala b/src/main/scala/it/pagopa/interop/backendforfrontend/api/impl/EServicesApiServiceImpl.scala
@@ -1167,11 +1167,16 @@ final case class EServicesApiServiceImpl(
     }
 
     val result: Future[CreatedEServiceDescriptor] = for {
-      tenantId         <- getOrganizationIdFuture(contexts)
-      zipFile          <- fileManager.getFile(ApplicationConfiguration.importEServiceContainer)(
+      tenantId <- getOrganizationIdFuture(contexts)
+      zipFile  <- fileManager.getFile(ApplicationConfiguration.importEServiceContainer)(
         s"${ApplicationConfiguration.importEServicePath}/$tenantId/${fileResource.filename}"
       )
-      folderPath       <- extractZipToTempDirectory(zipFile, tenantId).toFuture
+      zipPath  <- extractZipToTempDirectory(zipFile, tenantId).toFuture
+      listFiles    = Files.list(zipPath).iterator().asScala.toList
+      folderPath   = listFiles match {
+        case path :: Nil if path.toFile.isDirectory => path
+        case _                                      => zipPath
+      }
       importedEservice <- checkZipStructure(folderPath).toFuture.recoverWith { case ex: Throwable =>
         deleteTempDirectory(folderPath)
         Future.failed(ex)