From e12bf0ace34473a97178530fdfee0b72cd89a576 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 2 Mar 2021 23:40:15 +1300
Subject: [PATCH] Also add created_date & modified_date per discussion on pr

---
 CRM/Contact/DAO/SavedSearch.php               | 44 ++++++++++++++++++-
 CRM/Upgrade/Incremental/php/FiveThirtySix.php |  5 +++
 xml/schema/Contact/SavedSearch.xml            | 16 +++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php
index 0cbbcca576..7ae09f365e 100644
--- a/CRM/Contact/DAO/SavedSearch.php
+++ b/CRM/Contact/DAO/SavedSearch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SavedSearch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6a33a7d434232c0d9796934dcb29edf8)
+ * (GenCodeChecksum:25d5385ad222a7a7290fd18b3a27af8a)
  */
 
 /**
@@ -107,6 +107,20 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
    */
   public $expires_date;
 
+  /**
+   * When the search was created.
+   *
+   * @var timestamp
+   */
+  public $created_date;
+
+  /**
+   * When the search was lase modified.
+   *
+   * @var timestamp
+   */
+  public $modified_date;
+
   /**
    * Class constructor.
    */
@@ -318,6 +332,34 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'localizable' => 0,
           'add' => '5.36',
         ],
+        'created_date' => [
+          'name' => 'created_date',
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
+          'title' => ts('Created Date'),
+          'description' => ts('When the search was created.'),
+          'required' => TRUE,
+          'where' => 'civicrm_saved_search.created_date',
+          'default' => 'CURRENT_TIMESTAMP',
+          'table_name' => 'civicrm_saved_search',
+          'entity' => 'SavedSearch',
+          'bao' => 'CRM_Contact_BAO_SavedSearch',
+          'localizable' => 0,
+          'add' => '5.36',
+        ],
+        'modified_date' => [
+          'name' => 'modified_date',
+          'type' => CRM_Utils_Type::T_TIMESTAMP,
+          'title' => ts('Modified Date'),
+          'description' => ts('When the search was lase modified.'),
+          'required' => TRUE,
+          'where' => 'civicrm_saved_search.modified_date',
+          'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+          'table_name' => 'civicrm_saved_search',
+          'entity' => 'SavedSearch',
+          'bao' => 'CRM_Contact_BAO_SavedSearch',
+          'localizable' => 0,
+          'add' => '5.36',
+        ],
       ];
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
     }
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtySix.php b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
index ab903d7061..0eb9278a9f 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtySix.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
@@ -75,6 +75,11 @@ class CRM_Upgrade_Incremental_php_FiveThirtySix extends CRM_Upgrade_Incremental_
       'civicrm_saved_search', 'modified_id', "int(10) unsigned DEFAULT NULL COMMENT 'FK to contact table.'");
     $this->addTask('core-issue#2422 - Add expires_date to civicrm_saved_search', 'addColumn',
       'civicrm_saved_search', 'expires_date', "timestamp NULL DEFAULT NULL COMMENT 'Optional date after which the search is not needed'");
+    $this->addTask('core-issue#2422 - Add created_date to civicrm_saved_search', 'addColumn',
+      'civicrm_saved_search', 'created_date', "timestamp NULL  DEFAULT CURRENT_TIMESTAMP COMMENT 'When the search was created.'");
+    $this->addTask('core-issue#2422 - Add modified_date to civicrm_saved_search', 'addColumn',
+      'civicrm_saved_search', 'modified_date', "timestamp NULL  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the search was last modified.'");
+
     $this->addTask('core-issue#2422 - Add constraints to civicrm_saved_search', 'taskAddConstraints');
 
   }
diff --git a/xml/schema/Contact/SavedSearch.xml b/xml/schema/Contact/SavedSearch.xml
index 452c320f3a..d5bd5213f4 100644
--- a/xml/schema/Contact/SavedSearch.xml
+++ b/xml/schema/Contact/SavedSearch.xml
@@ -178,4 +178,20 @@
     <comment>Optional date after which the search is not needed</comment>
     <add>5.36</add>
   </field>
+  <field>
+    <name>created_date</name>
+    <type>timestamp</type>
+    <comment>When the search was created.</comment>
+    <required>true</required>
+    <default>CURRENT_TIMESTAMP</default>
+    <add>5.36</add>
+  </field>
+  <field>
+    <name>modified_date</name>
+    <type>timestamp</type>
+    <comment>When the search was lase modified.</comment>
+    <required>true</required>
+    <default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
+    <add>5.36</add>
+  </field>
 </table>
-- 
2.25.1