From d5f42a6293535519de6e77e588495f117725e198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Roche?= Date: Mon, 21 Jun 2021 08:55:16 +0200 Subject: [PATCH 01/14] [ADD] 14.0_sms_no_automatic_delete --- sms_no_automatic_delete/__init__.py | 1 + sms_no_automatic_delete/__manifest__.py | 17 ++++++ sms_no_automatic_delete/data/ir_cron_data.xml | 14 +++++ sms_no_automatic_delete/models/__init__.py | 1 + sms_no_automatic_delete/models/sms_sms.py | 25 +++++++++ .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 1 + sms_no_automatic_delete/readme/USAGE.rst | 1 + sms_no_automatic_delete/tests/__init__.py | 1 + .../tests/test_purge_and_unlink_sms.py | 54 +++++++++++++++++++ 10 files changed, 117 insertions(+) create mode 100644 sms_no_automatic_delete/__init__.py create mode 100644 sms_no_automatic_delete/__manifest__.py create mode 100644 sms_no_automatic_delete/data/ir_cron_data.xml create mode 100644 sms_no_automatic_delete/models/__init__.py create mode 100644 sms_no_automatic_delete/models/sms_sms.py create mode 100644 sms_no_automatic_delete/readme/CONTRIBUTORS.rst create mode 100644 sms_no_automatic_delete/readme/DESCRIPTION.rst create mode 100644 sms_no_automatic_delete/readme/USAGE.rst create mode 100644 sms_no_automatic_delete/tests/__init__.py create mode 100644 sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py diff --git a/sms_no_automatic_delete/__init__.py b/sms_no_automatic_delete/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/sms_no_automatic_delete/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sms_no_automatic_delete/__manifest__.py b/sms_no_automatic_delete/__manifest__.py new file mode 100644 index 000000000..66a4e57e1 --- /dev/null +++ b/sms_no_automatic_delete/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2021 Akretion (http://www.akretion.com). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "No automatic deletion of SMS", + "summary": "Avoid automatic delete of sended sms", + "author": "Akretion", + "website": "https://github.com/OCA/connector-telephony", + "license": "AGPL-3", + "category": "", + "version": "14.0.1.0.0", + "depends": ["sms"], + "data": [ + "data/ir_cron_data.xml", + ], + "application": False, + "installable": True, +} diff --git a/sms_no_automatic_delete/data/ir_cron_data.xml b/sms_no_automatic_delete/data/ir_cron_data.xml new file mode 100644 index 000000000..1bb7619f0 --- /dev/null +++ b/sms_no_automatic_delete/data/ir_cron_data.xml @@ -0,0 +1,14 @@ + + + + SMS: SMS Purge + + code + model._purge(days=90) + + 1 + days + -1 + + + diff --git a/sms_no_automatic_delete/models/__init__.py b/sms_no_automatic_delete/models/__init__.py new file mode 100644 index 000000000..d302db28a --- /dev/null +++ b/sms_no_automatic_delete/models/__init__.py @@ -0,0 +1 @@ +from . import sms_sms diff --git a/sms_no_automatic_delete/models/sms_sms.py b/sms_no_automatic_delete/models/sms_sms.py new file mode 100644 index 000000000..905f600dd --- /dev/null +++ b/sms_no_automatic_delete/models/sms_sms.py @@ -0,0 +1,25 @@ +# Copyright 2021 Akretion (https://www.akretion.com). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import datetime, timedelta + +from odoo import api, models +from odoo.tools import DEFAULT_SERVER_DATE_FORMAT + + +class SmsSms(models.Model): + _inherit = "sms.sms" + + @api.model + def _purge(self, days): + + purge_day = datetime.now() - timedelta(days=days) + purge_day = purge_day.strftime(DEFAULT_SERVER_DATE_FORMAT) + sms = self.env["sms.sms"].search([("write_date", "<=", purge_day)]) + sms.with_context(force_unlink=True).unlink() + + def unlink(self): + if self._context.get("force_unlink"): + return super().unlink() + else: + return True diff --git a/sms_no_automatic_delete/readme/CONTRIBUTORS.rst b/sms_no_automatic_delete/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..508b86e4e --- /dev/null +++ b/sms_no_automatic_delete/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Kévin Roche +* Sébastien Beau diff --git a/sms_no_automatic_delete/readme/DESCRIPTION.rst b/sms_no_automatic_delete/readme/DESCRIPTION.rst new file mode 100644 index 000000000..df55d5c29 --- /dev/null +++ b/sms_no_automatic_delete/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to save sent sms and to delete them after a delay (in days). diff --git a/sms_no_automatic_delete/readme/USAGE.rst b/sms_no_automatic_delete/readme/USAGE.rst new file mode 100644 index 000000000..439622cfb --- /dev/null +++ b/sms_no_automatic_delete/readme/USAGE.rst @@ -0,0 +1 @@ +To delete sent sms, the cron "SMS: SMS Purge" is used in order to choice the maximum days a sms will be saved (by default : days = 90). diff --git a/sms_no_automatic_delete/tests/__init__.py b/sms_no_automatic_delete/tests/__init__.py new file mode 100644 index 000000000..d5d5460e8 --- /dev/null +++ b/sms_no_automatic_delete/tests/__init__.py @@ -0,0 +1 @@ +from . import test_purge_and_unlink_sms diff --git a/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py b/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py new file mode 100644 index 000000000..3e0ab75dd --- /dev/null +++ b/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py @@ -0,0 +1,54 @@ +# Copyright 2021 Akretion (https://www.akretion.com). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import datetime, timedelta + +from odoo.tests.common import TransactionCase +from odoo.tools import DEFAULT_SERVER_DATE_FORMAT + + +class TestSmsPurge(TransactionCase): + def setUp(self): + super(TestSmsPurge, self).setUp() + self.sms_sms = self.env["sms.sms"] + + sms_30_days_ago = datetime.now() - timedelta(days=30) + sms_61_days_ago = datetime.now() - timedelta(days=61) + sms_91_days_ago = datetime.now() - timedelta(days=91) + + sms_30_days_ago = sms_30_days_ago.strftime(DEFAULT_SERVER_DATE_FORMAT) + sms_61_days_ago = sms_61_days_ago.strftime(DEFAULT_SERVER_DATE_FORMAT) + sms_91_days_ago = sms_91_days_ago.strftime(DEFAULT_SERVER_DATE_FORMAT) + + self.sms1 = self.sms_sms.create( + { + "state": "sent", + "write_date": sms_30_days_ago, + } + ) + self.sms2 = self.sms_sms.create( + { + "state": "sent", + "write_date": sms_61_days_ago, + } + ) + self.sms3 = self.sms_sms.create( + { + "state": "sent", + "write_date": sms_91_days_ago, + } + ) + + def test_sms_purge(self): + + self.sms_sms._purge(120) + self.assertEqual(len(self.sms_sms.search([])), 3) + + self.sms_sms._purge(90) + self.assertEqual(len(self.sms_sms.search([])), 2) + + self.sms_sms._purge(60) + self.assertEqual(len(self.sms_sms.search([])), 1) + + self.sms_sms._purge(0) + self.assertEqual(len(self.sms_sms.search([])), 0) From b02f8593630466b9765e3f0c3b6f8596914ba351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Roche?= Date: Mon, 21 Jun 2021 09:30:19 +0200 Subject: [PATCH 02/14] change datetime calls --- sms_no_automatic_delete/models/sms_sms.py | 8 +++----- .../tests/test_purge_and_unlink_sms.py | 17 +++-------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/sms_no_automatic_delete/models/sms_sms.py b/sms_no_automatic_delete/models/sms_sms.py index 905f600dd..e21ad31d3 100644 --- a/sms_no_automatic_delete/models/sms_sms.py +++ b/sms_no_automatic_delete/models/sms_sms.py @@ -4,7 +4,6 @@ from datetime import datetime, timedelta from odoo import api, models -from odoo.tools import DEFAULT_SERVER_DATE_FORMAT class SmsSms(models.Model): @@ -12,10 +11,9 @@ class SmsSms(models.Model): @api.model def _purge(self, days): - - purge_day = datetime.now() - timedelta(days=days) - purge_day = purge_day.strftime(DEFAULT_SERVER_DATE_FORMAT) - sms = self.env["sms.sms"].search([("write_date", "<=", purge_day)]) + sms = self.env["sms.sms"].search( + [("write_date", "<=", datetime.now() - timedelta(days=days))] + ) sms.with_context(force_unlink=True).unlink() def unlink(self): diff --git a/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py b/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py index 3e0ab75dd..dd68f8d29 100644 --- a/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py +++ b/sms_no_automatic_delete/tests/test_purge_and_unlink_sms.py @@ -4,43 +4,32 @@ from datetime import datetime, timedelta from odoo.tests.common import TransactionCase -from odoo.tools import DEFAULT_SERVER_DATE_FORMAT class TestSmsPurge(TransactionCase): def setUp(self): super(TestSmsPurge, self).setUp() self.sms_sms = self.env["sms.sms"] - - sms_30_days_ago = datetime.now() - timedelta(days=30) - sms_61_days_ago = datetime.now() - timedelta(days=61) - sms_91_days_ago = datetime.now() - timedelta(days=91) - - sms_30_days_ago = sms_30_days_ago.strftime(DEFAULT_SERVER_DATE_FORMAT) - sms_61_days_ago = sms_61_days_ago.strftime(DEFAULT_SERVER_DATE_FORMAT) - sms_91_days_ago = sms_91_days_ago.strftime(DEFAULT_SERVER_DATE_FORMAT) - self.sms1 = self.sms_sms.create( { "state": "sent", - "write_date": sms_30_days_ago, + "write_date": datetime.now() - timedelta(days=30), } ) self.sms2 = self.sms_sms.create( { "state": "sent", - "write_date": sms_61_days_ago, + "write_date": datetime.now() - timedelta(days=61), } ) self.sms3 = self.sms_sms.create( { "state": "sent", - "write_date": sms_91_days_ago, + "write_date": datetime.now() - timedelta(days=91), } ) def test_sms_purge(self): - self.sms_sms._purge(120) self.assertEqual(len(self.sms_sms.search([])), 3) From 305a4514febb59becea5521a9abeadacaf467e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Roche?= Date: Tue, 22 Jun 2021 20:09:54 +0200 Subject: [PATCH 03/14] add readme and OCA author --- sms_no_automatic_delete/README.rst | 79 ++++ sms_no_automatic_delete/__manifest__.py | 2 +- .../static/description/index.html | 425 ++++++++++++++++++ 3 files changed, 505 insertions(+), 1 deletion(-) create mode 100644 sms_no_automatic_delete/README.rst create mode 100644 sms_no_automatic_delete/static/description/index.html diff --git a/sms_no_automatic_delete/README.rst b/sms_no_automatic_delete/README.rst new file mode 100644 index 000000000..c8cb92227 --- /dev/null +++ b/sms_no_automatic_delete/README.rst @@ -0,0 +1,79 @@ +============================ +No automatic deletion of SMS +============================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fconnector--telephony-lightgray.png?logo=github + :target: https://github.com/OCA/connector-telephony/tree/14.0/sms_no_automatic_delete + :alt: OCA/connector-telephony +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/connector-telephony-14-0/connector-telephony-14-0-sms_no_automatic_delete + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/228/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to save sent sms and to delete them after a delay (in days). + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To delete sent sms, the cron "SMS: SMS Purge" is used in order to choice the maximum days a sms will be saved (by default : days = 90). + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Akretion + +Contributors +~~~~~~~~~~~~ + +* Kévin Roche +* Sébastien Beau + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/connector-telephony `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sms_no_automatic_delete/__manifest__.py b/sms_no_automatic_delete/__manifest__.py index 66a4e57e1..d04fd6003 100644 --- a/sms_no_automatic_delete/__manifest__.py +++ b/sms_no_automatic_delete/__manifest__.py @@ -3,7 +3,7 @@ { "name": "No automatic deletion of SMS", "summary": "Avoid automatic delete of sended sms", - "author": "Akretion", + "author": "Akretion,Odoo Community Association (OCA)", "website": "https://github.com/OCA/connector-telephony", "license": "AGPL-3", "category": "", diff --git a/sms_no_automatic_delete/static/description/index.html b/sms_no_automatic_delete/static/description/index.html new file mode 100644 index 000000000..84d86c2bf --- /dev/null +++ b/sms_no_automatic_delete/static/description/index.html @@ -0,0 +1,425 @@ + + + + + + +No automatic deletion of SMS + + + +
+

No automatic deletion of SMS

+ + +

Beta License: AGPL-3 OCA/connector-telephony Translate me on Weblate Try me on Runbot

+

This module allows to save sent sms and to delete them after a delay (in days).

+

Table of contents

+ +
+

Usage

+

To delete sent sms, the cron “SMS: SMS Purge” is used in order to choice the maximum days a sms will be saved (by default : days = 90).

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/connector-telephony project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 6d240c58455107271bcddc236414280e4971ed77 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 2 Jul 2021 14:14:58 +0000 Subject: [PATCH 04/14] [UPD] Update sms_no_automatic_delete.pot --- .../i18n/sms_no_automatic_delete.pot | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 sms_no_automatic_delete/i18n/sms_no_automatic_delete.pot diff --git a/sms_no_automatic_delete/i18n/sms_no_automatic_delete.pot b/sms_no_automatic_delete/i18n/sms_no_automatic_delete.pot new file mode 100644 index 000000000..b819870c7 --- /dev/null +++ b/sms_no_automatic_delete/i18n/sms_no_automatic_delete.pot @@ -0,0 +1,41 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sms_no_automatic_delete +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sms_no_automatic_delete +#: model:ir.model.fields,field_description:sms_no_automatic_delete.field_sms_sms__display_name +msgid "Display Name" +msgstr "" + +#. module: sms_no_automatic_delete +#: model:ir.model.fields,field_description:sms_no_automatic_delete.field_sms_sms__id +msgid "ID" +msgstr "" + +#. module: sms_no_automatic_delete +#: model:ir.model.fields,field_description:sms_no_automatic_delete.field_sms_sms____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sms_no_automatic_delete +#: model:ir.model,name:sms_no_automatic_delete.model_sms_sms +msgid "Outgoing SMS" +msgstr "" + +#. module: sms_no_automatic_delete +#: model:ir.actions.server,name:sms_no_automatic_delete.ir_cron_sms_no_automatic_delete_ir_actions_server +#: model:ir.cron,cron_name:sms_no_automatic_delete.ir_cron_sms_no_automatic_delete +#: model:ir.cron,name:sms_no_automatic_delete.ir_cron_sms_no_automatic_delete +msgid "SMS: SMS Purge" +msgstr "" From c10223db8909413a5ff183b130feb822ba441a53 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 2 Jul 2021 14:18:21 +0000 Subject: [PATCH 05/14] [UPD] README.rst --- sms_no_automatic_delete/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sms_no_automatic_delete/static/description/index.html b/sms_no_automatic_delete/static/description/index.html index 84d86c2bf..bd644e500 100644 --- a/sms_no_automatic_delete/static/description/index.html +++ b/sms_no_automatic_delete/static/description/index.html @@ -3,7 +3,7 @@ - + No automatic deletion of SMS