HeartbeatStreamEntity

replacing get/set methods
adding schema to represent its Types field
still not functioning (does not save types)

config/schema/heartbeat_stream.schema.yml

@@ -0,0 +1,42 @@
+heartbeat_stream.heartbeat_type.*:
+  type: config_entity
+  label: 'Heartbeat type config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string
+    hid:
+      type: serial
+      label: 'hid'
+    message_id:
+      type: string
+      label: 'message_id'
+    description:
+      type: string
+      label: 'description'
+    message:
+      type: string
+      label: 'message'
+    message_concat:
+      type: string
+      label: 'message_concat'
+    perms:
+      type: integer
+      label: 'perms'
+    group_type:
+      type: string
+      label: 'group_type'
+    concat_args:
+      type: blob
+      label: 'concat_args'
+    variables:
+      type: blob
+      label: 'variables'
+    attachments:
+      type: blob
+      label: 'attachments'

src/Entity/HeartbeatStream.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\heartbeat8\Entity;
 
+use Drupal\heartbeat8\Entity\HeartbeatType;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\RevisionableContentEntityBase;
@@ -46,6 +47,7 @@ use Drupal\user\UserInterface;
  *     "uid" = "user_id",
  *     "langcode" = "langcode",
  *     "status" = "status",
+ *     "types" = "types",
  *   },
  *   links = {
  *     "canonical" = "/admin/structure/heartbeatstream/heartbeat_stream/{heartbeat_stream}",
@@ -66,7 +68,6 @@ class HeartbeatStream extends RevisionableContentEntityBase implements Heartbeat
   use EntityChangedTrait;
 
 
-
   protected $class;
   protected $realClass;
   protected $name;
@@ -75,6 +76,119 @@ class HeartbeatStream extends RevisionableContentEntityBase implements Heartbeat
   protected $path;
   protected $settings;
   protected $variables;
+  protected $types;
+
+  /**
+   * @return array
+   */
+  public function getTypes() {
+    return $this->types;
+  }
+
+  /**
+   * @param array use Drupal\heartbeat8\Entity\HeartbeatType $types
+   */
+  public function setTypes($types) {
+    $this->types = $types;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getClass() {
+    return $this->class;
+  }
+
+  /**
+   * @param mixed $class
+   */
+  public function setClass($class) {
+    $this->class = $class;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getRealClass() {
+    return $this->realClass;
+  }
+
+  /**
+   * @param mixed $realClass
+   */
+  public function setRealClass($realClass) {
+    $this->realClass = $realClass;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getModule() {
+    return $this->module;
+  }
+
+  /**
+   * @param mixed $module
+   */
+  public function setModule($module) {
+    $this->module = $module;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getTitle() {
+    return $this->title;
+  }
+
+  /**
+   * @param mixed $title
+   */
+  public function setTitle($title) {
+    $this->title = $title;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getPath() {
+    return $this->path;
+  }
+
+  /**
+   * @param mixed $path
+   */
+  public function setPath($path) {
+    $this->path = $path;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getSettings() {
+    return $this->settings;
+  }
+
+  /**
+   * @param mixed $settings
+   */
+  public function setSettings($settings) {
+    $this->settings = $settings;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getVariables() {
+    return $this->variables;
+  }
+
+  /**
+   * @param mixed $variables
+   */
+  public function setVariables($variables) {
+    $this->variables = $variables;
+  }
 
   /**
    * {@inheritdoc}
@@ -215,136 +329,6 @@ class HeartbeatStream extends RevisionableContentEntityBase implements Heartbeat
 
 
 
-  /**
-   * @return mixed
-   */
-  public function getClass()
-  {
-    // TODO: Implement getClass() method.
-  }
-
-  /**
-   * @param mixed $class
-   */
-  public function setClass($class)
-  {
-    // TODO: Implement setClass() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getRealClass()
-  {
-    // TODO: Implement getRealClass() method.
-  }
-
-  /**
-   * @param mixed $real_class
-   */
-  public function setRealClass($real_class)
-  {
-    // TODO: Implement setRealClass() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getPath()
-  {
-    // TODO: Implement getPath() method.
-  }
-
-  /**
-   * @param mixed $path
-   */
-  public function setPath($path)
-  {
-    // TODO: Implement setPath() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getTitle()
-  {
-    // TODO: Implement getTitle() method.
-  }
-
-  /**
-   * @param mixed $title
-   */
-  public function setTitle($title)
-  {
-    // TODO: Implement setTitle() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getModule()
-  {
-    // TODO: Implement getModule() method.
-  }
-
-  /**
-   * @param mixed $module
-   */
-  public function setModule($module)
-  {
-    // TODO: Implement setModule() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getVariables()
-  {
-    // TODO: Implement getVariables() method.
-  }
-
-  /**
-   * @param mixed $variables
-   */
-  public function setVariables($variables)
-  {
-    // TODO: Implement setVariables() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getSettings()
-  {
-    // TODO: Implement getSettings() method.
-  }
-
-  /**
-   * @param mixed $settings
-   */
-  public function setSettings($settings)
-  {
-    // TODO: Implement setSettings() method.
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getTypes()
-  {
-    // TODO: Implement getTypes() method.
-  }
-
-  /**
-   * @param $heartbeat_types
-   * @return mixed
-   */
-  public function setTypes($heartbeat_types)
-  {
-    // TODO: Implement setTypes() method.
-  }
-
-
   /**
    * {@inheritdoc}
    */

src/Form/HeartbeatStreamForm.php

@@ -2,7 +2,12 @@
 
 namespace Drupal\heartbeat8\Form;
 
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\heartbeat8\HeartbeatTypeServices;
+use Drupal\heartbeat8\Entity\HeartbeatStream;
+use Drupal\heartbeat8\Entity\HeartbeatType;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -23,7 +28,12 @@ class HeartbeatStreamForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('heartbeat8.heartbeattype'));
+    return new static(
+      $container->get('heartbeat8.heartbeattype'),
+      $container->get('entity.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
+    );
   }
 
 
@@ -40,8 +50,8 @@ class HeartbeatStreamForm extends ContentEntityForm {
    * @param Renderer $renderer
    * @throws \Exception
    */
-  public function __construct(HeartbeatTypeServices $heartbeatTypeService) {
-
+  public function __construct(HeartbeatTypeServices $heartbeatTypeService, EntityManager $entityManager) {
+    parent::__construct($entityManager);
     $this->heartbeatTypeService = $heartbeatTypeService;
 
   }
@@ -64,12 +74,12 @@ class HeartbeatStreamForm extends ContentEntityForm {
         '#weight' => 10,
       );
     }
-    
+
     $form['types'] = array(
 
       '#type' => 'checkboxes',
       '#options' => $this->heartbeatTypeService->getTypes(),
-      
+
       '#title' => $this->t('Please select all the Heartbeat Types you wish to include in this stream'),
 
     );
@@ -96,6 +106,12 @@ class HeartbeatStreamForm extends ContentEntityForm {
     else {
       $entity->setNewRevision(FALSE);
     }
+    if ($entity instanceof HeartbeatStream) {
+      $heartbeatTypes = $form_state->getValue('types');
+      $entity->set('types', $heartbeatTypes);
+      $entity->setTypes($heartbeatTypes);
+      $entity->save();
+    }
 
     $status = parent::save($form, $form_state);
 

src/Form/HeartbeatTypeForm.php

@@ -266,9 +266,8 @@ class HeartbeatTypeForm extends EntityForm {
   public function rebuildMessageArguments(array &$form, FormStateInterface $form_state) {
 
     $messageArgString = $form_state->getValue('message');
-    $messageArguments = array_slice(explode('!', $messageArgString), 1);
 
-    $argsArray = $this->extractMessageArguments($messageArguments);
+    $argsArray = $this->extractMessageArguments($messageArgString);
 
     $form_state->set('data_hidden', $argsArray);
     $form_state->setRebuild();