Skip to content

Commit

Permalink
Merge pull request #732 from colonial-heritage/feat-research-guide-ha…
Browse files Browse the repository at this point in the history 
…s-parts

feat: hasParts property
  • Loading branch information
@sdevalk
sdevalk authored Dec 13, 2024
2 parents 5fd6cd4 + 5224c33 commit d7a55c1
Show file tree
Hide file tree
Showing 5 changed files with 169 additions and 125 deletions.
1 change: 1 addition & 0 deletions packages/api/src/research-guides/definitions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ export type ResearchGuide = Thing & {
contentLocations?: Place[];
keywords?: Term[];
citations?: Citation[];
hasParts?: ResearchGuide[];
seeAlso?: ResearchGuide[];
};
158 changes: 49 additions & 109 deletions packages/api/src/research-guides/fetcher.integration.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,140 +23,62 @@ describe('getTopLevels', () => {
'Research aides for conducting provenance research into colonial collections',
text: 'On this page you find various research aides that can assist...',
encodingFormat: 'text/markdown',
seeAlso: [
hasParts: [
{
id: 'https://guides.example.org/subset3',
name: '3. Name',
seeAlso: [
id: 'https://guides.example.org/subset2',
name: '2. Name',
hasParts: [
{
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
seeAlso: [
id: 'https://guides.example.org/guide4',
name: 'Military and navy',
hasParts: [
{
id: 'https://guides.example.org/guide5',
name: 'Trade',
seeAlso: [
{
id: 'https://guides.example.org/guide7',
name: 'Kunsthandel Van Lier',
},
],
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
},
],
},
{
id: 'https://guides.example.org/guide7',
name: 'Kunsthandel Van Lier',
seeAlso: [
id: 'https://guides.example.org/guide5',
name: 'Trade',
hasParts: [
{
id: 'https://guides.example.org/guide4',
name: 'Military and navy',
seeAlso: [
{
id: 'https://guides.example.org/guide1',
name: 'Doing research',
},
{
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
},
],
id: 'https://guides.example.org/guide7',
name: 'Kunsthandel Van Lier',
},
],
},
],
},
{
id: 'https://guides.example.org/subset1',
name: '1. Name',
seeAlso: [
id: 'https://guides.example.org/subset3',
name: '3. Name',
hasParts: [
{
id: 'https://guides.example.org/guide1',
name: 'Doing research',
seeAlso: [
{
id: 'https://guides.example.org/guide4',
name: 'Military and navy',
seeAlso: [
{
id: 'https://guides.example.org/guide1',
name: 'Doing research',
},
{
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
},
],
},
],
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
},
{
id: 'https://guides.example.org/guide7',
name: 'Kunsthandel Van Lier',
},
],
},
{
id: 'https://guides.example.org/subset1',
name: '1. Name',
hasParts: [
{
id: 'https://guides.example.org/guide2',
name: 'How can I use the data hub for my research?',
},
{
id: 'https://guides.example.org/guide3',
name: 'Sources',
seeAlso: [
{
id: 'https://guides.example.org/guide5',
name: 'Trade',
seeAlso: [
{
id: 'https://guides.example.org/guide7',
name: 'Kunsthandel Van Lier',
},
],
},
],
},
],
},
{
id: 'https://guides.example.org/subset2',
name: '2. Name',
seeAlso: [
{
id: 'https://guides.example.org/guide4',
name: 'Military and navy',
seeAlso: [
{
id: 'https://guides.example.org/guide1',
name: 'Doing research',
seeAlso: [
{
id: 'https://guides.example.org/guide4',
name: 'Military and navy',
},
],
},
{
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
seeAlso: [
{
id: 'https://guides.example.org/guide5',
name: 'Trade',
},
],
},
],
},
{
id: 'https://guides.example.org/guide5',
name: 'Trade',
seeAlso: [
{
id: 'https://guides.example.org/guide7',
name: 'Kunsthandel Van Lier',
seeAlso: [
{
id: 'https://guides.example.org/guide4',
name: 'Military and navy',
},
],
},
],
id: 'https://guides.example.org/guide1',
name: 'Doing research',
},
],
},
Expand Down Expand Up @@ -244,6 +166,12 @@ describe('getById', () => {
},
},
]),
hasParts: expect.arrayContaining([
{
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
},
]),
seeAlso: expect.arrayContaining([
{
id: 'https://guides.example.org/guide6',
Expand Down Expand Up @@ -301,6 +229,12 @@ describe('get with localized names', () => {
abstract:
'Army and Navy personnel who operated in colonized territories collected objects in various ways during the colonial era.',
text: 'Dutch authority in the [Dutch East Indies](https://www.geonames.org/1643084/republic-of-indonesia.html), [Suriname](https://www.geonames.org/3382998/republic-of-suriname.html) and on the [Caribbean Islands](https://www.geonames.org/8505032/netherlands-antilles.html) relied heavily on the use of the military...',
hasParts: expect.arrayContaining([
{
id: 'https://guides.example.org/guide6',
name: 'Royal Cabinet of Curiosities',
},
]),
seeAlso: expect.arrayContaining([
{
id: 'https://guides.example.org/guide6',
Expand Down Expand Up @@ -344,6 +278,12 @@ describe('get with localized names', () => {
abstract:
'Leger- en marinepersoneel dat actief was in gekoloniseerde gebieden, verzamelde op verschillende manieren objecten tijdens het koloniale tijdperk.',
text: 'Het Nederlandse gezag in [Nederlands-Indië](https://www.geonames.org/1643084/republic-of-indonesia.html), [Suriname](https://www.geonames.org/3382998/republic-of-suriname.html) en op de [Caribische eilanden](https://www.geonames.org/8505032/netherlands-antilles.html) steunde in belangrijke mate op de inzet van het leger.',
hasParts: expect.arrayContaining([
{
id: 'https://guides.example.org/guide6',
name: 'Koninklijk Kabinet van Zeldzaamheden',
},
]),
seeAlso: expect.arrayContaining([
{
id: 'https://guides.example.org/guide6',
Expand Down
44 changes: 28 additions & 16 deletions packages/api/src/research-guides/fetcher.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ export class ResearchGuideFetcher {
ex:abstract ?topSetAbstract ;
ex:text ?topSetText ;
ex:encodingFormat ?topSetEncodingFormat ;
ex:seeAlso ?subSet .
ex:hasPart ?subSet .
?subSet a ex:CreativeWork ;
ex:name ?subSetName ;
ex:seeAlso ?guide .
ex:hasPart ?level1Guide .
?guide a ex:CreativeWork ;
ex:name ?guideName ;
ex:seeAlso ?relatedGuide .
?level1Guide a ex:CreativeWork ;
ex:name ?level1GuideName ;
ex:hasPart ?level2Guide .
?relatedGuide a ex:CreativeWork ;
ex:name ?relatedGuideName .
?level2Guide a ex:CreativeWork ;
ex:name ?level2GuideName .
}
WHERE {
VALUES ?topSet {
Expand Down Expand Up @@ -111,15 +111,15 @@ export class ResearchGuideFetcher {
# Get a selection of information from member guides, if any
OPTIONAL {
?subSet la:has_member ?guide .
?guide schema:name ?guideName
FILTER(LANG(?guideName) = "${options.locale}")
?subSet la:has_member ?level1Guide .
?level1Guide schema:name ?level1GuideName
FILTER(LANG(?level1GuideName) = "${options.locale}")
# Get a selection of information from related guides, if any
# Get a selection of information from member guides, if any
OPTIONAL {
?guide rdfs:seeAlso ?relatedGuide .
?relatedGuide schema:name ?relatedGuideName
FILTER(LANG(?relatedGuideName) = "${options.locale}")
?level1Guide la:has_member ?level2Guide .
?level2Guide schema:name ?level2GuideName
FILTER(LANG(?level2GuideName) = "${options.locale}")
}
}
}
Expand All @@ -137,7 +137,7 @@ export class ResearchGuideFetcher {
WHERE {
?this a la:Set .
FILTER NOT EXISTS {
?this la:member_of []
[] la:has_member ?this
}
}
`;
Expand All @@ -163,6 +163,7 @@ export class ResearchGuideFetcher {

const query = `
PREFIX ex: <https://example.org/>
PREFIX la: <https://linked.art/ns/terms/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX schema: <https://schema.org/>
Expand All @@ -173,12 +174,16 @@ export class ResearchGuideFetcher {
ex:abstract ?abstract ;
ex:text ?text ;
ex:encodingFormat ?encodingFormat ;
ex:hasPart ?memberGuide ;
ex:seeAlso ?relatedGuide ;
ex:contentLocation ?spatial ;
ex:keyword ?keyword ;
ex:citation ?citation ;
ex:contentReferenceTime ?contentReferenceTime .
?memberGuide a ex:CreativeWork ;
ex:name ?memberGuideName .
?relatedGuide a ex:CreativeWork ;
ex:name ?relatedGuideName .
Expand Down Expand Up @@ -231,10 +236,17 @@ export class ResearchGuideFetcher {
?this schema:encodingFormat ?encodingFormat
}
# Get a selection of information from member guides, if any
OPTIONAL {
?this la:has_member ?memberGuide .
?memberGuide schema:name ?memberGuideName
FILTER(LANG(?memberGuideName) = "${options.locale}")
}
# Get a selection of information from related guides, if any
OPTIONAL {
?this rdfs:seeAlso ?relatedGuide .
?relatedGuide schema:name ?relatedGuideName .
?relatedGuide schema:name ?relatedGuideName
FILTER(LANG(?relatedGuideName) = "${options.locale}")
}
Expand Down
Loading

0 comments on commit d7a55c1

Please sign in to comment.