Heartbeats finally being saved!!

heartbeat.install

@@ -117,101 +117,114 @@ function heartbeat_schema() {
 
 
 
-  $schema['heartbeat'] = array(
+//  $schema['heartbeat'] = array(
-    'description' => 'Table that contains logs of all user triggerable actions.',
+//    'description' => 'Table that contains logs of all user triggerable actions.',
-    'fields' => array(
+//    'fields' => array(
-      'uaid' => array(
+//      'id' => array(
-        'type' => 'serial',
+//        'type' => 'serial',
-        'not null' => TRUE,
+//        'not null' => TRUE,
-        'description' => 'Primary Key: Unique heartbeat_activity event ID.',
+//        'description' => 'Primary Key: Unique heartbeat_activity event ID.',
-      ),
+//      ),
-      'uid' => array(
+//      'uid' => array(
-        'type' => 'int',
+//        'type' => 'int',
-        'unsigned' => TRUE,
+//        'unsigned' => TRUE,
-        'not null' => TRUE,
+//        'not null' => TRUE,
-        'default' => 0,
+//        'default' => 0,
-        'description' => 'The {users}.uid of the user who triggered the event (requester).',
+//        'description' => 'The {users}.uid of the user who triggered the event (requester).',
-      ),
+//      ),
-      'uid_target' => array(
+//      'uid_target' => array(
-        'type' => 'int',
+//        'type' => 'int',
-        'unsigned' => TRUE,
+//        'unsigned' => TRUE,
-        'not null' => FALSE,
+//        'not null' => FALSE,
-        'default' => 0,
+//        'default' => 0,
-        'description' => 'The target User ID',
+//        'description' => 'The target User ID',
-      ),
+//      ),
-      'nid' => array(
+//      'nid' => array(
-        'description' => 'The Node ID.',
+//        'description' => 'The Node ID.',
-        'type' => 'int',
+//        'type' => 'int',
-        'unsigned' => TRUE,
+//        'unsigned' => TRUE,
-        'not null' => FALSE,
+//        'not null' => FALSE,
-      ),
+//      ),
-      'nid_target' => array(
+//      'nid_target' => array(
-        'description' => 'The target Node ID (E.g. Group id, node reference, ...).',
+//        'description' => 'The target Node ID (E.g. Group id, node reference, ...).',
-        'type' => 'int',
+//        'type' => 'int',
-        'unsigned' => TRUE,
+//        'unsigned' => TRUE,
-        'not null' => FALSE,
+//        'not null' => FALSE,
-      ),
+//      ),
-      'cid' => array(
+//      'cid' => array(
-        'description' => 'The target comment ID (optional).',
+//        'description' => 'The target comment ID (optional).',
-        'type' => 'int',
+//        'type' => 'int',
-        'unsigned' => TRUE,
+//        'unsigned' => TRUE,
-        'not null' => FALSE,
+//        'not null' => FALSE,
-      ),
+//      ),
-      'access' => array(
+//      'vid' => array(
-        'type' => 'int',
+//        'description' => 'The revision ID.',
-        'not null' => TRUE,
+//        'type' => 'int',
-        'size' => 'tiny',
+//        'unsigned' => TRUE,
-        'description' => 'Access for this message to others.',
+//        'not null' => FALSE,
-        'default' => 0,
+//      ),
-      ),
+//      'access' => array(
-      'message_id' => array(
+//        'type' => 'int',
-        'type' => 'varchar',
+//        'not null' => TRUE,
-        'length' => 255,
+//        'size' => 'tiny',
-        'not null' => FALSE,
+//        'description' => 'Access for this message to others.',
-        'default' => '',
+//        'default' => 0,
-        'description' => 'The message id which links to the heartbeat message.',
+//      ),
-      ),
+//      'message_id' => array(
-      'timestamp' => array(
+//        'type' => 'varchar',
-        'description' => 'The activity\'s unix timestamp when action occurred',
+//        'length' => 255,
-        'type' => 'int',
+//        'not null' => FALSE,
-        'unsigned' => TRUE,
+//        'default' => '',
-        'not null' => TRUE,
+//        'description' => 'The message id which links to the heartbeat message.',
-        'default' => 0,
+//      ),
-      ),
+//      'timestamp' => array(
-      'language' => array(
+//        'description' => 'The activity\'s unix timestamp when action occurred',
-        'type' => 'varchar',
+//        'type' => 'int',
-        'length' => 12,
+//        'unsigned' => TRUE,
-        'not null' => FALSE,
+//        'not null' => TRUE,
-        'default' => 'en',
+//        'default' => 0,
-        'description' => 'language for a log".',
+//      ),
-      ),
+//      'language' => array(
-      'variables' => array(
+//        'type' => 'varchar',
-        'type' => 'text',
+//        'length' => 12,
-        'not null' => FALSE,
+//        'not null' => FALSE,
-        'size' => 'big',
+//        'default' => 'en',
-        'description' => 'Serialized array of variables that match the message string and that is passed into the ) function.',
+//        'description' => 'language for a log".',
-      ),
+//      ),
-      'in_group' => array(
+//      'type' => array(
-        'type' => 'int',
+//        'type' => 'varchar',
-        'not null' => TRUE,
+//        'length' => 255,
-        'size' => 'big',
+//        'not null' => FALSE,
-        'description' => 'Indicates whether the activity is related to a group',
+//        'default' => '',
-        'default' => 0,
+//        'description' => 'The Heartbeat Type of this Heartbeat Message',
-      ),
+//      ),
-    ),
+////      'variables' => array(
-    'primary key' => array('uaid'),
+////        'type' => 'text',
-    'indexes' => array(
+////        'not null' => FALSE,
-      'timestamp' => array('timestamp'),
+////        'size' => 'big',
-      'uid' => array('uid'),
+////        'description' => 'Serialized array of variables that match the message string and that is passed into the ) function.',
-      'message_id' => array('message_id'),
+////      ),
-      'uid_target' => array('uid_target'),
+//      'in_group' => array(
-      'nid' => array('nid'),
+//        'type' => 'int',
-      'nid_target' => array('nid_target'),
+//        'not null' => TRUE,
-      'cid' => array('cid'),
+//        'size' => 'big',
-      'language' => array('language'),
+//        'description' => 'Indicates whether the activity is related to a group',
-      ),
+//        'default' => 0,
-
+//      ),
-  );
+//    ),
+//    'primary key' => array('id'),
+//    'indexes' => array(
+//      'timestamp' => array('timestamp'),
+//      'uid' => array('uid'),
+//      'message_id' => array('message_id'),
+//      'uid_target' => array('uid_target'),
+//      'nid' => array('nid'),
+//      'nid_target' => array('nid_target'),
+//      'cid' => array('cid'),
+//      'language' => array('language'),
+//      ),
+//
+//  );
 
   $schema['heartbeat_activity']['fields']['in_group'] = array(
     'type' => 'int',
@@ -246,6 +259,17 @@ function heartbeat_schema() {
 //      ),
 //    ),
     '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,
@@ -273,8 +297,7 @@ ss.',
         'length' => 100,
         'not null' => TRUE,
         'default' => '',
-        'description' => 'The module that defines the class and where the query builder is located.
+        'description' => 'The module that defines the class and where the query builder is located.',
-',
       ),
       'title' => array(
         'type' => 'varchar',
@@ -302,13 +325,6 @@ ss.',
         'serialize' => TRUE,
         'not null' => FALSE,
       ),
-      'real_class' => array(
-        'type' => 'varchar',
-        'length' => 100,
-        'not null' => TRUE,
-        'default' => '',
-          'description' => 'Real Class of the stream to load',
-      )
     ),
     'primary key' => array('class'),
     'indexes' => array(

heartbeat.module

@@ -73,58 +73,61 @@ function heartbeat_theme_suggestions_heartbeat(array $variables) {
  */
 function heartbeat_entity_insert(EntityInterface $entity) {
 
-if ($entity instanceof \Drupal\node\Entity\Node) {
+  if ($entity instanceof \Drupal\node\Entity\Node) {
-
-  $nid = $entity->id();
-  $user = $entity->getOwner();
-  $type = $entity->getEntityTypeId();
-  $media = HeartBeat::mediaFieldTypes($entity->getFields());
-
-  /** @noinspection NestedTernaryOperatorInspection */
-  /** @noinspection ArrayCastingEquivalentInspection */
-//  $variables = array(
-//    '!nid' => $nid,
-//    '!entityType' => $type,
-//    '!uid' => $user->id(),
-//    '!user' => $user->getAccountName(),
-//    'media' => $media,
-//  );
 
-}
+    $nid = $entity->id();
+    $user = $entity->getOwner();
+    $type = $entity->getEntityTypeId();
+    $media = HeartBeat::mediaFieldTypes($entity->getFields());
 
-  if ($nid) {
+    /** @noinspection NestedTernaryOperatorInspection */
+    /** @noinspection ArrayCastingEquivalentInspection */
+  //  $variables = array(
+  //    '!nid' => $nid,
+  //    '!entityType' => $type,
+  //    '!uid' => $user->id(),
+  //    '!user' => $user->getAccountName(),
+  //    'media' => $media,
+  //  );
 
-    $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
-    $tokenService= \Drupal::service('token');
 
-    foreach ($heartbeatTypeService->getTypes() as $type) {
+    if ($entity->id() && $user->isAuthenticated()) {
 
-      $heartbeatTypeEntity = $heartbeatTypeService->load($type);
+      $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
-      $arguments = json_decode($heartbeatTypeEntity->getArguments());
+      $tokenService = \Drupal::service('token');
-      $argKeys = array_keys($arguments);
 
-      foreach ($arguments as $key => $argument) {
+      foreach ($heartbeatTypeService->getTypes() as $type) {
-        $variables[$key] = $argument;
+
-      }
+        $heartbeatTypeEntity = $heartbeatTypeService->load($type);
+        $arguments = json_decode($heartbeatTypeEntity->getArguments());
 
-      $preparsedMessageString = strtr($heartbeatTypeEntity->getMessage(), $variables);
+        foreach ($arguments as $key => $argument) {
+          $variables[$key] = $argument;
+        }
 
-      $entities = array(
+        $preparsedMessageString = strtr($heartbeatTypeEntity->getMessage(), $variables);
-        'node' => $entity,
-        'user' => $user,
-      );
 
-      $messageTemplate = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $media);
+        $entities = array(
+          'node' => $entity,
+          'user' => $user,
+        );
 
-//      $translatedMessage = t($messageTemplate);
+        $heartbeatMessage = Heartbeat::buildMessage($tokenService, $preparsedMessageString, $entities, $media);
 
-      $heartbeatMarkup = Heartbeat::parseMessage($messageTemplate, $variables);
+  //      $translatedMessage = t($messageTemplate);
 
-      $heartbeatActivity = new Heartbeat();
+        $heartbeatActivity = Heartbeat::create([
-      $heartbeatActivity->setName();
+          'type' => $heartbeatTypeEntity->id(),
-      $heartbeatActivity->save();
+          'uid' => $user->id(),
+          'nid' => $entity->id(),
+          'name' => 'Dev Test',
+        ]);
 
+        $heartbeatActivity->setMessage($heartbeatMessage);
 
+        $heartbeatActivity->save();
+
+      }
     }
   }
 

src/Entity/Heartbeat.php

@@ -48,7 +48,8 @@ use Drupal\user\UserInterface;
  *     "bundle" = "type",
  *     "label" = "name",
  *     "uuid" = "uuid",
- *     "uid" = "user_id",
+ *     "uid" = "uid",
+ *     "nid" = "nid",
  *     "langcode" = "langcode",
  *     "status" = "status",
  *   },
@@ -105,9 +106,6 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
    */
   public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
     parent::preCreate($storage_controller, $values);
-    $values += array(
-      'user_id' => \Drupal::currentUser()->id(),
-    );
   }
 
 
@@ -155,6 +153,27 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
     return $this;
   }
 
+  /**
+   * Gets the Heartbeat message.
+   *
+   * @return string
+   *   Message of the Heartbeat.
+   */
+  public function getMessage() {
+    return $this->get('message');
+  }
+
+  /**
+   * Sets the Heartbeat Message.
+   *
+   * @param $name
+   * @return
+   * @internal param string $message The Heartbeat Message
+   */
+  public function setMessage($message) {
+    $this->set('message', $message);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -174,21 +193,21 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
    * {@inheritdoc}
    */
   public function getOwner() {
-    return $this->get('user_id')->entity;
+    return $this->get('uid')->entity;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getOwnerId() {
-    return $this->get('user_id')->target_id;
+    return $this->get('uid')->target_id;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setOwnerId($uid) {
-    $this->set('user_id', $uid);
+    $this->set('uid', $uid);
     return $this;
   }
 
@@ -196,7 +215,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
    * {@inheritdoc}
    */
   public function setOwner(UserInterface $account) {
-    $this->set('user_id', $account->id());
+    $this->set('uid', $account->id());
     return $this;
   }
 
@@ -251,7 +270,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
-    $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
+    $fields['uid'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Authored by'))
       ->setDescription(t('The user ID of author of the Heartbeat entity.'))
       ->setRevisionable(TRUE)
@@ -276,6 +295,13 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
       ->setDisplayConfigurable('form', TRUE)
       ->setDisplayConfigurable('view', TRUE);
 
+    $fields['nid'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Node'))
+      ->setDescription(t('The content associated with this Heartbeat'))
+      ->setSetting('target_type', 'node')
+      ->setSetting('handler', 'default')
+      ->setRevisionable(TRUE);
+
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
       ->setDescription(t('The name of the Heartbeat entity.'))
@@ -297,6 +323,12 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
       ->setDisplayConfigurable('form', TRUE)
       ->setDisplayConfigurable('view', TRUE);
 
+
+    $fields['message'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Message'))
+      ->setDescription(t('The message of the Heartbeat entity.'))
+      ->setRevisionable(TRUE);
+
     $fields['status'] = BaseFieldDefinition::create('boolean')
       ->setLabel(t('Publishing status'))
       ->setDescription(t('A boolean indicating whether the Heartbeat is published.'))
@@ -503,4 +535,49 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
 
     return $names;
   }
+
+  /**
+   * Gets the Heartbeat user.
+   *
+   * @return int
+   *   The uid of the Heartbeat's user.
+   */
+  public function getUid()
+  {
+    // TODO: Implement getUid() method.
+  }
+
+  /**
+   * Sets the Heartbeat user.
+   *
+   * @param int uid
+   *   The Heartbeat user.
+   *
+   */
+  public function setUid($uid)
+  {
+    // TODO: Implement setUid() method.
+  }
+
+  /**
+   * Gets the Heartbeat's associated node nid.
+   *
+   * @return int
+   *   The nid of the Heartbeat's associated node.
+   */
+  public function getNid() {
+    return $this->get('nid');
+  }
+
+  /**
+   * Sets the Heartbeat user.
+   *
+   * @param int uid
+   *   The Heartbeat user.
+   *
+   */
+  public function setNid($nid) {
+    $this->set('nid', $nid);
+  }
+
 }

src/Entity/HeartbeatInterface.php

@@ -45,6 +45,59 @@ interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface
    */
   public function setName($name);
 
+  /**
+   * Gets the Heartbeat message.
+   *
+   * @return string
+   *   Message of the Heartbeat.
+   */
+  public function getMessage();
+
+  /**
+   * Sets the Heartbeat Message.
+   *
+   * @param $name
+   * @return
+   * @internal param string $message The Heartbeat Message
+   */
+  public function setMessage($message);
+
+
+  /**
+   * Gets the Heartbeat user.
+   *
+   * @return int
+   *   The uid of the Heartbeat's user.
+   */
+  public function getUid();
+
+  /**
+   * Sets the Heartbeat user.
+   *
+   * @param int uid
+   *   The Heartbeat user.
+   *
+   */
+  public function setUid($uid);
+
+
+  /**
+   * Gets the Heartbeat's associated node nid.
+   *
+   * @return int
+   *   The nid of the Heartbeat's associated node.
+   */
+  public function getNid();
+
+  /**
+   * Sets the Heartbeat user.
+   *
+   * @param int uid
+   *   The Heartbeat user.
+   *
+   */
+  public function setNid($nid);
+
   /**
    * Gets the Heartbeat creation timestamp.
    *