add ResourcesResponderV2 test for copyright and licenses infos

integration/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala

@@ -27,9 +27,11 @@ sealed abstract case class UploadFileRequest private (
   label: String,
   resourceIRI: Option[String] = None,
   copyrightHolder: Option[CopyrightHolder] = None,
+  authorship: Option[List[Authorship]] = None,
   licenseText: Option[LicenseText] = None,
   licenseUri: Option[LicenseUri] = None,
-) {
+  licenseDate: Option[LicenseDate] = None,
+) { self =>
 
   /**
    * Create a JSON-LD serialization of the request. This can be used for e2e and integration tests.
@@ -64,10 +66,17 @@ sealed abstract case class UploadFileRequest private (
        |    "@type" : "$fileValueType",
        |    "knora-api:fileValueHasFilename" : "$internalFilename"
        |    ${copyrightHolder.map(ca => s""","knora-api:hasCopyrightHolder" : "${ca.value}"""").getOrElse("")}
+       |    ${authorship
+        .filter(_.nonEmpty)
+        .map(a => s""","knora-api:hasAuthorship" : [ ${a.map(_.value).mkString("\"", ",", " \"")} ]""")
+        .getOrElse("")}
        |    ${licenseText.map(l => s""","knora-api:hasLicenseText" : "${l.value}"""").getOrElse("")}
        |    ${licenseUri
         .map(u => s""", "knora-api:hasLicenseUri" : { "@type" : "xsd:anyURI", "@value":"${u.value}" }""")
         .getOrElse("")}
+       |    ${licenseDate
+        .map(d => s""", "knora-api:hasLicenseDate" : { "@type" : "xsd:date", "@value":"${d.value.toString}" }""")
+        .getOrElse("")}
        |  },
        |  "knora-api:attachedToProject" : {
        |    "@id" : "http://rdfh.ch/projects/$shortcode"
@@ -117,11 +126,6 @@ sealed abstract case class UploadFileRequest private (
     resourceClassIRI: Option[SmartIri] = None,
     valuePropertyIRI: Option[SmartIri] = None,
     project: Option[Project] = None,
-    copyrightHolder: Option[CopyrightHolder] = None,
-    authorship: Option[List[Authorship]] = None,
-    licenseText: Option[LicenseText] = None,
-    licenseUri: Option[LicenseUri] = None,
-    licenseDate: Option[LicenseDate] = None,
   ): CreateResourceV2 = {
     implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance
 
@@ -140,11 +144,11 @@ sealed abstract case class UploadFileRequest private (
       originalFilename = originalFilename,
       originalMimeType = originalMimeType,
       comment = comment,
-      copyrightHolder = copyrightHolder,
-      authorship = authorship,
-      licenseText = licenseText,
-      licenseUri = licenseUri,
-      licenseDate = licenseDate,
+      copyrightHolder = self.copyrightHolder,
+      authorship = self.authorship,
+      licenseText = self.licenseText,
+      licenseUri = self.licenseUri,
+      licenseDate = self.licenseDate,
     )
 
     val values = List(
@@ -196,17 +200,21 @@ object UploadFileRequest {
     label: String = "test label",
     resourceIRI: Option[String] = None,
     copyrightHolder: Option[CopyrightHolder] = None,
+    authorship: Option[List[Authorship]] = None,
     licenseText: Option[LicenseText] = None,
     licenseUri: Option[LicenseUri] = None,
+    licenseDate: Option[LicenseDate] = None,
   ): UploadFileRequest =
     new UploadFileRequest(
       fileType,
       internalFilename,
       label,
       resourceIRI,
       copyrightHolder,
+      authorship,
       licenseText,
       licenseUri,
+      licenseDate,
     ) {}
 }
 

integration/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala

@@ -40,7 +40,7 @@ import org.knora.webapi.models.filemodels.*
 import org.knora.webapi.responders.v2.ResourcesResponseCheckerV2.compareReadResourcesSequenceV2Response
 import org.knora.webapi.routing.UnsafeZioRun
 import org.knora.webapi.sharedtestdata.SharedTestDataADM
-import org.knora.webapi.slice.admin.domain.model.User
+import org.knora.webapi.slice.admin.domain.model.*
 import org.knora.webapi.slice.resources.IiifImageRequestUrl
 import org.knora.webapi.store.triplestore.api.TriplestoreService
 import org.knora.webapi.store.triplestore.api.TriplestoreService.Queries.Ask
@@ -1144,6 +1144,52 @@ class ResourcesResponderV2Spec extends CoreSpec with ImplicitSender {
       )
     }
 
+    "create a still image file value with copyright and license information" in {
+      val resourceIri: IRI = stringFormatter.makeRandomResourceIri(SharedTestDataADM.anythingProject.shortcode)
+
+      val copyrightHolder = CopyrightHolder.unsafeFrom("The University of Basel")
+      val authorship      = List("Hans Meier", "Peter Müller").map(Authorship.unsafeFrom)
+      val licenseText     = LicenseText.unsafeFrom("CC BY-SA 4.0")
+      val licenseUri      = LicenseUri.unsafeFrom("https://creativecommons.org/licenses/by-sa/4.0/")
+      val licenseDate     = LicenseDate.unsafeFrom("2020-01-01")
+
+      val inputResource = UploadFileRequest
+        .make(
+          fileType = FileType.StillImageFile(
+            dimX = 512,
+            dimY = 256,
+          ),
+          internalFilename = "bar.jp2",
+          copyrightHolder = Some(copyrightHolder),
+          authorship = Some(authorship),
+          licenseText = Some(licenseText),
+          licenseUri = Some(licenseUri),
+          licenseDate = Some(licenseDate),
+        )
+        .toMessage(resourceIri = Some(resourceIri))
+
+      val _ = UnsafeZioRun.runOrThrow(
+        resourcesResponderV2(
+          _.createResource(CreateResourceRequestV2(inputResource, anythingUserProfile, UUID.randomUUID)).logError,
+        ),
+      )
+
+      val actual: ReadResourceV2 = getResource(resourceIri)
+      val fileValue: FileValueV2 =
+        actual.values.head._2
+          .map(_.valueContent)
+          .collect { case sifvc: StillImageFileValueContentV2 => sifvc }
+          .map(_.fileValue)
+          .head
+
+      assert(fileValue.copyrightHolder.contains(copyrightHolder))
+      assert(fileValue.licenseText.contains(licenseText))
+      assert(fileValue.licenseUri.contains(licenseUri))
+      // not (yet) working:
+      // assert(fileValue.licenseDate.contains(licenseDate))
+      // assert(fileValue.authorship.contains(authorship))
+    }
+
     "create a resource with an external still image file value" in {
       val resourceIri: IRI = stringFormatter.makeRandomResourceIri(SharedTestDataADM.anythingProject.shortcode)