Merge pull request #1529 from NatLibFi/issue1513-deprecated-changes-fix

Show deprecated concepts without replacement in change list
NatLibFi · Sep 28, 2023 · dc900c3 · dc900c3
2 parents 99448fc + caf4c18
commit dc900c3
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 13 deletions.
diff --git a/model/sparql/GenericSparql.php b/model/sparql/GenericSparql.php
@@ -2262,13 +2262,20 @@ private function generateChangeListQuery($prop, $lang, $offset, $limit=200, $sho
         $deprecatedVars = '';
         if ($showDeprecated) {
             $deprecatedVars = '?replacedBy ?deprecated ?replacingLabel';
-            $deprecatedOptions =
-            'UNION {'.
-                '?concept dc:isReplacedBy ?replacedBy ; dc:modified ?date2 .'.
-                'BIND(COALESCE(?date2, ?date) AS ?date)'.
-                'OPTIONAL { ?replacedBy skos:prefLabel ?replacingLabel .'.
-                    'FILTER (langMatches(lang(?replacingLabel), \''.$lang.'\')) }}'.
-                'OPTIONAL { ?concept owl:deprecated ?deprecated . }';
+            $deprecatedOptions = <<<EOQ
+UNION {
+    ?concept owl:deprecated True; dc:modified ?date2 .
+    BIND(True as ?deprecated)
+    BIND(COALESCE(?date2, ?date) AS ?date)
+    OPTIONAL {
+        ?concept dc:isReplacedBy ?replacedBy .
+        OPTIONAL {
+            ?replacedBy skos:prefLabel ?replacingLabel .
+            FILTER (langMatches(lang(?replacingLabel), '$lang'))
+        }
+    }
+}
+EOQ;
         }
 
         $query = <<<EOQ
@@ -2312,6 +2319,11 @@ private function transformChangeListResults($result) {
                 }
             }
 
+            if (isset($row->deprecated)) {
+                $concept['deprecated'] = $row->deprecated->getValue();
+            } else {
+                $concept['deprecated'] = false;
+            }
             if (isset($row->replacedBy)) {
                 $concept['replacedBy'] = $row->replacedBy->getURI();
             }

diff --git a/tests/GenericSparqlTest.php b/tests/GenericSparqlTest.php
@@ -1151,8 +1151,13 @@ public function testQueryCreatedListWithDeprecated()
     foreach($actual as $concept) {
         array_push($order, $concept['prefLabel']);
     }
-    $this->assertEquals(4, sizeof($actual));
-    $this->assertEquals(array('Fourth date', 'Hurr Durr', 'Second date', 'A date'), $order);
+    $this->assertEquals(5, sizeof($actual));
+    $this->assertEquals(array('No replacement', 'Fourth date', 'Hurr Durr', 'Second date', 'A date'), $order);
+
+    // check that deprecated status is correct
+    $this->assertTrue($actual[0]['deprecated']);  // 'No replacement'
+    $this->assertTrue($actual[1]['deprecated']);  // 'Fourth date'
+    $this->assertFalse($actual[2]['deprecated']); // 'Hurr Durr'
   }
 
 

diff --git a/tests/RestControllerTest.php b/tests/RestControllerTest.php
@@ -780,6 +780,11 @@ public function testNewConcepts() {
      },
     "changeList": [
               { 
+                  "uri": "http://www.skosmos.skos/changes/d5",
+                  "prefLabel": "No replacement",
+                  "date": "2021-02-04T12:46:33+0000"
+              },
+              {
                   "uri": "http://www.skosmos.skos/changes/d4",
                   "prefLabel": "Fourth date",
                   "date": "2021-01-03T12:46:33+0000",
@@ -867,6 +872,7 @@ public function testDeprecatedChanges() {
         "date": { "@id":"http://purl.org/dc/terms/date","@type":"http://www.w3.org/2001/XMLSchema#dateTime" }
     },
     "changeList": [
+      { "date": "2021-02-04T12:46:33+0000", "prefLabel": "No replacement", "uri": "http://www.skosmos.skos/changes/d5" },
       { "date": "2021-01-03T12:46:30+0000", "prefLabel": "A date", "uri": "http://www.skosmos.skos/changes/d1" },
       { "date": "2021-01-03T12:46:33+0000", "prefLabel": "Fourth date", "replacedBy": "http://www.skosmos.skos/changes/d3", "replacingLabel": "Hurr Durr", "uri": "http://www.skosmos.skos/changes/d4" },
       { "date": "2021-01-03T12:46:32+0000", "prefLabel": "Hurr Durr", "uri": "http://www.skosmos.skos/changes/d3" },

diff --git a/tests/VocabularyTest.php b/tests/VocabularyTest.php
@@ -438,8 +438,8 @@ public function testGetTopConcepts() {
   public function testGetChangeList() {
     $vocab = $this->model->getVocabulary('changes');
     $changeList = $vocab->getChangeList('dc:created','en', 0, 5);
-    $expected = array ('uri' => 'http://www.skosmos.skos/changes/d3', 'prefLabel' => 'Hurr Durr', 'date' => DateTime::__set_state(array('date' => '2010-02-12 10:26:39.000000', 'timezone_type' => 3, 'timezone' => 'UTC')));
-    $this->assertEquals($expected, $changeList[1]);
+    $expected = array ('uri' => 'http://www.skosmos.skos/changes/d3', 'prefLabel' => 'Hurr Durr', 'date' => DateTime::__set_state(array('date' => '2010-02-12 10:26:39.000000', 'timezone_type' => 3, 'timezone' => 'UTC')), 'deprecated' => false);
+    $this->assertEquals($expected, $changeList[2]);
   }
 
   /**

diff --git a/tests/WebControllerTest.php b/tests/WebControllerTest.php
@@ -223,7 +223,7 @@ public function testFormatChangeList() {
         $changeList = $this->webController->getChangeList($request, 'dc:created');
         $months =$this->webController->formatChangeList($changeList, 'en');
 
-        $expected = array ('hurr durr' => array ('uri' => 'http://www.skosmos.skos/changes/d3', 'prefLabel' => 'Hurr Durr', 'date' => DateTime::__set_state(array('date' => '2010-02-12 10:26:39.000000', 'timezone_type' => 3, 'timezone' => 'UTC')), 'datestring' => 'Feb 12, 2010'), 'second date' => array ('uri' => 'http://www.skosmos.skos/changes/d2', 'prefLabel' => 'Second date', 'date' => DateTime::__set_state(array('date' => '2010-02-12 15:26:39.000000', 'timezone_type' => 3, 'timezone' => 'UTC')), 'datestring' => 'Feb 12, 2010'));
+        $expected = array ('hurr durr' => array ('uri' => 'http://www.skosmos.skos/changes/d3', 'prefLabel' => 'Hurr Durr', 'date' => DateTime::__set_state(array('date' => '2010-02-12 10:26:39.000000', 'timezone_type' => 3, 'timezone' => 'UTC')), 'datestring' => 'Feb 12, 2010', 'deprecated' => false), 'second date' => array ('uri' => 'http://www.skosmos.skos/changes/d2', 'prefLabel' => 'Second date', 'date' => DateTime::__set_state(array('date' => '2010-02-12 15:26:39.000000', 'timezone_type' => 3, 'timezone' => 'UTC')), 'datestring' => 'Feb 12, 2010', 'deprecated' => false));
         $this->assertEquals($expected, $months['February 2010']);
     }
 

diff --git a/tests/test-vocab-data/changes.ttl b/tests/test-vocab-data/changes.ttl
@@ -30,3 +30,9 @@ changes:d4 a skos:Concept ;
     dc:created "2011-12-12T09:26:39"^^xsd:dateTime ;
     dc:modified "2021-01-03T12:46:33"^^xsd:dateTime ;
     skos:prefLabel "Fourth date"@en .
+
+changes:d5 a skos:Concept ;
+    owl:deprecated true ;
+    dc:created "2012-12-12T09:26:39"^^xsd:dateTime ;
+    dc:modified "2021-02-04T12:46:33"^^xsd:dateTime ;
+    skos:prefLabel "No replacement"@en .
diff --git a/view/changes.twig b/view/changes.twig
@@ -42,7 +42,7 @@
         <h5 class="versal versal-bold">{{day}}</h5>
         {% for concept in concepts %}
           <li><a href="{{ concept.uri | link_url(vocab,request.lang,'page', request.contentLang) }}">
-            {% if concept.replacedBy is defined %}
+            {% if concept.deprecated %}
               <s>{{ concept.prefLabel }}</s>
               {% else %}
               {{ concept.prefLabel }}