From 93f106b8be98c620790f21e8a27cda011d10f37f Mon Sep 17 00:00:00 2001 From: AsterITA Date: Mon, 1 Jul 2024 10:56:48 +0200 Subject: [PATCH] reduce diff --- .../api/impl/EServicesApiServiceImpl.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 index 338a5b47..f30260fd 100644 --- a/src/main/scala/it/pagopa/interop/backendforfrontend/api/impl/EServicesApiServiceImpl.scala +++ b/src/main/scala/it/pagopa/interop/backendforfrontend/api/impl/EServicesApiServiceImpl.scala @@ -1078,7 +1078,8 @@ final case class EServicesApiServiceImpl( .leftMap(ex => InvalidZipStructure(directoryName, "Error reading configuration.json: " + ex.toString)) importedEservice <- Either .catchNonFatal(jsonContent.parseJson.convertTo[ImportedEservice]) - .leftMap(ex => InvalidZipStructure(directoryName, "Error decoding configuration.json: " + ex.toString)) + .leftMap(ex => InvalidZipStructure(directoryName, "Error decoding configuration.json: " + ex.toString) + ) _ <- importedEservice.descriptor.docs.foldLeft[Either[InvalidZipStructure, Unit]](Right(())) { (acc, doc) => acc.flatMap(_ => fileExists(path.resolve(doc.path))) } @@ -1132,7 +1133,7 @@ final case class EServicesApiServiceImpl( .parse(mimeType) .leftMap(errors => ContentTypeParsingError(mimeType, file.path, errors.map(_.toString()))) .toFuture - fileParts = (FileInfo("", fileName, contentType), new File(filePath)) + fileParts = (FileInfo("", fileName, contentType), new File(filePath)) _ <- verifyAndCreateEServiceDocument( catalogProcessService, fileManager, @@ -1161,12 +1162,12 @@ 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}" ) - zipPath <- extractZipToTempDirectory(zipFile, tenantId).toFuture - folderPath = zipPath.resolve(fileResource.filename.stripSuffix(".zip")) + zipPath <- extractZipToTempDirectory(zipFile, tenantId).toFuture + folderPath = zipPath.resolve(fileResource.filename.stripSuffix(".zip")) importedEservice <- checkZipStructure(folderPath).toFuture.recoverWith { case ex: Throwable => deleteTempDirectory(zipPath) Future.failed(ex)