remove DeleteTemporaryFileRequest & delete_temp_file.lua

dasch-swiss · Nov 25, 2024 · 0134b9c · 0134b9c
1 parent ef64f38
commit 0134b9c
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 189 deletions.
diff --git a/integration/src/test/scala/org/knora/sipi/SipiClientTestDelegator.scala b/integration/src/test/scala/org/knora/sipi/SipiClientTestDelegator.scala
@@ -10,7 +10,6 @@ import zio.ULayer
 import zio.ZLayer
 import zio.nio.file.Path
 
-import org.knora.webapi.messages.store.sipimessages.DeleteTemporaryFileRequest
 import org.knora.webapi.messages.store.sipimessages.MoveTemporaryFileToPermanentStorageRequest
 import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest
 import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse
@@ -69,15 +68,6 @@ case class SipiServiceTestDelegator(
   ): Task[SuccessResponseV2] =
     sipiService.moveTemporaryFileToPermanentStorage(moveTemporaryFileToPermanentStorageRequestV2)
 
-  /**
-   * Asks Sipi to delete a temporary file.
-   *
-   * @param deleteTemporaryFileRequestV2 the request.
-   * @return a [[SuccessResponseV2]].
-   */
-  override def deleteTemporaryFile(deleteTemporaryFileRequestV2: DeleteTemporaryFileRequest): Task[SuccessResponseV2] =
-    sipiService.deleteTemporaryFile(deleteTemporaryFileRequestV2)
-
   /**
    * Asks Sipi for a text file used internally by Knora.
    *

diff --git a/sipi/scripts/delete_temp_file.lua b/sipi/scripts/delete_temp_file.lua
diff --git a/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala b/webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala
@@ -30,14 +30,6 @@ sealed trait SipiRequest extends IIIFRequest
 case class MoveTemporaryFileToPermanentStorageRequest(internalFilename: String, prefix: String, requestingUser: User)
     extends SipiRequest
 
-/**
- * Asks Sipi to delete a temporary file.
- *
- * @param internalFilename the name of the file.
- * @param requestingUser   the user making the request.
- */
-case class DeleteTemporaryFileRequest(internalFilename: String, requestingUser: User) extends SipiRequest
-
 /**
  * Asks Sipi for a text file. Currently only for UTF8 encoded text files.
  *

diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/IIIFRequestMessageHandler.scala
@@ -10,7 +10,6 @@ import zio.*
 import org.knora.webapi.core.MessageHandler
 import org.knora.webapi.core.MessageRelay
 import org.knora.webapi.messages.ResponderRequest
-import org.knora.webapi.messages.store.sipimessages.DeleteTemporaryFileRequest
 import org.knora.webapi.messages.store.sipimessages.IIIFRequest
 import org.knora.webapi.messages.store.sipimessages.MoveTemporaryFileToPermanentStorageRequest
 import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest
@@ -25,7 +24,6 @@ final case class IIIFRequestMessageHandlerLive(iiifService: SipiService) extends
 
   override def handle(message: ResponderRequest): Task[Any] = message match {
     case req: MoveTemporaryFileToPermanentStorageRequest => iiifService.moveTemporaryFileToPermanentStorage(req)
-    case req: DeleteTemporaryFileRequest                 => iiifService.deleteTemporaryFile(req)
     case req: SipiGetTextFileRequest                     => iiifService.getTextFileRequest(req)
     case other                                           => ZIO.logError(s"IIIFServiceManager received an unexpected message: $other")
   }

diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala
@@ -80,14 +80,6 @@ trait SipiService {
     moveTemporaryFileToPermanentStorageRequestV2: MoveTemporaryFileToPermanentStorageRequest,
   ): Task[SuccessResponseV2]
 
-  /**
-   * Asks Sipi to delete a temporary file.
-   *
-   * @param deleteTemporaryFileRequestV2 the request.
-   * @return a [[SuccessResponseV2]].
-   */
-  def deleteTemporaryFile(deleteTemporaryFileRequestV2: DeleteTemporaryFileRequest): Task[SuccessResponseV2]
-
   /**
    * Asks Sipi for a text file used internally by Knora.
    *

diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceLive.scala
@@ -10,7 +10,6 @@ import sttp.client3
 import sttp.client3.*
 import sttp.client3.SttpBackend
 import sttp.client3.httpclient.zio.HttpClientZioBackend
-import sttp.model.Uri
 import zio.*
 import zio.json.ast.Json
 import zio.nio.file.Path
@@ -97,32 +96,6 @@ final case class SipiServiceLive(
     } yield SuccessResponseV2("Moved file to permanent storage.")
   }
 
-  /**
-   * Asks Sipi to delete a temporary file.
-   *
-   * @param deleteTemporaryFileRequestV2 the request.
-   * @return a [[SuccessResponseV2]].
-   */
-  def deleteTemporaryFile(deleteTemporaryFileRequestV2: DeleteTemporaryFileRequest): Task[SuccessResponseV2] = {
-    val deleteRequestContent =
-      Map(
-        "knora-data" -> Json.Obj(
-          "permission" -> Json.Str("DeleteTempFile"),
-          "filename"   -> Json.Str(deleteTemporaryFileRequestV2.internalFilename),
-        ),
-      )
-
-    val url: String => Uri = s =>
-      uri"${sipiConfig.internalBaseUrl}/${sipiConfig.deleteTempFileRoute}/${deleteTemporaryFileRequestV2.internalFilename}?token=${s}"
-
-    val user = deleteTemporaryFileRequestV2.requestingUser
-    for {
-      scope <- scopeResolver.resolve(user)
-      token <- jwtService.createJwt(user.userIri, scope, deleteRequestContent)
-      _     <- doSipiRequest(quickRequest.delete(url(token.jwtString)))
-    } yield SuccessResponseV2("Deleted temporary file.")
-  }
-
   /**
    * Asks Sipi for a text file used internally by Knora.
    *

diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceMock.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/impl/SipiServiceMock.scala
@@ -57,13 +57,6 @@ case class SipiServiceMock(ref: Ref[Map[SipiMockMethodName, Task[Object]]]) exte
       ZIO.succeed(SuccessResponseV2("Moved file to permanent storage"))
     }
 
-  def deleteTemporaryFile(deleteTemporaryFileRequestV2: DeleteTemporaryFileRequest): Task[SuccessResponseV2] =
-    if (deleteTemporaryFileRequestV2.internalFilename == FAILURE_FILENAME) {
-      ZIO.fail(SipiException("Sipi failed to delete temporary file"))
-    } else {
-      ZIO.succeed(SuccessResponseV2("Deleted temporary file"))
-    }
-
   override def getTextFileRequest(textFileRequest: SipiGetTextFileRequest): Task[SipiGetTextFileResponse] =
     getReturnValue(GetTextFileRequest)
 

diff --git a/.../test/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueContentV2Spec.scala b/.../test/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueContentV2Spec.scala
@@ -13,7 +13,6 @@ import zio.test.Spec
 import zio.test.ZIOSpecDefault
 import zio.test.assertTrue
 
-import org.knora.webapi.messages.store.sipimessages.DeleteTemporaryFileRequest
 import org.knora.webapi.messages.store.sipimessages.MoveTemporaryFileToPermanentStorageRequest
 import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest
 import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse
@@ -60,10 +59,6 @@ object ValueContentV2Spec extends ZIOSpecDefault {
       moveTemporaryFileToPermanentStorageRequestV2: MoveTemporaryFileToPermanentStorageRequest,
     ): Task[SuccessResponseV2] =
       ZIO.dieMessage("unsupported operation")
-    def deleteTemporaryFile(
-      deleteTemporaryFileRequestV2: DeleteTemporaryFileRequest,
-    ): Task[SuccessResponseV2] =
-      ZIO.dieMessage("unsupported operation")
     def getTextFileRequest(textFileRequest: SipiGetTextFileRequest): Task[SipiGetTextFileResponse] =
       ZIO.dieMessage("unsupported operation")
     def downloadAsset(asset: Asset, targetDir: Path, user: User): Task[Option[Path]] =