Merge pull request #168 from City-of-Helsinki/UHF-9440

UHF-9440: Add new field information for the service channel migration
City-of-Helsinki · Mar 1, 2024 · 44f69ad · 44f69ad
2 parents 0571d41 + eeea5bc
commit 44f69ad
Show file tree

Hide file tree

Showing 94 changed files with 118 additions and 93 deletions.
diff --git a/helfi_tpr.install b/helfi_tpr.install
@@ -5,7 +5,7 @@
  * Contains helfi_tpr installation procedures.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\content_translation\ContentTranslationHandler;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -319,3 +319,21 @@ function helfi_tpr_update_8046() : void {
   \Drupal::entityDefinitionUpdateManager()
     ->installFieldStorageDefinition('subgroup', 'tpr_unit', 'helfi_tpr', $subgroup_field);
 }
+
+/**
+ * UHF-9940 Add information text field to Channel entity.
+ */
+function helfi_tpr_update_8047() : void {
+  $field = BaseFieldDefinition::create('text_long')
+    ->setTranslatable(TRUE)
+    ->setRevisionable(FALSE)
+    ->setLabel(new TranslatableMarkup('Additional information'))
+    ->setDisplayOptions('form', [
+      'type' => 'readonly_field_widget',
+    ])
+    ->setDisplayConfigurable('form', TRUE)
+    ->setDisplayConfigurable('view', TRUE);
+
+  \Drupal::entityDefinitionUpdateManager()
+    ->installFieldStorageDefinition('information', 'tpr_service_channel', 'helfi_tpr', $field);
+}
diff --git a/helfi_tpr.module b/helfi_tpr.module
@@ -5,7 +5,7 @@
  * Contains helfi_tpr.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Database\Query\AlterableInterface;

diff --git a/migrations/tpr_service_channel.yml b/migrations/tpr_service_channel.yml
@@ -67,6 +67,10 @@ process:
   payment_enabled: payment_enabled
   for_personal_customer: for_personal_customer
   for_corporate_customer: for_corporate_customer
+  information/value: information
+  information/format:
+    plugin: default_value
+    default_value: plain_text
 destination:
   plugin: translatable_entity:tpr_service_channel
   default_values:

diff --git a/modules/helfi_address_search/helfi_address_search.module b/modules/helfi_address_search/helfi_address_search.module
@@ -5,7 +5,7 @@
  * Contains helfi_address_search.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;

diff --git a/modules/helfi_address_search/src/Plugin/Field/FieldFormatter/KiloFormatter.php b/modules/helfi_address_search/src/Plugin/Field/FieldFormatter/KiloFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_address_search\Plugin\Field\FieldFormatter;
 

diff --git a/modules/helfi_address_search/src/Plugin/views/area/AddressSearchInfo.php b/modules/helfi_address_search/src/Plugin/views/area/AddressSearchInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_address_search\Plugin\views\area;
 

diff --git a/modules/helfi_address_search/src/Plugin/views/field/DistanceField.php b/modules/helfi_address_search/src/Plugin/views/field/DistanceField.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_address_search\Plugin\views\field;
 

diff --git a/modules/helfi_address_search/src/Plugin/views/filter/AddressSearch.php b/modules/helfi_address_search/src/Plugin/views/filter/AddressSearch.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_address_search\Plugin\views\filter;
 

diff --git a/src/Entity/BaseFieldTrait.php b/src/Entity/BaseFieldTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/Channel.php b/src/Entity/Channel.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 
@@ -131,6 +131,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       'expiration_time' => new TranslatableMarkup('Expiration time'),
       'authorization_code' => new TranslatableMarkup('Information'),
       'call_charge_info' => new TranslatableMarkup('Call charge info'),
+      'information' => new TranslatableMarkup('Additional information'),
     ];
     foreach ($text_fields as $name => $label) {
       $fields[$name] = BaseFieldDefinition::create('text_long')

diff --git a/src/Entity/ChannelType.php b/src/Entity/ChannelType.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/ChannelTypeCollection.php b/src/Entity/ChannelTypeCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/DataFieldTrait.php b/src/Entity/DataFieldTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/ErrandService.php b/src/Entity/ErrandService.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/Form/ContentEntityForm.php b/src/Entity/Form/ContentEntityForm.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity\Form;
 

diff --git a/src/Entity/Listing/ListBuilder.php b/src/Entity/Listing/ListBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity\Listing;
 

diff --git a/src/Entity/OntologyWordDetails.php b/src/Entity/OntologyWordDetails.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/Service.php b/src/Entity/Service.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/TprEntityBase.php b/src/Entity/TprEntityBase.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/TranslationHandler.php b/src/Entity/TranslationHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/Entity/Unit.php b/src/Entity/Unit.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Entity;
 

diff --git a/src/EventSubscriber/MigrationConfigurationSubscriber.php b/src/EventSubscriber/MigrationConfigurationSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\EventSubscriber;
 

diff --git a/src/Field/Connection/Connection.php b/src/Field/Connection/Connection.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/Highlight.php b/src/Field/Connection/Highlight.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/Link.php b/src/Field/Connection/Link.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/OpeningHour.php b/src/Field/Connection/OpeningHour.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/OtherInfo.php b/src/Field/Connection/OtherInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/PhoneOrEmail.php b/src/Field/Connection/PhoneOrEmail.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/Price.php b/src/Field/Connection/Price.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/Repository.php b/src/Field/Connection/Repository.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/Subgroup.php b/src/Field/Connection/Subgroup.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/Connection/Topical.php b/src/Field/Connection/Topical.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field\Connection;
 

diff --git a/src/Field/FieldDefinition.php b/src/Field/FieldDefinition.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Field;
 

diff --git a/src/Fixture/ErrandService.php b/src/Fixture/ErrandService.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Fixture;
 
@@ -71,6 +71,7 @@ public function getMockData() : array {
             'email' => sprintf('%s.email.%s.%s@hel.fi', $id, $language, $channelId),
             'phone' => sprintf('%s-123456-%s-%s', $id, $language, $channelId),
             'call_charge_info' => sprintf('call_charge_info %s %s %s', $id, $language, $channelId),
+            'information' => sprintf('information %s %s %s', $id, $language, $channelId),
             'availabilities' => [
               [
                 'availability_string' => sprintf('0:%s:test %s %s', $id, $language, $channelId),

diff --git a/src/Fixture/OntologyWordDetails.php b/src/Fixture/OntologyWordDetails.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Fixture;
 

diff --git a/src/Fixture/Service.php b/src/Fixture/Service.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Fixture;
 

diff --git a/src/Fixture/Unit.php b/src/Fixture/Unit.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Fixture;
 

diff --git a/src/Plugin/DataType/ConnectionData.php b/src/Plugin/DataType/ConnectionData.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\DataType;
 

diff --git a/src/Plugin/Field/FieldFormatter/AccessibilitySentenceFormatter.php b/src/Plugin/Field/FieldFormatter/AccessibilitySentenceFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\Field\FieldFormatter;
 

diff --git a/src/Plugin/Field/FieldFormatter/ErrandServicesChannelFormatter.php b/src/Plugin/Field/FieldFormatter/ErrandServicesChannelFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\Field\FieldFormatter;
 

diff --git a/src/Plugin/Field/FieldFormatter/OntologyWordDetailFormatter.php b/src/Plugin/Field/FieldFormatter/OntologyWordDetailFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\Field\FieldFormatter;
 

diff --git a/src/Plugin/Field/FieldFormatter/ServiceChannelFormatter.php b/src/Plugin/Field/FieldFormatter/ServiceChannelFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\Field\FieldFormatter;
 

diff --git a/src/Plugin/Field/FieldFormatter/ServiceMapFormatter.php b/src/Plugin/Field/FieldFormatter/ServiceMapFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\Field\FieldFormatter;
 

diff --git a/src/Plugin/Field/FieldType/AccessibilitySentenceItem.php b/src/Plugin/Field/FieldType/AccessibilitySentenceItem.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\helfi_tpr\Plugin\Field\FieldType;