Merge pull request #60 from istolar/OI-298-nofitication-bug-fix

OI-298: Fix notifications bug.
linnovate · Feb 25, 2021 · 33740ac · 33740ac
2 parents b3aca78 + c574e04
commit 33740ac
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -233,6 +233,7 @@
         "drupal/twig_field_value": "^2.0",
         "drupal/twig_tweak": "^2.5",
         "drupal/ultimate_cron": "^2.0@alpha",
+        "drupal/update_helper": "^2.0",
         "drupal/user_registrationpassword": "1.x-dev",
         "drupal/userpoints": "^1.0@alpha",
         "drupal/views_data_export": "^1.0",

diff --git a/idea.info.yml b/idea.info.yml
@@ -123,6 +123,7 @@ dependencies:
   - openideal_footer:openideal_footer
   - openideal_login:openideal_login
   - openideal_statistics:openideal_statistics
+  - update_helper:update_helper
 
 themes:
   - adminimal_theme

diff --git a/...e_a_message_after_replying_on_comment.yml → ...e_a_message_after_replying_on_comment.yml b/...e_a_message_after_replying_on_comment.yml → ...e_a_message_after_replying_on_comment.yml
@@ -20,15 +20,26 @@ expression:
     conditions:
       -
         id: rules_condition
-        uuid: 7cd3932b-b234-4283-9b5a-ceb3cdc2ebf7
-        weight: 0
+        uuid: 7309dabd-c050-4003-97c5-3c06c6517790
+        weight: -50
         context_values: {  }
         context_mapping:
           data: comment.pid
         context_processors: {  }
         provides_mapping: {  }
         condition_id: rules_data_is_empty
         negate: true
+      -
+        id: rules_condition
+        uuid: 7cd3932b-b234-4283-9b5a-ceb3cdc2ebf7
+        weight: -49
+        context_values: {  }
+        context_mapping:
+          data: comment.pid.target_id
+        context_processors: {  }
+        provides_mapping: {  }
+        condition_id: rules_data_is_empty
+        negate: true
   actions:
     id: rules_action_set
     uuid: 656824a8-1d2e-4f68-b4d3-de90852222fc

diff --git a/....create_message_after_posting_comment.yml → ....create_message_after_posting_comment.yml b/....create_message_after_posting_comment.yml → ....create_message_after_posting_comment.yml
diff --git a/...reate_message_after_voting_on_comment.yml → ...reate_message_after_voting_on_comment.yml b/...reate_message_after_voting_on_comment.yml → ...reate_message_after_voting_on_comment.yml
diff --git a/...ion.earn_points_for_posting_a_comment.yml → ...ion.earn_points_for_posting_a_comment.yml b/...ion.earn_points_for_posting_a_comment.yml → ...ion.earn_points_for_posting_a_comment.yml
diff --git a/modules/openideal_comment/config/update/openideal_comment_update_8001.yml b/modules/openideal_comment/config/update/openideal_comment_update_8001.yml
@@ -0,0 +1,36 @@
+rules.reaction.create_a_message_after_replying_on_comment:
+  expected_config:
+    expression:
+      conditions:
+        uuid: 09bb26de-96be-4b7b-8746-80661e94d0d3
+  update_actions:
+    delete:
+      expression:
+        conditions:
+    change:
+      expression:
+        conditions:
+          id: rules_and
+          uuid: 09bb26de-96be-4b7b-8746-80661e94d0d3
+          weight: 0
+          conditions:
+            - id: rules_condition
+              uuid: 7309dabd-c050-4003-97c5-3c06c6517790
+              weight: -50
+              context_values: { }
+              context_mapping:
+                data: comment.pid
+              context_processors: { }
+              provides_mapping: { }
+              condition_id: rules_data_is_empty
+              negate: true
+            - id: rules_condition
+              uuid: 7cd3932b-b234-4283-9b5a-ceb3cdc2ebf7
+              weight: -49
+              context_values: { }
+              context_mapping:
+                data: comment.pid.target_id
+              context_processors: { }
+              provides_mapping: { }
+              condition_id: rules_data_is_empty
+              negate: true
diff --git a/modules/openideal_comment/openideal_comment.install b/modules/openideal_comment/openideal_comment.install
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains main install/updates hooks for openideal comment module.
+ */
+
+/**
+ * Configuration update.
+ */
+function openideal_comment_update_8001() {
+  if (!\Drupal::moduleHandler()->moduleExists('update_helper')) {
+    \Drupal::service('module_installer')->install(['update_helper']);
+  }
+  /** @var \Drupal\update_helper\Updater $updateHelper */
+  $updateHelper = \Drupal::service('update_helper.updater');
+
+  // Execute configuration update definitions with logging of success.
+  $updateHelper->executeUpdate('openideal_comment', 'openideal_comment_update_8001');
+
+  // Output logged messages to related channel of update execution.
+  return $updateHelper->logger()->output();
+}