use unordered authors set in text search instead of iterating over the linked...

use unordered authors set in text search instead of iterating over the linked list (RDF collection) of authors

project/dalia/query/items/search/text_search_query.py

@@ -2,18 +2,17 @@ from typing import Dict, List
 
 from rdflib import BNode, Graph, Literal, RDF, Variable
 from rdflib.collection import Collection
-from rdflib.term import Node
+from rdflib.term import Node, URIRef
 
 from project.dalia.query.items.facets.facet_objects import FacetObject
 from project.dalia.query_builder.query_builder import (
     BIND,
     FILTER,
     FILTER_EXISTS,
-    FunctionExpressions,
     OPTIONAL,
     Operators,
 )
-from project.dalia.rdf.namespace import Dalia_text, Jena_ARQ_list, Jena_text, MoDalia, SCHEMA, educor
+from project.dalia.rdf.namespace import Dalia_text, Jena_text, MoDalia, SCHEMA, educor
 
 
 def prepare_where_for_text_search_for_learning_resources(
@@ -25,7 +24,6 @@ def prepare_where_for_text_search_for_learning_resources(
 ):
     var_s = Variable("s")
     var_type = Variable("type")
-    var_list = Variable("list")
 
     left_list = Collection(Graph(), BNode(), [var_s, var_score])
     right_list = Collection(Graph(), BNode(), [Dalia_text.learningResourceTexts, Literal(query)])
@@ -40,8 +38,7 @@ def prepare_where_for_text_search_for_learning_resources(
                     Operators.EQ(var_type, SCHEMA.Organization),
                 )
             ),
-            (var_list, Jena_ARQ_list.member, var_s),
-            (var_lr, SCHEMA.author, var_list),
+            (var_lr, URIRef("https://dalia.education/authorUnordered"), var_s),
             OPTIONAL(
                 (var_lr, SCHEMA.datePublished, var_created)
             )

tests/project/dalia/query/items/search/test_count.py

@@ -27,8 +27,7 @@ def test_prepare_query_for_count_in_text_search():
         OPTIONAL { 
         ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . 
         FILTER ( ?type = <https://schema.org/Person> || ?type = <https://schema.org/Organization> ) . 
-        ?list <http://jena.apache.org/ARQ/list#member> ?s . 
-        ?lr <https://schema.org/author> ?list . 
+        ?lr <https://dalia.education/authorUnordered> ?s . 
         OPTIONAL { 
         ?lr <https://schema.org/datePublished> ?created .
         } .
@@ -60,8 +59,7 @@ def test_prepare_query_for_count_in_text_search_with_target_audience_facet():
         OPTIONAL { 
         ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . 
         FILTER ( ?type = <https://schema.org/Person> || ?type = <https://schema.org/Organization> ) . 
-        ?list <http://jena.apache.org/ARQ/list#member> ?s . 
-        ?lr <https://schema.org/author> ?list . 
+        ?lr <https://dalia.education/authorUnordered> ?s . 
         OPTIONAL { 
         ?lr <https://schema.org/datePublished> ?created .
         } .

tests/project/dalia/query/items/search/test_text_search.py

@@ -35,8 +35,7 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_relevance
         OPTIONAL { 
         ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . 
         FILTER ( ?type = <https://schema.org/Person> || ?type = <https://schema.org/Organization> ) . 
-        ?list <http://jena.apache.org/ARQ/list#member> ?s . 
-        ?lr <https://schema.org/author> ?list . 
+        ?lr <https://dalia.education/authorUnordered> ?s . 
         OPTIONAL { 
         ?lr <https://schema.org/datePublished> ?created .
         } .
@@ -75,8 +74,7 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_created_d
         OPTIONAL { 
         ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . 
         FILTER ( ?type = <https://schema.org/Person> || ?type = <https://schema.org/Organization> ) . 
-        ?list <http://jena.apache.org/ARQ/list#member> ?s . 
-        ?lr <https://schema.org/author> ?list . 
+        ?lr <https://dalia.education/authorUnordered> ?s . 
         OPTIONAL { 
         ?lr <https://schema.org/datePublished> ?created .
         } .
@@ -122,8 +120,7 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_relevance
         OPTIONAL { 
         ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . 
         FILTER ( ?type = <https://schema.org/Person> || ?type = <https://schema.org/Organization> ) . 
-        ?list <http://jena.apache.org/ARQ/list#member> ?s . 
-        ?lr <https://schema.org/author> ?list . 
+        ?lr <https://dalia.education/authorUnordered> ?s . 
         OPTIONAL { 
         ?lr <https://schema.org/datePublished> ?created .
         } .
@@ -168,8 +165,7 @@ def test_prepare_query_for_text_search_for_learning_resources_order_by_created_a
         OPTIONAL { 
         ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . 
         FILTER ( ?type = <https://schema.org/Person> || ?type = <https://schema.org/Organization> ) . 
-        ?list <http://jena.apache.org/ARQ/list#member> ?s . 
-        ?lr <https://schema.org/author> ?list . 
+        ?lr <https://dalia.education/authorUnordered> ?s . 
         OPTIONAL { 
         ?lr <https://schema.org/datePublished> ?created .
         } .