Skip to content

Commit 97b7d00

Browse files
benjaminaaronbenjaminaaron
committed
Switch to def.built.ttl
1 parent 2de0b12 commit 97b7d00

3 files changed

Lines changed: 29 additions & 30 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
99
"@emotion/react": "^11.11.4",
1010
"@emotion/styled": "^11.11.5",
11-
"@foerderfunke/matching-engine": "^1.3.5",
11+
"@foerderfunke/matching-engine": "^1.4.0",
1212
"@mui/icons-material": "^5.15.19",
1313
"@mui/material": "^5.15.19",
1414
"@mui/x-charts": "^7.6.2",

‎public/assets/data/requirement-profiles/requirement-profiles.json‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"definitions": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/definitions.ttl",
55
"materialization": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/materialization.ttl",
66
"consistency": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/consistency.ttl",
7+
"def": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/build/def.built.ttl",
78
"queries": [
89
{
910
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/01-hilfe-zum-lebensunterhalt.ttl",
@@ -46,98 +47,94 @@
4647
"rpUri": "https://foerderfunke.org/default#bildung-und-teilhabe-bei-bezug-von-buergergeld"
4748
},
4849
{
49-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/exist-gruendungsstipendium.ttl",
50+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/exist-gruendungsstipendium.ttl",
5051
"rpUri": "https://foerderfunke.org/default#exist-gruendungsstipendium"
5152
},
5253
{
53-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/ibb-gruendungsbonus.ttl",
54+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/ibb-gruendungsbonus.ttl",
5455
"rpUri": "https://foerderfunke.org/default#ibb-gruendungsbonus"
5556
},
5657
{
57-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/ibb-altersgerecht-wohnen.ttl",
58+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/ibb-altersgerecht-wohnen.ttl",
5859
"rpUri": "https://foerderfunke.org/default#ibb-altersgerecht-wohnen"
5960
},
6061
{
61-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/ifb-gruendung-nachfolge.ttl",
62+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/ifb-gruendung-nachfolge.ttl",
6263
"rpUri": "https://foerderfunke.org/default#ifb-gruendung-nachfolge"
6364
},
6465
{
65-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/ifb-inno-founder.ttl",
66-
"rpUri": "https://foerderfunke.org/default#ifb-inno-founder"
67-
},
68-
{
69-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/ilb-kredit-gruendung.ttl",
66+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/ilb-kredit-gruendung.ttl",
7067
"rpUri": "https://foerderfunke.org/default#ilb-kredit-gruendung"
7168
},
7269
{
73-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/forschungszulage.ttl",
70+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/forschungszulage.ttl",
7471
"rpUri": "https://foerderfunke.org/default#forschungszulage"
7572
},
7673
{
77-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/bundesfoerderung-effiziente-gebaeude.ttl",
74+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/bundesfoerderung-effiziente-gebaeude.ttl",
7875
"rpUri": "https://foerderfunke.org/default#bundesfoerderung-effiziente-gebaeude"
7976
},
8077
{
81-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/wolfenbuettel-stiftung.ttl",
78+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/wolfenbuettel-stiftung.ttl",
8279
"rpUri": "https://foerderfunke.org/default#wolfenbuettel-stiftung"
8380
},
8481
{
85-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/ausbildungsgeld.ttl",
82+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/ausbildungsgeld.ttl",
8683
"rpUri": "https://foerderfunke.org/default#ausbildungsgeld"
8784
},
8885
{
89-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/wolfenbuettel-gastronomische-aussenmoeblierung.ttl",
86+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/wolfenbuettel-gastronomische-aussenmoeblierung.ttl",
9087
"rpUri": "https://foerderfunke.org/default#wolfenbuettel-gastronomische-aussenmoeblierung"
9188
},
9289
{
93-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/wolfenbuettel-ansiedlung.ttl",
90+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/wolfenbuettel-ansiedlung.ttl",
9491
"rpUri": "https://foerderfunke.org/default#wolfenbuettel-ansiedlung"
9592
},
9693
{
97-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/uebergangsgeld.ttl",
94+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/uebergangsgeld.ttl",
9895
"rpUri": "https://foerderfunke.org/default#uebergangsgeld"
9996
},
10097
{
101-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/kurzzeitige-arbeitsverhinderung.ttl",
98+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/kurzzeitige-arbeitsverhinderung.ttl",
10299
"rpUri": "https://foerderfunke.org/default#kurzzeitige-arbeitsverhinderung"
103100
},
104101
{
105-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/beta/03-kinderzuschlag-v2.ttl",
102+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/beta/03-kinderzuschlag-v2.ttl",
106103
"rpUri": "https://foerderfunke.org/default#kinderzuschlag-v2",
107104
"behindFeatureFlag": "subindividuals"
108105
},
109106
{
110-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/schwerbehindertenausweis.ttl",
107+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/schwerbehindertenausweis.ttl",
111108
"rpUri": "https://foerderfunke.org/default#schwerbehindertenausweis",
112109
"behindFeatureFlag": "bielefunke"
113110
},
114111
{
115-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/erwerbsminderungsrente-voll.ttl",
112+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/erwerbsminderungsrente-voll.ttl",
116113
"rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-voll",
117114
"behindFeatureFlag": "bielefunke"
118115
},
119116
{
120-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/erwerbsminderungsrente-teilweise.ttl",
117+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/erwerbsminderungsrente-teilweise.ttl",
121118
"rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-teilweise",
122119
"behindFeatureFlag": "bielefunke"
123120
},
124121
{
125-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/substitutionstherapie-regulaer.ttl",
122+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/substitutionstherapie-regulaer.ttl",
126123
"rpUri": "https://foerderfunke.org/default#substitutionstherapie-regulaer",
127124
"behindFeatureFlag": "bielefunke"
128125
},
129126
{
130-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/substitutionstherapie-diamorphin.ttl",
127+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/substitutionstherapie-diamorphin.ttl",
131128
"rpUri": "https://foerderfunke.org/default#substitutionstherapie-diamorphin",
132129
"behindFeatureFlag": "bielefunke"
133130
},
134131
{
135-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/arbeitsassistenz.ttl",
132+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/arbeitsassistenz.ttl",
136133
"rpUri": "https://foerderfunke.org/default#arbeitsassistenz",
137134
"behindFeatureFlag": "bielefunke"
138135
},
139136
{
140-
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/allgemeine-krankenversicherungspflicht.ttl",
137+
"fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/shacl/bielefeld/allgemeine-krankenversicherungspflicht.ttl",
141138
"rpUri": "https://foerderfunke.org/default#allgemeine-krankenversicherungspflicht",
142139
"behindFeatureFlag": "bielefunke"
143140
}

‎src/core/managers/matchingEngineManager.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,20 @@ const matchingEngineManager = {
2020
"assets/data/requirement-profiles/requirement-profiles.json"
2121
);
2222

23-
const datafieldsString = await resourceService.fetchResourceWithCache(validationConfig["datafields"]);
23+
/*const datafieldsString = await resourceService.fetchResourceWithCache(validationConfig["datafields"]);
2424
const datafieldsBielefeldString = await resourceService.fetchResourceWithCache(validationConfig["datafields-bielefeld"]);
2525
const definitionsString = await resourceService.fetchResourceWithCache(validationConfig["definitions"]);
2626
const materializationString = await resourceService.fetchResourceWithCache(validationConfig["materialization"]);
27-
const consistencyString = await resourceService.fetchResourceWithCache(validationConfig["consistency"]);
27+
const consistencyString = await resourceService.fetchResourceWithCache(validationConfig["consistency"]);*/
28+
const defString = await resourceService.fetchResourceWithCache(validationConfig["def"]);
2829

2930
const engine = new MatchingEngine();
30-
engine.addDatafieldsTurtle(datafieldsString)
31+
/*engine.addDatafieldsTurtle(datafieldsString)
3132
engine.addDatafieldsTurtle(datafieldsBielefeldString)
3233
engine.addDefinitionsTurtle(definitionsString);
3334
engine.addMaterializationTurtle(materializationString);
34-
engine.addConsistencyTurtle(consistencyString);
35+
engine.addConsistencyTurtle(consistencyString);*/
36+
engine.addDef(defString)
3537

3638
for (const { fileUrl, behindFeatureFlag } of validationConfig["queries"]) {
3739
if (behindFeatureFlag && !featureFlags[behindFeatureFlag]) continue;

0 commit comments

Comments
 (0)