Fix access control for SingleItem

olovy · olovy · commit 5ff2e026a0f4 · 2024-08-20T14:24:44.000+02:00
diff --git a/rest/src/test/groovy/whelk/rest/api/CrudSpec.groovy b/rest/src/test/groovy/whelk/rest/api/CrudSpec.groovy
@@ -1190,7 +1190,7 @@ class CrudSpec extends Specification {
                                     "@type": "Item",
                                     "contains": "some new data",
                                     "heldBy":
-                                            ["code": "Ting"]]]]
+                                            ["@id": "https://libris.kb.se/library/Ting"]]]]
         request.getInputStream() >> {
             new ServletInputStreamMock(mapper.writeValueAsBytes(postData))
         }
@@ -1201,7 +1201,7 @@ class CrudSpec extends Specification {
             "POST"
         }
         LegacyIntegrationTools.determineLegacyCollection(_, _) >> {
-            return "bib"
+            return "hold"
         }
         request.getContentType() >> {
             "application/ld+json"
diff --git a/whelk-core/src/main/groovy/whelk/Document.groovy b/whelk-core/src/main/groovy/whelk/Document.groovy
@@ -370,7 +370,7 @@ class Document {
     }
 
     boolean isHolding(JsonLd jsonld) {
-        return ("hold" == getLegacyCollection(jsonld))
+        return "hold" == getLegacyCollection(jsonld) || jsonld.isSubClassOf(getThingType(), "Item")
     }
     
     String getLegacyCollection(JsonLd jsonld) {

Original file line number	Diff line number	Diff line change
`@@ -1190,7 +1190,7 @@ class CrudSpec extends Specification {`
`1190`	`1190`	`"@type": "Item",`
`1191`	`1191`	`"contains": "some new data",`
`1192`	`1192`	`"heldBy":`
`1193`		`- ["code": "Ting"]]]]`
	`1193`	`+ ["@id": "https://libris.kb.se/library/Ting"]]]]`
`1194`	`1194`	`request.getInputStream() >> {`
`1195`	`1195`	`new ServletInputStreamMock(mapper.writeValueAsBytes(postData))`
`1196`	`1196`	`}`
`@@ -1201,7 +1201,7 @@ class CrudSpec extends Specification {`
`1201`	`1201`	`"POST"`
`1202`	`1202`	`}`
`1203`	`1203`	`LegacyIntegrationTools.determineLegacyCollection(_, _) >> {`
`1204`		`- return "bib"`
	`1204`	`+ return "hold"`
`1205`	`1205`	`}`
`1206`	`1206`	`request.getContentType() >> {`
`1207`	`1207`	`"application/ld+json"`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ class Document {`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`boolean isHolding(JsonLd jsonld) {`
`373`		`- return ("hold" == getLegacyCollection(jsonld))`
	`373`	`+ return "hold" == getLegacyCollection(jsonld) \|\| jsonld.isSubClassOf(getThingType(), "Item")`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`String getLegacyCollection(JsonLd jsonld) {`