diff --git a/project/dalia/query/items/facets/facet_objects.py b/project/dalia/query/items/facets/facet_objects.py
index 2db001528f6ac6158939b578673265806d4709fc..bae9b358a9c7f07a1be8b4643ebc4e58a88f342e 100644
--- a/project/dalia/query/items/facets/facet_objects.py
+++ b/project/dalia/query/items/facets/facet_objects.py
@@ -58,8 +58,8 @@ LEARNING_RESOURCE_TYPE_FACET = FacetObject(
MoDalia.BestPractices: "Best Practices",
bibo.Book: "Book",
hcrt.case_study: "Case Study",
+ MoDalia.CodeNotebook: "Code Notebook",
hcrt.diagram: "Diagram",
- MoDalia.JupyterNotebook: "Jupyter Notebook",
MoDalia.Poster: "Poster",
bibo.Report: "Report",
bibo.Webpage: "Web page",
diff --git a/project/dalia/rdf/namespace/MoDalia.py b/project/dalia/rdf/namespace/MoDalia.py
index 3d28dbb1b218e68a25395bc8110af2d1cf22ed4c..a07ef0b0921b377de1cf8cf93c6e34e446e8b79a 100644
--- a/project/dalia/rdf/namespace/MoDalia.py
+++ b/project/dalia/rdf/namespace/MoDalia.py
@@ -16,9 +16,9 @@ requiresProficiencyLevel = URIRef(NS + "requiresProficiencyLevel")
BachelorStudent = URIRef(NS + "BachelorStudent")
BestPractices = URIRef(NS + "BestPractices")
Code = URIRef(NS + "Code")
+CodeNotebook = URIRef(NS + "CodeNotebook")
Community = URIRef(NS + "Community")
DataSteward = URIRef(NS + "DataSteward")
-JupyterNotebook = URIRef(NS + "JupyterNotebook")
LearningResourceType = URIRef(NS + "LearningResourceType")
MastersStudent = URIRef(NS + "MastersStudent")
MediaType = URIRef(NS + "MediaType")
diff --git a/tests/project/dalia/query/communities/test_community_items.py b/tests/project/dalia/query/communities/test_community_items.py
index 24a68c8761727868e69d62a56ead47acb29d0abd..d4dc88c4b88d4737c534fa1c8a7610a64b876099 100644
--- a/tests/project/dalia/query/communities/test_community_items.py
+++ b/tests/project/dalia/query/communities/test_community_items.py
@@ -35,7 +35,7 @@ def test_get_on_CommunityItemsView_returns_200_and_items_for_existing_community_
assert serializer.is_valid()
assert serializer.validated_data == [
Resource(
- type='Conference paper',
+ type=None,
format='PDF',
license=License(
id='CC-BY-4.0',
@@ -103,7 +103,7 @@ def test_get_on_CommunityItemsView_returns_200_and_items_for_existing_community_
tags=['NFDI', 'AIRR', 'Immunology']
),
Resource(
- type='Conference paper',
+ type=None,
format='PDF',
license=License(
id='CC-BY-4.0',
diff --git a/tests/project/dalia/query/items/basic_search_filters/test_basic_search_filters.py b/tests/project/dalia/query/items/basic_search_filters/test_basic_search_filters.py
index 827089a6b43ef8301fb69375216389e7f1f48b02..92639c5bbfd43bdbaa4f8692392b12967936e860 100644
--- a/tests/project/dalia/query/items/basic_search_filters/test_basic_search_filters.py
+++ b/tests/project/dalia/query/items/basic_search_filters/test_basic_search_filters.py
@@ -120,12 +120,12 @@ def test_get_on_BasicSearchFiltersView_returns_200_and_all_available_filters(tri
value=str(hcrt.case_study)
),
BasicSearchFilterValue(
- label='Diagram',
- value=str(hcrt.diagram)
+ label='Code Notebook',
+ value=str(MoDalia.CodeNotebook)
),
BasicSearchFilterValue(
- label='Jupyter Notebook',
- value=str(MoDalia.JupyterNotebook)
+ label='Diagram',
+ value=str(hcrt.diagram)
),
BasicSearchFilterValue(
label='Poster',
diff --git a/tests/project/dalia/query/items/metadata/test_items.py b/tests/project/dalia/query/items/metadata/test_items.py
index 9c3267735784cc9fd9d4bf26e90ad3535aeaafd1..41a7e4f97a4dced87d455e848432e1e3467edfa0 100644
--- a/tests/project/dalia/query/items/metadata/test_items.py
+++ b/tests/project/dalia/query/items/metadata/test_items.py
@@ -19,7 +19,7 @@ from project.dalia.serializers import ItemSerializer
(
"1ec1db44-5330-47c5-aae3-6852b11f43a4",
Resource(
- type='Video',
+ type=None,
format=None,
license=License(
id='CC-BY-3.0',
@@ -66,7 +66,7 @@ from project.dalia.serializers import ItemSerializer
(
"016ef2f6-a10d-4421-ad0e-9515cc488391",
Resource(
- type='Presentation',
+ type=None,
format='PDF',
license=License(
id='CC-BY-4.0',
diff --git a/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py b/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py
index 5a2bd62ab0c237431940a712a7d5097bcad966a0..68597197c72bf7b70c42530cb7d49140101cbf89 100644
--- a/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py
+++ b/tests/project/dalia/query/items/metadata/test_one_to_one_metadata.py
@@ -100,7 +100,7 @@ def test_get_one_to_one_metadata_for_resources(triplestore):
assert resources == {
URIRef('https://id.dalia.education/learning-resource/00855e6b-ebc6-422b-a2d5-7caa58569a9b'): Resource(
- type='free self-paced course',
+ type=None,
format=None,
license=License(
id='CC-BY-4.0',
@@ -131,7 +131,7 @@ def test_get_one_to_one_metadata_for_resources(triplestore):
tags=None
),
URIRef('https://id.dalia.education/learning-resource/a195da8d-b19e-4934-9511-9369e60ccaa1'): Resource(
- type='Project milestone',
+ type=None,
format=None,
license=License(
id='CC-BY-4.0',
diff --git a/tests/project/dalia/query/items/search/test_ItemSearchView.py b/tests/project/dalia/query/items/search/test_ItemSearchView.py
index 60963aab4e6ff26a398a98fe4560933a104cb2ac..d49a21e0cc1429fa59d2083cb841ab13dbf4c978 100644
--- a/tests/project/dalia/query/items/search/test_ItemSearchView.py
+++ b/tests/project/dalia/query/items/search/test_ItemSearchView.py
@@ -106,13 +106,13 @@ _ALL_FACETS_WITH_INACTIVE_STATE = [
active=False,
),
FacetItem(
- label='Diagram',
- value=str(hcrt.diagram),
+ label='Code Notebook',
+ value=str(MoDalia.CodeNotebook),
active=False,
),
FacetItem(
- label='Jupyter Notebook',
- value=str(MoDalia.JupyterNotebook),
+ label='Diagram',
+ value=str(hcrt.diagram),
active=False,
),
FacetItem(
diff --git a/tests/project/dalia/query/items/search/test_text_search.py b/tests/project/dalia/query/items/search/test_text_search.py
index 84df0ade9c5ffc30c743ab8d4929ff8a0939753c..6482c967b3d497eecb50352aa599c9e98bb0b829 100644
--- a/tests/project/dalia/query/items/search/test_text_search.py
+++ b/tests/project/dalia/query/items/search/test_text_search.py
@@ -111,7 +111,7 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_relevance
active_facets={
TARGET_AUDIENCE_FACET: [MoDalia.MastersStudent, MoDalia.PhDStudent],
MEDIA_TYPE_FACET: [SCHEMA.VideoObject, hcrt.slide],
- LEARNING_RESOURCE_TYPE_FACET: [MoDalia.JupyterNotebook],
+ LEARNING_RESOURCE_TYPE_FACET: [MoDalia.CodeNotebook],
},
limit=100,
offset=0,
@@ -149,7 +149,7 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_relevance
?lr <https://purl.org/ontology/modalia#hasTargetGroup> <https://purl.org/ontology/modalia#PhDStudent> .
?lr <https://purl.org/ontology/modalia#hasMediaType> <https://schema.org/VideoObject> .
?lr <https://purl.org/ontology/modalia#hasMediaType> <https://w3id.org/kim/hcrt/slide> .
- ?lr <https://purl.org/ontology/modalia#hasLearningType> <https://purl.org/ontology/modalia#JupyterNotebook> .
+ ?lr <https://purl.org/ontology/modalia#hasLearningType> <https://purl.org/ontology/modalia#CodeNotebook> .
} .
}
ORDER BY DESC ( ?score )