Merge branch 'main' into feat/DEV-4306-footnote-standoff

dasch-swiss · Dec 12, 2024 · 2a9a56a · 2a9a56a
2 parents 47af79e + a6c8f2b
commit 2a9a56a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala b/...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala
@@ -713,7 +713,7 @@ object ValueContentV2 {
       for {
         sipiService <- ZIO.service[SipiService]
         assetId <- ZIO
-                     .fromEither(AssetId.from(filename.substring(0, filename.indexOf('.'))))
+                     .fromEither(AssetId.fromFilename(filename))
                      .mapError(msg => BadRequestException(s"Invalid value for 'fileValueHasFilename': $msg"))
         meta <- sipiService.getFileMetadataFromDspIngest(shortcode, assetId).mapError {
                   case NotFoundException(_) =>

diff --git a/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala b/webapi/src/main/scala/org/knora/webapi/slice/admin/api/model/MaintenanceRequests.scala
@@ -21,7 +21,14 @@ import org.knora.webapi.slice.admin.domain.model.KnoraProject.Shortcode
 object MaintenanceRequests {
 
   type AssetId = String Refined MatchesRegex["^[a-zA-Z0-9-_]{4,}$"]
-  object AssetId extends RefinedTypeOps[AssetId, String]
+  object AssetId extends RefinedTypeOps[AssetId, String] {
+
+    def fromFilename(filename: String): Either[String, AssetId] = {
+      val withoutFileExtension =
+        if filename.contains(".") then filename.substring(0, filename.indexOf('.')) else filename
+      AssetId.from(withoutFileExtension)
+    }
+  }
 
   final case class Dimensions(width: Int Refined Positive, height: Int Refined Positive)