Fix Session.delete() handling in gap analysis cleanup (#826)

Author: akashrajeev

application/database/db.py

@@ -1531,10 +1531,16 @@ def delete_gapanalysis_results_for(self, node_name):
             .filter(GapAnalysisResults.cache_key.like(f"%{node_name}%"))
             .all()
         )
+        deleted_count = 0
         for r in res:
-            result = self.session.delete(r)
-            if result:
-                logger.info(f"deleted {result.rowcount} objects")
+            self.session.delete(r)
+            deleted_count += 1
+        if deleted_count:
+            logger.info(
+                "deleted %s gap analysis result objects for node %s",
+                deleted_count,
+                node_name,
+            )
         self.session.commit()
         self.session.flush()
         return res

application/tests/db_test.py

@@ -2158,6 +2158,27 @@ def test_get_standard_names(self):
             self.collection.standards(),
         )
 
+    def test_delete_gapanalysis_results_for_deletes_and_logs_count(self):
+        node_name = "BarStand"
+        key_1 = f"cache-{node_name}-1"
+        key_2 = f"cache-{node_name}-2"
+        unrelated_key = "cache-unrelated"
+
+        self.collection.add_gap_analysis_result(key_1, "{}")
+        self.collection.add_gap_analysis_result(key_2, "{}")
+        self.collection.add_gap_analysis_result(unrelated_key, "{}")
+
+        with patch.object(db.logger, "info") as logger_info:
+            deleted = self.collection.delete_gapanalysis_results_for(node_name)
+
+        self.assertEqual(2, len(deleted))
+        self.assertFalse(self.collection.gap_analysis_exists(key_1))
+        self.assertFalse(self.collection.gap_analysis_exists(key_2))
+        self.assertTrue(self.collection.gap_analysis_exists(unrelated_key))
+        logger_info.assert_any_call(
+            "deleted %s gap analysis result objects for node %s", 2, node_name
+        )
+
     def test_all_cres_with_pagination(self):
         """"""
         cres = []