Make Storage testable & add tests

[friendica.git] / src / Database / PostUpdate.php

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 76ec3ea01ce9a6868c7b08520a22229929c25301..f0050e0ef353f3b0298c87d2d896cdf0876b2169 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -10,6 +10,7 @@ use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
+use Friendica\Model\UserItem;
 use Friendica\Model\PermissionSet;
 
 /**
@@ -40,6 +41,9 @@ class PostUpdate
                if (!self::update1322()) {
                        return false;
                }
+               if (!self::update1329()) {
+                       return false;
+               }
 
                return true;
        }
@@ -420,7 +424,7 @@ class PostUpdate
                return true;
        }
        /**
-        * Set the delivery queue count to a negative value for all items preceding the feature.
+        * Remove contact duplicates
         *
         * @return bool "true" when the job is done
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -434,14 +438,16 @@ class PostUpdate
 
                Logger::info('Start');
 
-               $contacts = DBA::p("SELECT ANY_VALUE(`id`) AS `id` FROM `contact`
+               $contacts = DBA::p("SELECT `nurl`, `uid` FROM `contact`
                        WHERE EXISTS (SELECT `nurl` FROM `contact` AS `c2`
-                               WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` = `contact`.`network`)
-                       AND `network` IN (?, ?, ?) GROUP BY `nurl`", Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB);
+                               WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` IN (?, ?, ?) AND NOT `deleted`)
+                       AND (`network` IN (?, ?, ?) OR (`uid` = ?)) AND NOT `deleted` GROUP BY `nurl`, `uid`",
+                       Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB,
+                       Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, 0);
 
                while ($contact = DBA::fetch($contacts)) {
-                       Logger::info('Remove duplicates', ['id' => $contact['id']]);
-                       Contact::handleDuplicateByID($contact['id']);
+                       Logger::info('Remove duplicates', ['nurl' => $contact['nurl'], 'uid' => $contact['uid']]);
+                       Contact::removeDuplicates($contact['nurl'], $contact['uid']);
                }
 
                DBA::close($contact);
@@ -451,4 +457,54 @@ class PostUpdate
 
                return true;
        }
+
+       /**
+        * @brief update user-item data with notifications
+        *
+        * @return bool "true" when the job is done
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+       private static function update1329()
+       {
+               // Was the script completed?
+               if (Config::get('system', 'post_update_version') >= 1329) {
+                       return true;
+               }
+
+               $id = Config::get('system', 'post_update_version_1329_id', 0);
+
+               Logger::info('Start', ['item' => $id]);
+
+               $start_id = $id;
+               $rows = 0;
+               $condition = ["`id` > ?", $id];
+               $params = ['order' => ['id'], 'limit' => 10000];
+               $items = DBA::select('item', ['id'], $condition, $params);
+
+               if (DBA::errorNo() != 0) {
+                       Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]);
+                       return false;
+               }
+
+               while ($item = DBA::fetch($items)) {
+                       $id = $item['id'];
+
+                       UserItem::setNotification($item['id']);
+
+                       ++$rows;
+               }
+               DBA::close($items);
+
+               Config::set('system', 'post_update_version_1329_id', $id);
+
+               Logger::info('Processed', ['rows' => $rows, 'last' => $id]);
+
+               if ($start_id == $id) {
+                       Config::set('system', 'post_update_version', 1329);
+                       Logger::info('Done');
+                       return true;
+               }
+
+               return false;
+       }
 }