test(fdroidmarket): fix deletion of apps on update

Signed-off-by: Thierry Bugier <[email protected]>

Author: btry

inc/fdroidmarket.class.php

@@ -130,10 +130,9 @@ public function updateRepository() {
       $fdroid = simplexml_load_string($xml);
       unset($xml);
 
+      $marketFk = $this::getForeignKeyField();
+      $DB->query("UPDATE `" . PluginFlyvemdmFDroidApplication::getTable() . "` SET `is_available` = '0' WHERE `$marketFk`=" . $this->getID());
       if (isset($fdroid->application)) {
-         $marketFk = $this::getForeignKeyField();
-         $fdroidApplication = new PluginFlyvemdmFDroidApplication();
-         $DB->query("UPDATE `" . PluginFlyvemdmFDroidApplication::getTable() . "` SET `is_available` = '0' WHERE `$marketFk`=" . $this->getID());
          foreach ($fdroid->application as $application) {
             $input = [
                'name'         => Toolbox::addslashes_deep($application->name),
@@ -163,15 +162,14 @@ public function updateRepository() {
             }
          }
 
-         // Delete applications vanished from the repo
-         $criteria = [$marketFk => $this->getID(), 'is_available' => '0'];
-         if (isCommandline()) {
-            $dbUtils = new DbUtils();
-            $deleteCount = $dbUtils->countElementsInTable(PluginFlyvemdmFDroidApplication::getTable(), $criteria);
-         }
-         $fdroidApplication->deleteByCriteria($criteria);
-         $volume = count($fdroid->application) + $deleteCount;
       }
+      // Delete applications vanished from the repo
+      $criteria = [$marketFk => $this->getID(), 'is_available' => '0'];
+      $dbUtils = new DbUtils();
+      $deleteCount = $dbUtils->countElementsInTable(PluginFlyvemdmFDroidApplication::getTable(), $criteria);
+      $fdroidApplication = new PluginFlyvemdmFDroidApplication();
+      $fdroidApplication->deleteByCriteria($criteria);
+      $volume = count($fdroid->application) + $deleteCount;
 
       return $volume;
    }

inc/mqttclient.class.php

@@ -23,7 +23,7 @@
  * ------------------------------------------------------------------------------
  * @author    Thierry Bugier
  * @copyright Copyright © 2018 Teclib
- * @license   http://www.gnu.org/licenses/agpl.txt AGPLv3+
+ * @license   AGPLv3+ http://www.gnu.org/licenses/agpl.txt
  * @link      https://github.com/flyve-mdm/glpi-plugin
  * @link      https://flyve-mdm.com/
  * ------------------------------------------------------------------------------
@@ -148,6 +148,7 @@ public function publish($topic, $message, $qos = 0, $retain = 0) {
             $log = new PluginFlyvemdmMqttlog();
             if (self::$mqtt->publish_sync($topic, $message, $qos, $retain)) {
                $log->saveOutgoingMqttMessage($topic, $message);
+
                return true;
             }
          } else {

tests/suite-unit/PluginFlyvemdmFdroidMarket.php

@@ -146,6 +146,7 @@ public function testCronUpdateRepositories() {
    }
 
    public function testUpdateRepository() {
+      // Create a market instance for the test
       $fixtureFile = __DIR__ . '/../fixtures/fdroid-repo.xml';
       $this->boolean(is_readable($fixtureFile));
       $instance = $this->newTestedInstance();
@@ -157,10 +158,25 @@ public function testUpdateRepository() {
       $instance->getFromDB($instance->getID());
       $instance->updateRepository();
 
+
+      // Check that the application found in the xml is created
       $fdroidApplication = new \PluginFlyvemdmFDroidApplication();
       $marketFk = \PluginFlyvemdmFDroidMarket::getForeignKeyField();
       $marketId = $instance->getID();
       $rows = $fdroidApplication->find("`$marketFk` = '$marketId'");
       $this->array($rows)->size->isEqualTo(1, json_encode($rows, JSON_PRETTY_PRINT));
+
+      // Emulate an update of the market with the ap removed from it
+      $fixtureFile = __DIR__ . '/../fixtures/fdroid-repo-app-removed.xml';
+      $instance->update([
+         'id' => $instance->getID(),
+         'url' => $fixtureFile,
+      ]);
+
+      $instance->updateRepository();
+
+      // Check that the app is removed from the db
+      $rows = $fdroidApplication->find("`$marketFk` = '$marketId'");
+      $this->array($rows)->size->isEqualTo(0, json_encode($rows, JSON_PRETTY_PRINT));
    }
 }