Simplify Query

src/Metadata/RdfStoreConnector.cs

@@ -420,44 +420,36 @@ namespace Coscine.Metadata
             return triples;
         }
 
-        public IEnumerable<Triple> GetOrganizationByExternalOrEntityId(string externalOrEntityId)
+        public IEnumerable<Triple> GetOrganizationByEntityId(string entityId)
         {
-            var _queryString = new SparqlParameterizedString()
+            var cmdString = new SparqlParameterizedString()
             {
                 CommandText = $@"
                 PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                 PREFIX org: <http://www.w3.org/ns/org#>
 
-                SELECT DISTINCT ?ror
+                SELECT DISTINCT ?ror (rdfs:label AS ?p) ?name
                 WHERE {{
                     ?ror rdfs:label ?name . 
                     {{
                         SELECT DISTINCT ?ror 
                         WHERE {{
-                            ?class ?p ?memberUrl ;
-                            org:organization ?ror .
-                            {{
-                                SELECT DISTINCT ?memberUrl 
-                                WHERE {{
-                                    ?memberUrl ?p ?value . 
-                                    FILTER( ?value IN ( '{externalOrEntityId}' ))
-                                }}
-                            }}
+                            ?ror ?p ?value . 
+                            FILTER( ?value IN ( @entityId ))
                         }}
                     }}
                 }}
             "
             };
-            using var results = QueryEndpoint.QueryWithResultSet(_queryString.ToString());
-            if (!results.IsEmpty)
-            {
-                var ror = results.Select(x => x.Value("ror").ToString());   // Get the value for ?ror
-                if (ror.Any())
+            cmdString.SetLiteral("entityId", entityId);
+
+            using var resultSet = QueryEndpoint.QueryWithResultSet(cmdString.ToString());
+            var triples = new List<Triple>();
+            foreach (SparqlResult r in resultSet)
             {
-                    return GetLabelForSubject(new Uri(ror.ToList()[0]));
+                triples.Add(new Triple(r.Value("ror"), r.Value("p"), r.Value("name")));
             }
-            }
-            return new List<Triple>();
+            return triples;
         }