From 9fc6ecd447215c2f00f8a3338b697bf7b7478523 Mon Sep 17 00:00:00 2001
From: Xander De Jaegere <xander.dejaegere@dynapps.be>
Date: Mon, 1 Aug 2022 09:22:12 +0200
Subject: [PATCH] [15.0-mig-mass] [MIG] mass_mailing_list_dynamic: Migration to
 15.0

---
 mass_mailing_list_dynamic/__manifest__.py       |  2 +-
 .../models/mailing_list.py                      |  2 +-
 .../readme/CONTRIBUTORS.rst                     |  4 ++++
 .../tests/test_dynamic_lists.py                 | 17 ++++++++---------
 .../views/mailing_list_view.xml                 |  4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/mass_mailing_list_dynamic/__manifest__.py b/mass_mailing_list_dynamic/__manifest__.py
index 863e50ae4..b1745662b 100644
--- a/mass_mailing_list_dynamic/__manifest__.py
+++ b/mass_mailing_list_dynamic/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Dynamic Mass Mailing Lists",
     "summary": "Mass mailing lists that get autopopulated",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "category": "Marketing",
     "website": "https://github.com/OCA/social",
     "author": "Tecnativa, Odoo Community Association (OCA)",
diff --git a/mass_mailing_list_dynamic/models/mailing_list.py b/mass_mailing_list_dynamic/models/mailing_list.py
index a57aad9f1..0087320e8 100644
--- a/mass_mailing_list_dynamic/models/mailing_list.py
+++ b/mass_mailing_list_dynamic/models/mailing_list.py
@@ -65,7 +65,7 @@ class MassMailingList(models.Model):
             Contact.create(vals_list)
             one.is_synced = True
         # Invalidate cached contact count
-        self.invalidate_cache(["contact_nbr"], dynamic.ids)
+        self.invalidate_cache(["contact_count"], dynamic.ids)
 
     @api.onchange("dynamic", "sync_method", "sync_domain")
     def _onchange_dynamic(self):
diff --git a/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst b/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst
index c7c190287..6bc7a8624 100644
--- a/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst
+++ b/mass_mailing_list_dynamic/readme/CONTRIBUTORS.rst
@@ -9,3 +9,7 @@
 * `Hibou Corp. <https://hibou.io>`_:
 
   * Jared Kipe <jared@hibou.io>
+
+* `Dynapps N.V. <https://www.dynapps.be>`_:
+
+  * Xander De Jaegere
diff --git a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py
index 7dbd87e77..e5f55b331 100644
--- a/mass_mailing_list_dynamic/tests/test_dynamic_lists.py
+++ b/mass_mailing_list_dynamic/tests/test_dynamic_lists.py
@@ -5,12 +5,11 @@
 from mock import patch
 
 from odoo.exceptions import ValidationError
-from odoo.tests import common
+from odoo.tests import common, tagged
 
 
-class DynamicListCase(common.SavepointCase):
-    post_install = True
-
+@tagged("post_install", "-at_install")
+class DynamicListCase(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -53,12 +52,12 @@ class DynamicListCase(common.SavepointCase):
             {"list_ids": [(4, self.list.id)], "partner_id": self.partners[0].id}
         )
         self.list.flush()
-        self.assertEqual(self.list.contact_nbr, 1)
+        self.assertEqual(self.list.contact_count, 1)
         # Set list as add-synced
         self.list.dynamic = True
         self.list.action_sync()
         self.list.flush()
-        self.assertEqual(self.list.contact_nbr, 4)
+        self.assertEqual(self.list.contact_count, 4)
         self.assertTrue(contact0.exists())
         # Set list as full-synced
         self.list.sync_method = "full"
@@ -70,7 +69,7 @@ class DynamicListCase(common.SavepointCase):
         ).unlink()
         self.list.action_sync()
         self.list.flush()
-        self.assertEqual(self.list.contact_nbr, 3)
+        self.assertEqual(self.list.contact_count, 3)
         self.assertFalse(contact0.exists())
         # Cannot add or edit contacts in fully synced lists
         with self.assertRaises(ValidationError):
@@ -95,7 +94,7 @@ class DynamicListCase(common.SavepointCase):
         """Check that list in synced when sending a mass mailing."""
         self.list.action_sync()
         self.list.flush()
-        self.assertEqual(self.list.contact_nbr, 5)
+        self.assertEqual(self.list.contact_count, 5)
         # Create a new partner
         self.partners.create(
             {
@@ -109,7 +108,7 @@ class DynamicListCase(common.SavepointCase):
             self.mail.action_send_mail()
             self.assertEqual(1, s.call_count)
         self.list.flush()
-        self.assertEqual(6, self.list.contact_nbr)
+        self.assertEqual(6, self.list.contact_count)
 
     def test_load_filter(self):
         domain = "[('id', '=', 1)]"
diff --git a/mass_mailing_list_dynamic/views/mailing_list_view.xml b/mass_mailing_list_dynamic/views/mailing_list_view.xml
index 4346810e6..b41b5ec8c 100644
--- a/mass_mailing_list_dynamic/views/mailing_list_view.xml
+++ b/mass_mailing_list_dynamic/views/mailing_list_view.xml
@@ -64,12 +64,12 @@
                     />
                 </group>
             </xpath>
-            <field name="contact_nbr" position="attributes">
+            <field name="contact_count" position="attributes">
                 <attribute name="attrs">
                     {'invisible': [('is_synced', '=', False)]}
                 </attribute>
             </field>
-            <field name="contact_nbr" position="after">
+            <field name="contact_count" position="after">
                 <span attrs="{'invisible': [('is_synced', '=', True)]}">
                     <strong>???</strong>
                 </span>