Major work on services

Attempting to set an array of HeartBeat messages for heartbeat-stream.html.twig

heartbeat.install

@@ -237,100 +237,100 @@ function heartbeat_schema() {
   $schema['heartbeat_user_templates'] = heartbeat_install_table_user_templates();
 
 
-  $schema['heartbeat_stream'] = array(
-    'description' => 'Table that contains heartbeat streams.',
-    // CTools export definitions.
-//    'export' => array(
-//      'key' => 'class',
-//      'key name' => 'name',
-//      'primary key' => 'class',
-//      'bulk export' => TRUE,
-//      'identifier' => 'heartbeatstream',
-//      'object' => 'HeartbeatStreamConfig',
-//      'default hook' => 'heartbeat_stream_info',
-//      'load callback' => '_heartbeat_stream_config_load',
-//      'load all callback' => '_heartbeat_stream_config_load_all',
-//      'can disable' => TRUE,
-//      'api' => array(
-//        'owner' => 'heartbeat',
-//        'api' => 'heartbeat',
-//        'minimum_version' => 1,
-//        'current_version' => 1,
+//  $schema['heartbeat_stream'] = array(
+//    'description' => 'Table that contains heartbeat streams.',
+//    // CTools export definitions.
+////    'export' => array(
+////      'key' => 'class',
+////      'key name' => 'name',
+////      'primary key' => 'class',
+////      'bulk export' => TRUE,
+////      'identifier' => 'heartbeatstream',
+////      'object' => 'HeartbeatStreamConfig',
+////      'default hook' => 'heartbeat_stream_info',
+////      'load callback' => '_heartbeat_stream_config_load',
+////      'load all callback' => '_heartbeat_stream_config_load_all',
+////      'can disable' => TRUE,
+////      'api' => array(
+////        'owner' => 'heartbeat',
+////        'api' => 'heartbeat',
+////        'minimum_version' => 1,
+////        'current_version' => 1,
+////      ),
+////    ),
+//    'fields' => array(
+//      //TODO find out if we need id or vid fields in this table
+////      'id' => array(
+////        'type' => 'serial',
+////        'not null' => TRUE,
+////        'description' => 'Primary Key: Unique heartbeat_activity event ID.',
+////      ),
+////      'vid' => array(
+////        'type' => 'int',
+////        'not null' => TRUE,
+////        'description' => 'The Revision ID',
+////      ),
+//      'class' => array(
+//        'type' => 'varchar',
+//        'length' => 100,
+//        'not null' => TRUE,
+//        'default' => '',
+//        'description' => 'Class of the stream to load.',
 //      ),
-//    ),
-    'fields' => array(
-      //TODO find out if we need id or vid fields in this table
-//      'id' => array(
-//        'type' => 'serial',
+//      'real_class' => array(
+//        'type' => 'varchar',
+//        'length' => 100,
 //        'not null' => TRUE,
-//        'description' => 'Primary Key: Unique heartbeat_activity event ID.',
+//        'default' => '',
+//        'description' => 'Real Class of the stream to load.',
 //      ),
-//      'vid' => array(
-//        'type' => 'int',
+//      'name' => array(
+//        'type' => 'varchar',
+//        'length' => 100,
 //        'not null' => TRUE,
-//        'description' => 'The Revision ID',
+//        'default' => '',
+//        'description' => 'Name of the stream. Cloned streams will have the same object but same cla
+//ss.',
 //      ),
-      'class' => array(
-        'type' => 'varchar',
-        'length' => 100,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Class of the stream to load.',
-      ),
-      'real_class' => array(
-        'type' => 'varchar',
-        'length' => 100,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Real Class of the stream to load.',
-      ),
-      'name' => array(
-        'type' => 'varchar',
-        'length' => 100,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Name of the stream. Cloned streams will have the same object but same cla
-ss.',
-      ),
-      'module' => array(
-        'type' => 'varchar',
-        'length' => 100,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'The module that defines the class and where the query builder is located.',
-      ),
-      'title' => array(
-        'type' => 'varchar',
-        'length' => 100,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Human readable name of the stream.',
-      ),
-      'path' => array(
-        'type' => 'varchar',
-        'length' => 250,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'Path to the stream object.',
-      ),
-      'settings' => array(
-        'description' => 'Serialized settings for this stream.',
-        'type' => 'blob',
-        'serialize' => TRUE,
-        'not null' => FALSE,
-      ),
-      'variables' => array(
-        'description' => 'Variables to parse into the message (used in message).',
-        'type' => 'blob',
-        'serialize' => TRUE,
-        'not null' => FALSE,
-      ),
-    ),
-    'primary key' => array('class'),
-    'indexes' => array(
-      'name' => array('name'),
-    ),
-  );
+//      'module' => array(
+//        'type' => 'varchar',
+//        'length' => 100,
+//        'not null' => TRUE,
+//        'default' => '',
+//        'description' => 'The module that defines the class and where the query builder is located.',
+//      ),
+//      'title' => array(
+//        'type' => 'varchar',
+//        'length' => 100,
+//        'not null' => TRUE,
+//        'default' => '',
+//        'description' => 'Human readable name of the stream.',
+//      ),
+//      'path' => array(
+//        'type' => 'varchar',
+//        'length' => 250,
+//        'not null' => TRUE,
+//        'default' => '',
+//        'description' => 'Path to the stream object.',
+//      ),
+//      'settings' => array(
+//        'description' => 'Serialized settings for this stream.',
+//        'type' => 'blob',
+//        'serialize' => TRUE,
+//        'not null' => FALSE,
+//      ),
+//      'variables' => array(
+//        'description' => 'Variables to parse into the message (used in message).',
+//        'type' => 'blob',
+//        'serialize' => TRUE,
+//        'not null' => FALSE,
+//      ),
+//    ),
+//    'primary key' => array('class'),
+//    'indexes' => array(
+//      'name' => array('name'),
+//    ),
+//  );
 
   //TODO determine if these foreign keys are to be added
 //  db_add_unique_key('heartbeat_activity', 'uaid', array('uaid'));
@@ -367,3 +367,20 @@ function heartbeat_install_table_user_templates() {
     ),
   );
 }
+
+function heartbeat_uninstall() {
+  $entities = \Drupal::service("entity.query")->get("heartbeat")->execute();
+  foreach($entities as $entity) {
+    $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
+    $heartbeat->delete();
+  }
+
+  $entities = \Drupal::service("entity.query")->get("heartbeat_stream")->execute();
+
+  foreach($entities as $entity) {
+    $heartbeat = \Drupal::service("entity_type.manager")->getStorage("heartbeat")->load($entity);
+    $heartbeat->delete();
+  }
+
+
+}

heartbeat.module

@@ -49,6 +49,12 @@ function heartbeat_theme() {
     'variables' => ['content' => NULL],
     'file' => 'heartbeat.page.inc',
   ];
+  $theme['heartbeat_stream'] = [
+    'variables' => array(
+      'messages' => NULL,
+      'zilla' => 2,
+    )
+  ];
   return $theme;
 }
 
@@ -124,7 +130,6 @@ function heartbeat_entity_insert(EntityInterface $entity) {
         ]);
 
         $heartbeatActivity->setMessage($heartbeatMessage);
-
         $heartbeatActivity->save();
 
       }

heartbeat.routing.yml

@@ -15,3 +15,11 @@ heartbeat.test_controller_start:
     _title: 'run'
   requirements:
     _permission: 'access content'
+
+heartbeat.stream_test_controller_stream:
+  path: '/nodeactivity'
+  defaults:
+    _controller: '\Drupal\heartbeat\Controller\StreamTestController::stream'
+    _title: 'stream'
+  requirements:
+    _permission: 'access content'

heartbeat.services.yml

@@ -11,3 +11,6 @@ services:
     class: Drupal\heartbeat\HeartbeatAltServices
     arguments: ['@entity.query', '@entity.manager', '@entity_type.manager', '@entity_type.repository', '@heartbeat.heartbeattype']
 
+  heartbeat:
+    class: Drupal\heartbeat\HeartbeatService
+    arguments: ['@entity_type.manager', '@entity.query', '@heartbeatstream']

src/Controller/StreamTestController.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace Drupal\heartbeat\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\heartbeat\HeartbeatService;
+use Drupal\heartbeat\HeartbeatStreamServices;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityTypeManager;
+
+/**
+ * Class StreamTestController.
+ *
+ * @package Drupal\heartbeat\Controller
+ */
+class StreamTestController extends ControllerBase {
+
+  /**
+   * Drupal\Core\Entity\Query\QueryFactory definition.
+   *
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  protected $entityQuery;
+  /**
+   * Drupal\Core\Entity\EntityTypeManager definition.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManager
+   */
+  protected $entityTypeManager;
+
+  /**
+   * \Drupal\heartbeat\HeartbeatStreamServices definition.
+   *
+   * @var \Drupal\heartbeat\HeartbeatStreamServices
+   */
+  protected $heartbeatStreamService;
+
+  /**
+   * \Drupal\heartbeat\HeartbeatService definition.
+   *
+   * @var \Drupal\heartbeat\HeartbeatService
+   */
+  protected $heartbeatService;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(QueryFactory $entity_query, EntityTypeManager $entity_type_manager, HeartbeatStreamServices $heartbeatStreamService, HeartbeatService $heartbeatService) {
+    $this->entityQuery = $entity_query;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->heartbeatStreamService = $heartbeatStreamService;
+    $this->heartbeatService = $heartbeatService;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity.query'),
+      $container->get('entity_type.manager'),
+      $container->get('heartbeatstream'),
+      $container->get('heartbeat')
+    );
+  }
+
+  /**
+   * Stream.
+   *
+   * @return string
+   *   Return Hello string.
+   */
+  public function stream() {
+    $messages = array();
+    $types = $this->heartbeatStreamService->getTypesById(1);
+    foreach ($types as $type) {
+      if ($type != null) {
+
+        $heartbeatType = $type->getValue();
+
+        $heartbeats = $this->heartbeatService->loadByType($heartbeatType);
+
+        foreach($heartbeats as $heartbeat) {
+          $messages[] = $heartbeat->getMessage()->getValue()[0]['value'];
+        }
+      }
+    }
+
+    return [
+      '#theme' => 'heartbeat_stream',
+      '#messages' => $messages,
+    ];
+  }
+
+}

src/HeartbeatService.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\heartbeat;
+use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\Query\QueryFactory;
+
+/**
+ * Class HeartbeatService.
+ *
+ * @package Drupal\heartbeat
+ */
+class HeartbeatService {
+
+  /**
+   * Drupal\Core\Entity\EntityTypeManager definition.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManager
+   */
+  protected $entityTypeManager;
+  /**
+   * Drupal\Core\Entity\Query\QueryFactory definition.
+   *
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  protected $entityQuery;
+
+  /**
+   * Constructor.
+   * @param EntityTypeManager $entity_type_manager
+   * @param QueryFactory $entity_query
+   */
+  public function __construct(EntityTypeManager $entity_type_manager, QueryFactory $entity_query) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->entityQuery = $entity_query;
+  }
+
+  public function loadAll() {
+    $entities = $this->entityQuery->get("heartbeat")->execute();
+
+    return $this->entityTypeManager->getStorage("heartbeat")->loadMultiple($entities);
+
+  }
+
+  public function load($id) {
+    return $this->entityTypeManager->getStorage("heartbeat")->load($id);
+  }
+
+  public function loadByType($type) {
+    return $this->entityTypeManager->getStorage("heartbeat")->loadMultiple($this->entityQuery->get('heartbeat')->condition('type', $type)->execute());
+  }
+}
+

templates/heartbeat-stream.html.twig

@@ -0,0 +1,25 @@
+{#
+/**
+ * @file heartbeat-stream.html.twig
+ * Default theme implementation to present Heartbeat stream data.
+ *
+ * This template is used when viewing Heartbeat stream pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_heartbeat_stream()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('heartbeat-stream') }}>
+  {% if content %}
+    {{- content -}}
+  {% endif %}
+  {% for message in messages %}
+    Message: {{ message }}
+  <h1> jigga man </h1>
+</div>