HeartbeatType schema changed - bundle field added

default heartbeat type added for tweets
services modified: HeartbeatTypeService now provides bundles per entity
entity_insert hook modified to fix bug (provides entityInfo to Heartbeat::buidMessage())
properties changed on HeartbeatType entity and interface
HeartbeatTypeForm amended to set bundle

config/install/heartbeat.heartbeat_type.user_post_tweet.yml

@@ -0,0 +1,21 @@
+uuid: c1cdd3d5-6cc4-4a40-8c77-08806b0dae21
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: mDnyDwtmyL811CNkkpcqB-nN5XhpKo-BjDK6mpXaCLs
+id: user_post_tweet
+label: 'User Post Tweet'
+hid: null
+message_id: null
+description: 'Records the event of a user posting a tweet which was recorded by the Republic'
+mainentity: node
+bundle: tweet
+message: '!user posted !tweettitle'
+perms: 0
+group_type: HEARTBEAT_GROUP_NONE
+arguments: '{"!user":"[user:account-name]","!tweettitle":"[node:title]"}'
+variables:
+  - '[user:account-name]'
+  - '[node:title]'
+

config/schema/heartbeat.schema.yml

@@ -22,12 +22,15 @@ heartbeat.heartbeat_type.*:
     mainentity:
       type: string
       label: 'Main Entity'
+    bundle:
+      type: string
+      label: 'Bundle'
     message:
       type: string
       label: 'message'
-    message_concat:
-      type: string
-      label: 'message_concat'
+#    message_concat:
+#      type: string
+#      label: 'message_concat'
     perms:
       type: integer
       label: 'perms'
@@ -40,9 +43,9 @@ heartbeat.heartbeat_type.*:
     variables:
       type: blob
       label: 'variables'
-    attachments:
-      type: blob
-      label: 'attachments'
+#    attachments:
+#      type: blob
+#      label: 'attachments'
 heartbeat.friendship.*:
   type: config_entity
   label: 'Heartbeat Friendship config'

css/heartbeat.css

@@ -6,3 +6,7 @@
 .heartbeat-message {
   border: 1px solid black;
 }
+
+.heartbeat-message img {
+  max-width: 128px;
+}

heartbeat.module

@@ -109,7 +109,12 @@ function heartbeat_entity_insert(EntityInterface $entity) {
             'user' => $user,
           );
 
-          $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $media);
+          if (array_key_exists($heartbeatTypeEntity->getMainEntity(), $heartbeatTypeService->getEntityBundles($entity->getEntityType()))) {
+$stophere = null;
+          }
+
+
+          $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $entity->getEntityTypeId(), $media);
 
           //      $translatedMessage = t($messageTemplate);
 

heartbeat.services.yml

@@ -1,7 +1,7 @@
 services:
   heartbeat.heartbeattype:
     class: Drupal\heartbeat\HeartbeatTypeServices
-    arguments: ['@entity_type.manager', '@entity.query']
+    arguments: ['@entity_type.manager', '@entity_type.bundle.info', '@entity.query']
 
   heartbeatstream:
     class: Drupal\heartbeat\HeartbeatStreamServices
@@ -14,6 +14,7 @@ services:
   heartbeat:
     class: Drupal\heartbeat\HeartbeatService
     arguments: ['@entity_type.manager', '@entity.query', '@heartbeatstream']
+
   heartbeat.event:
     class: Drupal\heartbeat\EventSubscriber\HeartbeatEventSubscriber
     arguments: ['@flag', '@heartbeat.heartbeattype', '@heartbeatstream', '@heartbeat']

src/Controller/TestController.php

@@ -53,6 +53,8 @@ class TestController extends ControllerBase {
    */
   public function start($arg) {
 
+    $node = \Drupal\node\Entity\Node::load(186);
+
     $streamEntities = $this->heartbeatstream->loadAllEntities();
 
     foreach ($streamEntities as $streamEntityId) {
@@ -70,6 +72,11 @@ class TestController extends ControllerBase {
     }
 
     $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
+
+    $entityBundleInfo = $node->bundle();
+    $entityType = $node->getEntityType();
+    $availableBundles = $heartbeatTypeService->getEntityBundles($node->getEntityType());
+
     foreach ($heartbeatTypeService->getTypes() as $type) {
       $heartbeatTypeEntity = \Drupal::entityTypeManager()->getStorage('heartbeat_type')->load($type);
     }

src/Entity/HeartbeatType.php

@@ -124,25 +124,25 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
     return $this->get('message');
   }
 
-  /**
-   * Sets the translatable concatenated message
-   *
-   * @param string $messageConcat
-   *
-   */
-  public function setMessageConcat($messageConcat) {
-    $this->messageConcat = $messageConcat;
-  }
-
-  /**
-   * Gets the concatenated message of the stream
-   *
-   * @return string
-   *  The Stream's concatenated message
-   */
-  public function getMessageConcat() {
-    return $this->messageConcat;
-  }
+//  /**
+//   * Sets the translatable concatenated message
+//   *
+//   * @param string $messageConcat
+//   *
+//   */
+//  public function setMessageConcat($messageConcat) {
+//    $this->messageConcat = $messageConcat;
+//  }
+//
+//  /**
+//   * Gets the concatenated message of the stream
+//   *
+//   * @return string
+//   *  The Stream's concatenated message
+//   */
+//  public function getMessageConcat() {
+//    return $this->messageConcat;
+//  }
 
   /**
    * Sets the Permissions for this message stream
@@ -226,25 +226,25 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
     return $this->variables;
   }
 
-  /**
-   * Sets the attachments for this message stream
-   *
-   * @param string $attachments
-   *
-   */
-  public function setAttachments($attachments) {
-    $this->attachments = $attachments;
-  }
-
-  /**
-   * Gets the attachments of this message stream
-   *
-   * @return string
-   *  The stream's attachments
-   */
-  public function getAttachments() {
-    return $this->attachments;
-  }
+//  /**
+//   * Sets the attachments for this message stream
+//   *
+//   * @param string $attachments
+//   *
+//   */
+//  public function setAttachments($attachments) {
+//    $this->attachments = $attachments;
+//  }
+//
+//  /**
+//   * Gets the attachments of this message stream
+//   *
+//   * @return string
+//   *  The stream's attachments
+//   */
+//  public function getAttachments() {
+//    return $this->attachments;
+//  }
 
   /**
    * @inheritDoc
@@ -344,4 +344,23 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
   }
 
 
+  /**
+   * Sets the bundle targeted for this Heartbeat type
+   *
+   * @param string $variables
+   *
+   */
+  public function setBundle($bundle) {
+    $this->set('bundle', $bundle);
+  }
+
+  /**
+   * Gets the bundle of this Heartbeat type
+   *
+   * @return string
+   *  The stream's variables
+   */
+  public function getBundle() {
+    return $this->get('bundle');
+  }
 }

src/Entity/HeartbeatTypeInterface.php

@@ -88,24 +88,24 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
   public function getMessage();
 
 
-  /**
-   * Sets the translatable concatenated message
-   *
-   * @param string $messageConcat
-   *
-   */
-
-  public function setMessageConcat($messageConcat);
-
-
-  /**
-   * Gets the concatenated message of the stream
-   *
-   * @return string
-   *  The Stream's concatenated message
-   */
-
-  public function getMessageConcat();
+//  /**
+//   * Sets the translatable concatenated message
+//   *
+//   * @param string $messageConcat
+//   *
+//   */
+//
+//  public function setMessageConcat($messageConcat);
+//
+//
+//  /**
+//   * Gets the concatenated message of the stream
+//   *
+//   * @return string
+//   *  The Stream's concatenated message
+//   */
+//
+//  public function getMessageConcat();
 
 
   /**
@@ -190,24 +190,44 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
   public function getVariables();
 
 
-
   /**
-   * Sets the attachments for this message stream
+   * Sets the bundle targeted for this Heartbeat type
    *
-   * @param string $attachments
+   * @param string $variables
    *
    */
 
-  public function setAttachments($attachments);
+  public function setBundle($bundle);
 
 
   /**
-   * Gets the attachments of this message stream
+   * Gets the bundle of this Heartbeat type
    *
    * @return string
-   *  The stream's attachments
+   *  The stream's variables
    */
 
-  public function getAttachments();
+  public function getBundle();
+
+
+
+//  /**
+//   * Sets the attachments for this message stream
+//   *
+//   * @param string $attachments
+//   *
+//   */
+//
+//  public function setAttachments($attachments);
+//
+//
+//  /**
+//   * Gets the attachments of this message stream
+//   *
+//   * @return string
+//   *  The stream's attachments
+//   */
+//
+//  public function getAttachments();
 
 }

src/Form/HeartbeatTypeForm.php

@@ -179,14 +179,14 @@ class HeartbeatTypeForm extends EntityForm {
     );
 
 
-    $form['message_concat'] = array(
-      '#type' => 'textfield',
-      '#title' => $this->t('Message structure in concatenated form'),
-      '#maxlength' => 255,
-      '#default_value' => $heartbeat_type->getMessageConcat(),
-      '#description' => $this->t("The structure for messages of this type. Use !exclamation marks before fields and entities"),
-      '#required' => FALSE,
-    );
+//    $form['message_concat'] = array(
+//      '#type' => 'textfield',
+//      '#title' => $this->t('Message structure in concatenated form'),
+//      '#maxlength' => 255,
+//      '#default_value' => $heartbeat_type->getMessageConcat(),
+//      '#description' => $this->t("The structure for messages of this type. Use !exclamation marks before fields and entities"),
+//      '#required' => FALSE,
+//    );
 
 
     $form['perms'] = array(
@@ -297,14 +297,16 @@ class HeartbeatTypeForm extends EntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $heartbeat_type = $this->entity;
-    $mapValue = $form_state->getValue('messageMap');
-    $mapObj = $form_state->get('messageMap');
+$bundleArray = $form_state->get('entity_bundles');
+$bundleChoice = $form_state->getValue('entity_bundles');
     $heartbeat_type->set('description', $form_state->getValue('description'));
     $heartbeat_type->set('message', $form_state->getValue('message'));
     $heartbeat_type->set('perms', $form_state->getValue('perms'));
     $heartbeat_type->set('variables', $form_state->getValue('variables'));
     $heartbeat_type->set('arguments', json_encode($form_state->get('messageMap')));
     $heartbeat_type->set('mainentity', $this->entityTypes[$form_state->getValue('entity_type')]);
+    $heartbeat_type->set('bundle', $form_state->get('entity_bundles')[$form_state->getValue('entity_bundles')['list']]);
+
     $status = $heartbeat_type->save();
 
     switch ($status) {

src/HeartbeatTypeServices.php

@@ -1,7 +1,10 @@
 <?php
 
 namespace Drupal\heartbeat;
+
+use Drupal\Core\Entity\ContentEntityType;
 use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeBundleInfo;
 use Drupal\Core\Entity\Query\QueryFactory;
 
 /**
@@ -18,6 +21,13 @@ class HeartbeatTypeServices {
    */
   protected $entityTypeManager;
 
+  /**
+  +   * Drupal\Core\Entity\EntityTypeBundleInfo definition.
+  +   *
+  +   * @var EntityTypeBundleInfo
+  +   */
+  protected $entityTypeBundleInfo;
+
   /**
    * Drupal\Core\Entity\Query\QueryFactory definition.
    *
@@ -28,10 +38,12 @@ class HeartbeatTypeServices {
   /**
    * Constructor.
    * @param EntityTypeManager $entityTypeManager
+   * @param EntityTypeBundleInfo $entityTypeBundleInfo
    * @param QueryFactory $entity_query
    */
-  public function __construct(EntityTypeManager $entityTypeManager, QueryFactory $entity_query) {
+  public function __construct(EntityTypeManager $entityTypeManager, EntityTypeBundleInfo $entityTypeBundleInfo, QueryFactory $entity_query) {
     $this->entityTypeManager = $entityTypeManager;
+    $this->entityTypeBundleInfo = $entityTypeBundleInfo;
     $this->entityQuery = $entity_query;
   }
 
@@ -43,4 +55,9 @@ class HeartbeatTypeServices {
   public function load($id) {
     return $this->entityTypeManager->getStorage('heartbeat_type')->load($id);
   }
+
+  public function getEntityBundles(ContentEntityType $entity) {
+    return $this->entityTypeBundleInfo->getBundleInfo($entity->id());
+  }
+
 }