III-2160: Index mainLanguage on Event and Place documents

cultuurnet · Jun 6, 2017 · ef0febc · ef0febc
1 parent 32ec996
commit ef0febc
Show file tree

Hide file tree

Showing 51 changed files with 63 additions and 0 deletions.
diff --git a/src/Event/EventJsonDocumentTransformer.php b/src/Event/EventJsonDocumentTransformer.php
@@ -35,6 +35,7 @@ public function transform(JsonDocument $jsonDocument)
         $this->copyName($body, $newBody);
         $this->copyDescription($body, $newBody);
 
+        $this->copyMainLanguage($body, $newBody);
         $this->copyLanguages($body, $newBody);
 
         $this->copyTerms($body, $newBody);

diff --git a/src/Offer/AbstractOfferJsonDocumentTransformer.php b/src/Offer/AbstractOfferJsonDocumentTransformer.php
@@ -434,6 +434,19 @@ protected function copyDescription(\stdClass $from, \stdClass $to)
         }
     }
 
+    /**
+     * @param \stdClass $from
+     * @param \stdClass $to
+     */
+    protected function copyMainLanguage(\stdClass $from, \stdClass $to)
+    {
+        if (isset($from->mainLanguage)) {
+            $to->mainLanguage = $from->mainLanguage;
+        } else {
+            $this->logMissingExpectedField('mainLanguage');
+        }
+    }
+
     /**
      * @param \stdClass $from
      * @param \stdClass $to

diff --git a/src/Place/PlaceJsonDocumentTransformer.php b/src/Place/PlaceJsonDocumentTransformer.php
@@ -35,6 +35,7 @@ public function transform(JsonDocument $jsonDocument)
         $this->copyName($body, $newBody);
         $this->copyDescription($body, $newBody);
 
+        $this->copyMainLanguage($body, $newBody);
         $this->copyLanguages($body, $newBody);
 
         $this->copyLabels($body, $newBody);

diff --git a/tests/Event/EventJsonDocumentTransformerTest.php b/tests/Event/EventJsonDocumentTransformerTest.php
@@ -77,6 +77,7 @@ public function it_logs_missing_required_fields()
             ['warning', "Missing expected field 'workflowStatus'.", []],
             ['warning', "Missing expected field 'availableTo'.", []],
             ['warning', "Missing expected field 'name.nl'.", []],
+            ['warning', "Missing expected field 'mainLanguage'.", []],
             ['warning', "Missing expected field 'location'.", []],
             ['warning', "Missing expected field 'created'.", []],
             ['warning', "Missing expected field 'creator'.", []],

diff --git a/tests/Event/data/indexed-modified.json b/tests/Event/data/indexed-modified.json
@@ -13,6 +13,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-periodic-with-opening-hours.json b/tests/Event/data/indexed-periodic-with-opening-hours.json
@@ -1150,6 +1150,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-periodic-without-date-range.json b/tests/Event/data/indexed-periodic-without-date-range.json
@@ -8,6 +8,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-periodic.json b/tests/Event/data/indexed-periodic.json
@@ -14,6 +14,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-permanent-with-opening-hours.json b/tests/Event/data/indexed-permanent-with-opening-hours.json
@@ -4066,6 +4066,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-permanent.json b/tests/Event/data/indexed-permanent.json
@@ -11,6 +11,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-with-multiple-dates-without-date-range.json b/tests/Event/data/indexed-with-multiple-dates-without-date-range.json
@@ -8,6 +8,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-with-multiple-dates.json b/tests/Event/data/indexed-with-multiple-dates.json
@@ -22,6 +22,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-with-optional-fields.json b/tests/Event/data/indexed-with-optional-fields.json
@@ -20,6 +20,7 @@
         "en": "Some English description",
         "de": "Some German description"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl",
         "fr",

diff --git a/tests/Event/data/indexed-with-regions.json b/tests/Event/data/indexed-with-regions.json
@@ -20,6 +20,7 @@
         "en": "Some English description",
         "de": "Some German description"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl",
         "fr",

diff --git a/tests/Event/data/indexed-with-wrong-calendar-type.json b/tests/Event/data/indexed-with-wrong-calendar-type.json
@@ -8,6 +8,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-without-available-to.json b/tests/Event/data/indexed-without-available-to.json
@@ -13,6 +13,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed-without-date-range.json b/tests/Event/data/indexed-without-date-range.json
@@ -8,6 +8,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/indexed.json b/tests/Event/data/indexed.json
@@ -14,6 +14,7 @@
     "name": {
         "nl": "Punkfest"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Event/data/original-modified.json b/tests/Event/data/original-modified.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-periodic-with-opening-hours.json b/tests/Event/data/original-periodic-with-opening-hours.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-periodic-with-wrong-opening-hours.json b/tests/Event/data/original-periodic-with-wrong-opening-hours.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-periodic.json b/tests/Event/data/original-periodic.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-permanent-with-opening-hours.json b/tests/Event/data/original-permanent-with-opening-hours.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-permanent.json b/tests/Event/data/original-permanent.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-with-multiple-dates-and-wrong-sub-events.json b/tests/Event/data/original-with-multiple-dates-and-wrong-sub-events.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-with-multiple-dates.json b/tests/Event/data/original-with-multiple-dates.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-with-optional-fields.json b/tests/Event/data/original-with-optional-fields.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "availableFrom": "2017-04-25T00:00:00+00:00",
     "availableTo": "2017-05-01T23:59:59+00:00",
     "name": {

diff --git a/tests/Event/data/original-with-wrong-available-from.json b/tests/Event/data/original-with-wrong-available-from.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "availableFrom": "2017-04-25T00:00:00",
     "availableTo": "2017-04-22T18:00:00+02:00",
     "name": {

diff --git a/tests/Event/data/original-with-wrong-available-to.json b/tests/Event/data/original-with-wrong-available-to.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "availableFrom": "2017-04-25T00:00:00+00:00",
     "availableTo": "2017-04-25T00:00:00",
     "name": {

diff --git a/tests/Event/data/original-with-wrong-calendar-type.json b/tests/Event/data/original-with-wrong-calendar-type.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-with-wrong-typical-age-range.json b/tests/Event/data/original-with-wrong-typical-age-range.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-without-end-date.json b/tests/Event/data/original-without-end-date.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original-without-start-date.json b/tests/Event/data/original-without-start-date.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Event/data/original.json b/tests/Event/data/original.json
@@ -1,5 +1,6 @@
 {
     "@id": "http:\/\/udb-silex.dev\/event\/23017cb7-e515-47b4-87c4-780735acc942",
+    "mainLanguage": "nl",
     "name": {
         "nl": "Punkfest"
     },

diff --git a/tests/Place/PlaceJsonDocumentTransformerTest.php b/tests/Place/PlaceJsonDocumentTransformerTest.php
@@ -77,6 +77,7 @@ public function it_logs_missing_required_fields()
             ['warning', "Missing expected field 'workflowStatus'.", []],
             ['warning', "Missing expected field 'availableTo'.", []],
             ['warning', "Missing expected field 'name.nl'.", []],
+            ['warning', "Missing expected field 'mainLanguage'.", []],
             ['warning', "Missing expected field 'address.addressCountry'.", []],
             ['warning', "Missing expected field 'address.addressLocality'.", []],
             ['warning', "Missing expected field 'address.postalCode'.", []],

diff --git a/tests/Place/data/indexed-modified.json b/tests/Place/data/indexed-modified.json
@@ -10,6 +10,7 @@
     "name": {
         "nl": "Hungaria"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Place/data/indexed-with-opening-hours.json b/tests/Place/data/indexed-with-opening-hours.json
@@ -945,6 +945,7 @@
     "name": {
         "nl": "Hungaria"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Place/data/indexed-with-optional-fields.json b/tests/Place/data/indexed-with-optional-fields.json
@@ -24,6 +24,7 @@
         "en": "English description",
         "de": "German description"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl",
         "fr",

diff --git a/tests/Place/data/indexed-with-period-and-opening-hours.json b/tests/Place/data/indexed-with-period-and-opening-hours.json
@@ -37,6 +37,7 @@
     "name": {
         "nl": "Hungaria"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Place/data/indexed-with-period.json b/tests/Place/data/indexed-with-period.json
@@ -13,6 +13,7 @@
     "name": {
         "nl": "Hungaria"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Place/data/indexed-with-regions.json b/tests/Place/data/indexed-with-regions.json
@@ -24,6 +24,7 @@
         "en": "English description",
         "de": "German description"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl",
         "fr",

diff --git a/tests/Place/data/indexed-without-available-to.json b/tests/Place/data/indexed-without-available-to.json
@@ -10,6 +10,7 @@
     "name": {
         "nl": "Hungaria"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Place/data/indexed.json b/tests/Place/data/indexed.json
@@ -11,6 +11,7 @@
     "name": {
         "nl": "Hungaria"
     },
+    "mainLanguage": "nl",
     "languages": [
         "nl"
     ],

diff --git a/tests/Place/data/original-modified.json b/tests/Place/data/original-modified.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "calendarType": "permanent",
     "name": {
         "nl": "Hungaria"

diff --git a/tests/Place/data/original-with-opening-hours.json b/tests/Place/data/original-with-opening-hours.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "calendarType": "permanent",
     "openingHours": [
         {

diff --git a/tests/Place/data/original-with-optional-fields.json b/tests/Place/data/original-with-optional-fields.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "availableFrom": "2017-04-25T00:00:00+00:00",
     "availableTo": "2017-05-01T23:59:59+00:00",
     "calendarType": "permanent",

diff --git a/tests/Place/data/original-with-period-and-opening-hours.json b/tests/Place/data/original-with-period-and-opening-hours.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "calendarType": "periodic",
     "startDate": "2017-04-22T10:00:00+02:00",
     "endDate": "2017-05-09T23:00:00+02:00",

diff --git a/tests/Place/data/original-with-period.json b/tests/Place/data/original-with-period.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "calendarType": "periodic",
     "startDate": "2017-04-22T10:00:00+02:00",
     "endDate": "2017-04-25T23:00:00+02:00",

diff --git a/tests/Place/data/original-with-wrong-available-from.json b/tests/Place/data/original-with-wrong-available-from.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "availableFrom": "2017-04-25T00:00:00",
     "availableTo": "2017-05-01T23:59:59+00:00",
     "calendarType": "permanent",

diff --git a/tests/Place/data/original-with-wrong-available-to.json b/tests/Place/data/original-with-wrong-available-to.json
@@ -1,6 +1,7 @@
 {
     "@type": "Place",
     "@id": "http:\/\/udb-silex.dev\/place\/179c89c5-dba4-417b-ae96-62e7a12c2405",
+    "mainLanguage": "nl",
     "availableFrom": "2017-04-25T00:00:00+00:00",
     "availableTo": "2017-05-01T23:59:59",
     "calendarType": "permanent",