From f626b2846fdbeff4c85d2d5e43e0c5e73c2a0d1d Mon Sep 17 00:00:00 2001 From: Murtuza Saleh Date: Thu, 7 Nov 2019 21:15:13 +0530 Subject: [PATCH 01/14] [WIP][12.0] connector_equipment_import_cdr --- connector_equipment_import_cdr/README.rst | 84 ++++ connector_equipment_import_cdr/__init__.py | 3 + .../__manifest__.py | 32 ++ .../data/backend_equipment_cron.xml | 16 + .../backend_equipment_productline_demo.xml | 24 + .../demo/product_demo.xml | 69 +++ .../models/__init__.py | 5 + .../models/agreement_serviceprofile.py | 12 + .../models/backend_equipment.py | 25 ++ .../models/backend_equipment_productline.py | 17 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../security/ir.model.access.csv | 2 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 421 ++++++++++++++++++ .../views/agreement_serviceprofile.xml | 17 + .../views/backend_equipment_productline.xml | 51 +++ .../views/backend_view.xml | 22 + 18 files changed, 802 insertions(+) create mode 100644 connector_equipment_import_cdr/README.rst create mode 100644 connector_equipment_import_cdr/__init__.py create mode 100644 connector_equipment_import_cdr/__manifest__.py create mode 100644 connector_equipment_import_cdr/data/backend_equipment_cron.xml create mode 100644 connector_equipment_import_cdr/demo/backend_equipment_productline_demo.xml create mode 100644 connector_equipment_import_cdr/demo/product_demo.xml create mode 100644 connector_equipment_import_cdr/models/__init__.py create mode 100644 connector_equipment_import_cdr/models/agreement_serviceprofile.py create mode 100644 connector_equipment_import_cdr/models/backend_equipment.py create mode 100644 connector_equipment_import_cdr/models/backend_equipment_productline.py create mode 100644 connector_equipment_import_cdr/readme/CONTRIBUTORS.rst create mode 100644 connector_equipment_import_cdr/readme/DESCRIPTION.rst create mode 100644 connector_equipment_import_cdr/security/ir.model.access.csv create mode 100644 connector_equipment_import_cdr/static/description/icon.png create mode 100644 connector_equipment_import_cdr/static/description/index.html create mode 100644 connector_equipment_import_cdr/views/agreement_serviceprofile.xml create mode 100644 connector_equipment_import_cdr/views/backend_equipment_productline.xml create mode 100644 connector_equipment_import_cdr/views/backend_view.xml diff --git a/connector_equipment_import_cdr/README.rst b/connector_equipment_import_cdr/README.rst new file mode 100644 index 0000000..ac70910 --- /dev/null +++ b/connector_equipment_import_cdr/README.rst @@ -0,0 +1,84 @@ +============================== +Connector Equipment Import CDR +============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fvertical--isp-lightgray.png?logo=github + :target: https://github.com/OCA/vertical-isp/tree/12.0/connector_equipment_import_cdr + :alt: OCA/vertical-isp +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/vertical-isp-12-0/vertical-isp-12-0-connector_equipment_import_cdr + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/158/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to import the CDR data from the Netsapiens backend as Odoo analytic lines. + +**Table of contents** + +.. contents:: + :local: + +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 +~~~~~~~ + +* Open Source Integrators + +Contributors +~~~~~~~~~~~~ + +* Serpent Consulting Services Pvt. Ltd. + +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. + +.. |maintainer-wolfhall| image:: https://github.com/wolfhall.png?size=40px + :target: https://github.com/wolfhall + :alt: wolfhall +.. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px + :target: https://github.com/max3903 + :alt: max3903 + +Current `maintainers `__: + +|maintainer-wolfhall| |maintainer-max3903| + +This module is part of the `OCA/vertical-isp `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/connector_equipment_import_cdr/__init__.py b/connector_equipment_import_cdr/__init__.py new file mode 100644 index 0000000..69f7bab --- /dev/null +++ b/connector_equipment_import_cdr/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/connector_equipment_import_cdr/__manifest__.py b/connector_equipment_import_cdr/__manifest__.py new file mode 100644 index 0000000..4162fb8 --- /dev/null +++ b/connector_equipment_import_cdr/__manifest__.py @@ -0,0 +1,32 @@ +# Copyright (C) 2019, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Connector Equipment Import CDR', + 'version': '12.0.1.0.0', + 'license': 'AGPL-3', + 'summary': 'This module allows to import the CDR data from the Netsapiens\ + backend as Odoo analytic lines.', + 'author': 'Open Source Integrators, Odoo Community Association (OCA)', + "website": 'https://github.com/OCA/vertical-isp', + 'depends': [ + 'connector_equipment', + 'agreement_maintenance'], + 'data': [ + 'data/backend_equipment_cron.xml', + 'security/ir.model.access.csv', + 'views/agreement_serviceprofile.xml', + 'views/backend_equipment_productline.xml', + 'views/backend_view.xml', + ], + 'demo': [ + 'demo/product_demo.xml', + 'demo/backend_equipment_productline_demo.xml', + ], + 'installable': True, + 'development_status': 'Beta', + 'maintainers': [ + 'wolfhall', + 'max3903', + ], +} diff --git a/connector_equipment_import_cdr/data/backend_equipment_cron.xml b/connector_equipment_import_cdr/data/backend_equipment_cron.xml new file mode 100644 index 0000000..269c4a4 --- /dev/null +++ b/connector_equipment_import_cdr/data/backend_equipment_cron.xml @@ -0,0 +1,16 @@ + + + + Import CDR + + + + 1 + days + -1 + + code + model.import_cdr() + + + diff --git a/connector_equipment_import_cdr/demo/backend_equipment_productline_demo.xml b/connector_equipment_import_cdr/demo/backend_equipment_productline_demo.xml new file mode 100644 index 0000000..85eccd7 --- /dev/null +++ b/connector_equipment_import_cdr/demo/backend_equipment_productline_demo.xml @@ -0,0 +1,24 @@ + + + + 10 + + ** + + + + + 20 + + ** + + + + + 30 + + ** + + + + diff --git a/connector_equipment_import_cdr/demo/product_demo.xml b/connector_equipment_import_cdr/demo/product_demo.xml new file mode 100644 index 0000000..1e862de --- /dev/null +++ b/connector_equipment_import_cdr/demo/product_demo.xml @@ -0,0 +1,69 @@ + + + + Minute(s) + + + smaller + + + + Type + 1 + + + + Domestic + + 1 + + + + International + + 2 + + + + Toll Free + + 3 + + + + Call + + service + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/connector_equipment_import_cdr/models/__init__.py b/connector_equipment_import_cdr/models/__init__.py new file mode 100644 index 0000000..4aff583 --- /dev/null +++ b/connector_equipment_import_cdr/models/__init__.py @@ -0,0 +1,5 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import backend_equipment_productline +from . import agreement_serviceprofile +from . import backend_equipment diff --git a/connector_equipment_import_cdr/models/agreement_serviceprofile.py b/connector_equipment_import_cdr/models/agreement_serviceprofile.py new file mode 100644 index 0000000..14b9142 --- /dev/null +++ b/connector_equipment_import_cdr/models/agreement_serviceprofile.py @@ -0,0 +1,12 @@ +# Copyright (C) 2019, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from odoo import fields, models + + +class AgreementServiceProfile(models.Model): + _inherit = 'agreement.serviceprofile' + + domain = fields.Char() + last_cdr_sync = fields.Date("Last CDR Data Sync Date") diff --git a/connector_equipment_import_cdr/models/backend_equipment.py b/connector_equipment_import_cdr/models/backend_equipment.py new file mode 100644 index 0000000..4425e9f --- /dev/null +++ b/connector_equipment_import_cdr/models/backend_equipment.py @@ -0,0 +1,25 @@ +# Copyright (C) 2019, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models +from datetime import datetime + + +class BackendEquipment(models.Model): + _inherit = 'backend.equipment' + + product_line_ids = fields.One2many( + 'backend.equipment.product_line', + 'backend_id', string="Products") + sync_schedule = fields.Selection( + [('all_service', 'All Service Profiles Every Day')], 'Sync Schedule') + + def import_cdr(self, serviceprofile_ids=None): + # serviceprofile_obj = self.env['agreement.serviceprofile'] + # for rec in self: + # if not serviceprofile_ids: + # serviceprofile_rec = serviceprofile_obj.search( + # [('domain', '!=', False)]) + # if serviceprofile_rec: + # serviceprofile_rec.last_cdr_sync = datetime.today() + return True diff --git a/connector_equipment_import_cdr/models/backend_equipment_productline.py b/connector_equipment_import_cdr/models/backend_equipment_productline.py new file mode 100644 index 0000000..7dc76e7 --- /dev/null +++ b/connector_equipment_import_cdr/models/backend_equipment_productline.py @@ -0,0 +1,17 @@ +# Copyright (C) 2019, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class BackendEquipmentProductline(models.Model): + _name = 'backend.equipment.product_line' + _description = 'Backend Equipment Productline' + _order = "sequence" + + name = fields.Many2one('product.product', "Product") + pattern = fields.Char('Pattern', help="The pattern is a regular expression that\ + will applied on the phone number to detect a domestic call, an\ + international call or a toll free call.") + sequence = fields.Integer('Sequence') + backend_id = fields.Many2one('backend.equipment', "Backend") diff --git a/connector_equipment_import_cdr/readme/CONTRIBUTORS.rst b/connector_equipment_import_cdr/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000..09b1864 --- /dev/null +++ b/connector_equipment_import_cdr/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Serpent Consulting Services Pvt. Ltd. diff --git a/connector_equipment_import_cdr/readme/DESCRIPTION.rst b/connector_equipment_import_cdr/readme/DESCRIPTION.rst new file mode 100644 index 0000000..15c53d4 --- /dev/null +++ b/connector_equipment_import_cdr/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to import the CDR data from the Netsapiens backend as Odoo analytic lines. diff --git a/connector_equipment_import_cdr/security/ir.model.access.csv b/connector_equipment_import_cdr/security/ir.model.access.csv new file mode 100644 index 0000000..1e03afd --- /dev/null +++ b/connector_equipment_import_cdr/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_backend_equipment_product_line,access_backend_equipment_product_line,model_backend_equipment_product_line,base.group_user,1,1,1,1 diff --git a/connector_equipment_import_cdr/static/description/icon.png b/connector_equipment_import_cdr/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/connector_equipment_import_cdr/static/description/index.html b/connector_equipment_import_cdr/static/description/index.html new file mode 100644 index 0000000..5aba44b --- /dev/null +++ b/connector_equipment_import_cdr/static/description/index.html @@ -0,0 +1,421 @@ + + + + + + +Connector Equipment Import CDR + + + +
+

Connector Equipment Import CDR

+ + +

Beta License: AGPL-3 OCA/vertical-isp Translate me on Weblate Try me on Runbot

+

This module allows to import the CDR data from the Netsapiens backend as Odoo analytic lines.

+

Table of contents

+ +
+

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

+
    +
  • Open Source Integrators
    • +
+
+
+

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.

+

Current maintainers:

+

wolfhall max3903

+

This module is part of the OCA/vertical-isp project on GitHub.

+

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

+
+
+
+ + diff --git a/connector_equipment_import_cdr/views/agreement_serviceprofile.xml b/connector_equipment_import_cdr/views/agreement_serviceprofile.xml new file mode 100644 index 0000000..0fd62ae --- /dev/null +++ b/connector_equipment_import_cdr/views/agreement_serviceprofile.xml @@ -0,0 +1,17 @@ + + + + agreement.service.profile.inherited.view + agreement.serviceprofile + + + + + + + + + + + + diff --git a/connector_equipment_import_cdr/views/backend_equipment_productline.xml b/connector_equipment_import_cdr/views/backend_equipment_productline.xml new file mode 100644 index 0000000..545956c --- /dev/null +++ b/connector_equipment_import_cdr/views/backend_equipment_productline.xml @@ -0,0 +1,51 @@ + + + + + backend.equipment.product_line.tree.view + backend.equipment.product_line + + + + + + + + + + + + + backend.equipment.product_line.form.view + backend.equipment.product_line + +
+ + + + + + + + +
+ + + + + Backend Equipment Productline + backend.equipment.product_line + + form + tree,form + + + + + diff --git a/connector_equipment_import_cdr/views/backend_view.xml b/connector_equipment_import_cdr/views/backend_view.xml new file mode 100644 index 0000000..4b185d7 --- /dev/null +++ b/connector_equipment_import_cdr/views/backend_view.xml @@ -0,0 +1,22 @@ + + + + backend.equipment.inherited.view + backend.equipment + + + + + + + + + +
+
+ + + + + From 2ac9c61472ac98f089a409537f841f66cc367343 Mon Sep 17 00:00:00 2001 From: Murtuza Saleh Date: Tue, 26 Nov 2019 19:39:08 +0530 Subject: [PATCH 02/14] [IMP] Improved code. --- .../models/backend_equipment.py | 37 ++++++++++++++----- .../views/backend_view.xml | 2 +- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/connector_equipment_import_cdr/models/backend_equipment.py b/connector_equipment_import_cdr/models/backend_equipment.py index 4425e9f..78df00c 100644 --- a/connector_equipment_import_cdr/models/backend_equipment.py +++ b/connector_equipment_import_cdr/models/backend_equipment.py @@ -1,8 +1,9 @@ # Copyright (C) 2019, Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import fields, models +from odoo import api, fields, models from datetime import datetime +import requests class BackendEquipment(models.Model): @@ -14,12 +15,30 @@ class BackendEquipment(models.Model): sync_schedule = fields.Selection( [('all_service', 'All Service Profiles Every Day')], 'Sync Schedule') + @api.multi + def button_import_cdr(self): + for rec in self: + rec.import_cdr(serviceprofile_ids=None) + def import_cdr(self, serviceprofile_ids=None): - # serviceprofile_obj = self.env['agreement.serviceprofile'] - # for rec in self: - # if not serviceprofile_ids: - # serviceprofile_rec = serviceprofile_obj.search( - # [('domain', '!=', False)]) - # if serviceprofile_rec: - # serviceprofile_rec.last_cdr_sync = datetime.today() - return True + # WIP + serviceprofile_obj = self.env['agreement.serviceprofile'] + for rec in self: + if not serviceprofile_ids: + serviceprofile_rec = serviceprofile_obj.search( + [('domain', '!=', False), + ('equipment_id.backend_id', '=', rec.id)]) + for service in serviceprofile_rec: + url_path = rec.host + token_value = { + 'grant_type': 'password', + 'client_id': rec.client, + 'client_secret': rec.client_secret, + 'username': rec.user, + 'password': rec.password, + } + request_data = requests.get( + url_path, params=token_value, + headers={'Content-Type': 'application/json'}) + if serviceprofile_rec: + service.last_cdr_sync = datetime.today() diff --git a/connector_equipment_import_cdr/views/backend_view.xml b/connector_equipment_import_cdr/views/backend_view.xml index 4b185d7..4c747ec 100644 --- a/connector_equipment_import_cdr/views/backend_view.xml +++ b/connector_equipment_import_cdr/views/backend_view.xml @@ -13,7 +13,7 @@
-
From d74bf55f7af8380ea5b9cb3188192dce84d39959 Mon Sep 17 00:00:00 2001 From: Murtuza Saleh Date: Wed, 27 Nov 2019 20:03:46 +0530 Subject: [PATCH 03/14] [IMP] Improved code. --- .../__manifest__.py | 4 +- .../models/backend_equipment.py | 97 +++++++++++++++---- 2 files changed, 83 insertions(+), 18 deletions(-) diff --git a/connector_equipment_import_cdr/__manifest__.py b/connector_equipment_import_cdr/__manifest__.py index 4162fb8..0d836a5 100644 --- a/connector_equipment_import_cdr/__manifest__.py +++ b/connector_equipment_import_cdr/__manifest__.py @@ -11,7 +11,9 @@ "website": 'https://github.com/OCA/vertical-isp', 'depends': [ 'connector_equipment', - 'agreement_maintenance'], + 'agreement_maintenance', + 'account', + ], 'data': [ 'data/backend_equipment_cron.xml', 'security/ir.model.access.csv', diff --git a/connector_equipment_import_cdr/models/backend_equipment.py b/connector_equipment_import_cdr/models/backend_equipment.py index 78df00c..863b372 100644 --- a/connector_equipment_import_cdr/models/backend_equipment.py +++ b/connector_equipment_import_cdr/models/backend_equipment.py @@ -1,9 +1,11 @@ # Copyright (C) 2019, Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models -from datetime import datetime +from odoo import api, fields, models, _ +from datetime import datetime, timedelta +from odoo.exceptions import Warning import requests +import json class BackendEquipment(models.Model): @@ -15,30 +17,91 @@ class BackendEquipment(models.Model): sync_schedule = fields.Selection( [('all_service', 'All Service Profiles Every Day')], 'Sync Schedule') + @api.model + def generate_access_token(self, backend): + token = False + if backend: + token_value = { + 'grant_type': 'password', + 'client_id': backend.client, + 'client_secret': backend.client_secret, + 'username': backend.user, + 'password': backend.password, + } + url_path = self.url_build('/ns-api/oauth2/token/?') + request_data = requests.get( + url_path, params=token_value, + headers={'Content-Type': 'application/json'}) + if request_data.status_code == 200: + request_data = json.loads(request_data.text) + token = request_data.get('access_token') + return token + + @api.model + def url_build(self, endpoint): + url = self.host + if endpoint: + url = url + endpoint + return url + @api.multi def button_import_cdr(self): for rec in self: rec.import_cdr(serviceprofile_ids=None) def import_cdr(self, serviceprofile_ids=None): - # WIP serviceprofile_obj = self.env['agreement.serviceprofile'] + analytic_account_obj = self.env["account.analytic.account"] + analytic_line_obj = self.env["account.analytic.line"] + today_date = datetime.today() + yesterday = (today_date - timedelta(days=1)).date() for rec in self: if not serviceprofile_ids: serviceprofile_rec = serviceprofile_obj.search( [('domain', '!=', False), ('equipment_id.backend_id', '=', rec.id)]) - for service in serviceprofile_rec: - url_path = rec.host - token_value = { - 'grant_type': 'password', - 'client_id': rec.client, - 'client_secret': rec.client_secret, - 'username': rec.user, - 'password': rec.password, - } - request_data = requests.get( - url_path, params=token_value, - headers={'Content-Type': 'application/json'}) - if serviceprofile_rec: - service.last_cdr_sync = datetime.today() + else: + serviceprofile_rec = serviceprofile_ids + for service in serviceprofile_rec: + token = rec.generate_access_token( + service.equipment_id.backend_id) + token_value = { + 'object': 'cdr2', + 'action': 'read', + 'start_date': service.last_cdr_sync or '2000-01-01', + 'end_date': yesterday, + 'domain': service.domain, + 'format': 'json' + } + url_path = self.url_build('/ns-api/?') + domain_data = requests.post( + url_path, params=token_value, + headers={'Authorization': 'Bearer' + ' ' + token}) + if domain_data.status_code == 200: + domain_data = json.loads(domain_data.text) + for data in domain_data: + analytic = analytic_account_obj.search([ + ('name', "=", data.get('domain'))]) + product_uom_unit = self.env.ref( + 'connector_equipment_import_cdr.product_uom_min') + # Todo (logic?) + if data.get('type') == 1: + product = self.env.ref( + 'connector_equipment_import_cdr.demo_call_product_product_1') + else: + product = self.env.ref( + 'connector_equipment_import_cdr.demo_call_product_product_2') + if analytic: + analytic_line_obj.create({ + "name": 'Demo', # Todo (logic?) + "amount": 1.0, # Todo (logic?) + "account_id": analytic.id, + "date": today_date.date(), + "unit_amount": float(data.get('duration')), + "product_id": product.id, # Todo (logic?) + "product_uom_id": product_uom_unit.id, + }) + if serviceprofile_rec: + service.last_cdr_sync = today_date.date() + else: + raise Warning(_('Analytic Account is not found in database.')) From ea5aa4d1907ed3c44c1e29c5a5cfe248ddf7c576 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 10:55:13 +0000 Subject: [PATCH 04/14] [IMP] Phone Rates, add method to get rate from phone number --- base_phone_rate/models/phone_rate.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/base_phone_rate/models/phone_rate.py b/base_phone_rate/models/phone_rate.py index 34074ed..c18efcf 100644 --- a/base_phone_rate/models/phone_rate.py +++ b/base_phone_rate/models/phone_rate.py @@ -30,3 +30,14 @@ def _onchange_state_id(self): def _onchange_country_id(self): if self.state_id.country_id != self.country_id: self.state_id = False + + @api.model + def get_rate_from_phonenumber(self, phonenumber): + """Given a phone number, find the corresponding rate""" + for n in range(1, len(phonenumber)): + number = phonenumber[:n] + phonerate = self.search( + [('dial_prefix', '=ilike', number + '%')] + ) + if len(phonerate) == 1: + return phonerate From 7737d67e0226e214d9ceae5b12b2116cdd0371e6 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 10:56:28 +0000 Subject: [PATCH 05/14] [IMP] Phone Rates, identify Product related to international phone rates --- base_phone_rate/__manifest__.py | 2 +- base_phone_rate/models/__init__.py | 1 + base_phone_rate/models/product_product.py | 11 +++++++++++ base_phone_rate/views/product_product.xml | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 base_phone_rate/models/product_product.py create mode 100644 base_phone_rate/views/product_product.xml diff --git a/base_phone_rate/__manifest__.py b/base_phone_rate/__manifest__.py index f9c4095..1653fa0 100644 --- a/base_phone_rate/__manifest__.py +++ b/base_phone_rate/__manifest__.py @@ -13,9 +13,9 @@ 'decimal_precision' ], 'data': [ + 'views/product_product.xml', 'views/phone_rate.xml', 'security/ir.model.access.csv', - 'data/decimal_precision.xml', ], 'installable': True, 'development_status': 'Beta', diff --git a/base_phone_rate/models/__init__.py b/base_phone_rate/models/__init__.py index 91ed7eb..5d2fef6 100644 --- a/base_phone_rate/models/__init__.py +++ b/base_phone_rate/models/__init__.py @@ -1 +1,2 @@ from . import phone_rate +from . import product_product diff --git a/base_phone_rate/models/product_product.py b/base_phone_rate/models/product_product.py new file mode 100644 index 0000000..dfcb8ff --- /dev/null +++ b/base_phone_rate/models/product_product.py @@ -0,0 +1,11 @@ +# Copyright 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ProductProduct(models.Model): + + _inherit = 'product.product' + + is_international_call = fields.Boolean() diff --git a/base_phone_rate/views/product_product.xml b/base_phone_rate/views/product_product.xml new file mode 100644 index 0000000..3ca7245 --- /dev/null +++ b/base_phone_rate/views/product_product.xml @@ -0,0 +1,17 @@ + + + + + + product.product.form (in base_phone_rate) + product.product + + + + + + + + + From d04266b8ab43d42a0aefed2e87de68d7d2c73fc1 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 13:38:30 +0000 Subject: [PATCH 06/14] [REF] Logic to create Analytic Lines from CDR data --- .../__manifest__.py | 6 +- .../demo/product_demo.xml | 1 + .../models/agreement_serviceprofile.py | 105 ++++++++++++- .../models/backend_equipment.py | 144 ++++++++---------- 4 files changed, 171 insertions(+), 85 deletions(-) diff --git a/connector_equipment_import_cdr/__manifest__.py b/connector_equipment_import_cdr/__manifest__.py index 0d836a5..5bbe4de 100644 --- a/connector_equipment_import_cdr/__manifest__.py +++ b/connector_equipment_import_cdr/__manifest__.py @@ -10,9 +10,11 @@ 'author': 'Open Source Integrators, Odoo Community Association (OCA)', "website": 'https://github.com/OCA/vertical-isp', 'depends': [ - 'connector_equipment', - 'agreement_maintenance', 'account', + 'agreement_legal_sale', + 'agreement_maintenance', + 'base_phone_rate', + 'connector_equipment', ], 'data': [ 'data/backend_equipment_cron.xml', diff --git a/connector_equipment_import_cdr/demo/product_demo.xml b/connector_equipment_import_cdr/demo/product_demo.xml index 1e862de..f18d65d 100644 --- a/connector_equipment_import_cdr/demo/product_demo.xml +++ b/connector_equipment_import_cdr/demo/product_demo.xml @@ -48,6 +48,7 @@ + diff --git a/connector_equipment_import_cdr/models/agreement_serviceprofile.py b/connector_equipment_import_cdr/models/agreement_serviceprofile.py index 14b9142..634cdd3 100644 --- a/connector_equipment_import_cdr/models/agreement_serviceprofile.py +++ b/connector_equipment_import_cdr/models/agreement_serviceprofile.py @@ -1,8 +1,9 @@ # Copyright (C) 2019, Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import fields, models +import datetime +from odoo import api, fields, models, _ +from odoo.exceptions import Warning class AgreementServiceProfile(models.Model): @@ -10,3 +11,103 @@ class AgreementServiceProfile(models.Model): domain = fields.Char() last_cdr_sync = fields.Date("Last CDR Data Sync Date") + + @api.multi + def get_billing_day(self): + self.ensure_one() + start_date = self.agreement_id.start_date + billing_date = start_date + datetime.timedelta(days=1) + return billing_date.day + + @api.multi + def import_cdr(self): + """ + Get call data for domain: type (in, out, ...), number, seconds + Filter only outbound calls, type==0 + Add billing Product, from number, using product map + And Group by Product + """ + def phone_to_product(outgoing_number, product_map): + for line in product_map: + product = line.product_id + match = outgoing_number == line.pattern # TODO apply RegEx + if match: + return product + return product + + phone_to_rate = self.env['phone.rate'].get_rate_from_phone_number + # TODO loop should be by domain? + # We could be duplicating if same domain is in several service profiles + for service in self: + analytic = service.agreement_id.analytic_account.id + if not analytic: + raise Warning(_('Analytic Account is not found in database.')) + # Group Data Lines by Product + backend = service.equipment_id.backend_id + product_map = backend.product_line_ids + domain_data = backend.api_get_cdr_data(service.domain) + products_data = {product: [] for pattern, product in product_map} + for line in domain_data: + call_type = { + '0': 'outbound', + '1': 'inbound', + '2': 'missed', + '3': 'on-net', + }.get(line['type']) + dialed_number = line['orig_req_user'] + # duration = line['duration'] + if call_type == 'outbound': + product = phone_to_product( + dialed_number, product_map) + if product.is_international_call: + line['phone_rate'] = phone_to_rate(dialed_number) + products_data[product].append(line) + # Create Analytic Line for each Product + AnalyticLine = self.env["account.analytic.line"] + for product, lines in products_data.items(): + calls = len(lines) + duration_secs = sum(x['duration'] for x in lines]) + duration_mins = duration // 60 # TODO duration rounding rule + start = min(x['time_start'] for x in lines]) + end = max(x['time_release'] for x in lines]) + amount = (product.is_international_call and sum( + x.get('phone_rate').rate + * int(x.get('duration', '0')) / 60.0 + for x in lines)) + uom = self.env.ref( # TODO Verify it is default data + 'connector_equipment_import_cdr.product_uom_min') + # billing_day = service.get_billling_day() + # TODO name = 'YYYYMM' + name = start + ' to '+ end + ref = "# Calls: %d" % (calls,) + #product_uom_unit = self.env.ref( + # 'connector_equipment_import_cdr.product_uom_min') + #if data.get('type') == 1: + # product = self.env.ref( + # 'connector_equipment_import_cdr.demo_call_product_product_1') + #else: + # product = self.env.ref( + # 'connector_equipment_import_cdr.demo_call_product_product_2') + AnalyticLine.create({ + "name": name, + "account_id": analytic.id, + "date": today_date.date(), + "amount": amount or 0, + "ref": ref, + "partner_id": service.partner_id, + "unit_amount": duration_mins, + "product_id": product.id, + "product_uom_id": uom.id, + }) + service.last_cdr_sync = today_date.date() + + @api.multi + def button_import_cdr(self): + self.import_cdr() + + @api.model + def cron_import_cdr(self): + serviceprofiles = self.search( + [('domain', '!=', False), + ('equipment_id.backend_id', '!=', False)]) + serviceprofiles.import_cdr() diff --git a/connector_equipment_import_cdr/models/backend_equipment.py b/connector_equipment_import_cdr/models/backend_equipment.py index 863b372..31c4de1 100644 --- a/connector_equipment_import_cdr/models/backend_equipment.py +++ b/connector_equipment_import_cdr/models/backend_equipment.py @@ -1,9 +1,8 @@ # Copyright (C) 2019, Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models, _ +from odoo import api, fields, models from datetime import datetime, timedelta -from odoo.exceptions import Warning import requests import json @@ -17,91 +16,74 @@ class BackendEquipment(models.Model): sync_schedule = fields.Selection( [('all_service', 'All Service Profiles Every Day')], 'Sync Schedule') - @api.model - def generate_access_token(self, backend): - token = False - if backend: - token_value = { - 'grant_type': 'password', - 'client_id': backend.client, - 'client_secret': backend.client_secret, - 'username': backend.user, - 'password': backend.password, - } - url_path = self.url_build('/ns-api/oauth2/token/?') - request_data = requests.get( - url_path, params=token_value, - headers={'Content-Type': 'application/json'}) - if request_data.status_code == 200: - request_data = json.loads(request_data.text) - token = request_data.get('access_token') - return token - - @api.model - def url_build(self, endpoint): + @api.multi + def api_url_build(self, endpoint): + """ + Given an endpoint, + return full Netsapiens API URL for the endpoint + """ + self.ensure_one() url = self.host + if not url.startswith('http'): + url = 'https://' + url + if url.endswith('/'): + url = url[:-1] + if self.port: + url = url + self.port if endpoint: url = url + endpoint return url @api.multi - def button_import_cdr(self): - for rec in self: - rec.import_cdr(serviceprofile_ids=None) + def api_generate_access_token(self): + """ + Login to Netsapiens and + return the access token + """ + self.ensure_one() + backend = self + token_value = { + 'grant_type': 'password', + 'client_id': backend.client, + 'client_secret': backend.client_secret, + 'username': backend.user, + 'password': backend.password, + } + url_path = self.api_url_build('/ns-api/oauth2/token/?') + request_data = requests.get( + url_path, + params=token_value, + headers={'Content-Type': 'application/json'}) + if request_data.status_code == 200: + request_data = json.loads(request_data.text) + token = request_data.get('access_token') + return token + # TODO else Raise an error if not successful? - def import_cdr(self, serviceprofile_ids=None): - serviceprofile_obj = self.env['agreement.serviceprofile'] - analytic_account_obj = self.env["account.analytic.account"] - analytic_line_obj = self.env["account.analytic.line"] + @api.model + def api_get_domain_cdr_data(self, service, from_date=None, to_date=None): + """ + Given a Service Profile, call the API to get CRD data. + Returns a dict with the retrieved data. + """ + backend = service.equipment_id.backend_id + # TODO convert dates to context timezone! today_date = datetime.today() yesterday = (today_date - timedelta(days=1)).date() - for rec in self: - if not serviceprofile_ids: - serviceprofile_rec = serviceprofile_obj.search( - [('domain', '!=', False), - ('equipment_id.backend_id', '=', rec.id)]) - else: - serviceprofile_rec = serviceprofile_ids - for service in serviceprofile_rec: - token = rec.generate_access_token( - service.equipment_id.backend_id) - token_value = { - 'object': 'cdr2', - 'action': 'read', - 'start_date': service.last_cdr_sync or '2000-01-01', - 'end_date': yesterday, - 'domain': service.domain, - 'format': 'json' - } - url_path = self.url_build('/ns-api/?') - domain_data = requests.post( - url_path, params=token_value, - headers={'Authorization': 'Bearer' + ' ' + token}) - if domain_data.status_code == 200: - domain_data = json.loads(domain_data.text) - for data in domain_data: - analytic = analytic_account_obj.search([ - ('name', "=", data.get('domain'))]) - product_uom_unit = self.env.ref( - 'connector_equipment_import_cdr.product_uom_min') - # Todo (logic?) - if data.get('type') == 1: - product = self.env.ref( - 'connector_equipment_import_cdr.demo_call_product_product_1') - else: - product = self.env.ref( - 'connector_equipment_import_cdr.demo_call_product_product_2') - if analytic: - analytic_line_obj.create({ - "name": 'Demo', # Todo (logic?) - "amount": 1.0, # Todo (logic?) - "account_id": analytic.id, - "date": today_date.date(), - "unit_amount": float(data.get('duration')), - "product_id": product.id, # Todo (logic?) - "product_uom_id": product_uom_unit.id, - }) - if serviceprofile_rec: - service.last_cdr_sync = today_date.date() - else: - raise Warning(_('Analytic Account is not found in database.')) + token = backend.api_generate_access_token() + token_value = { + 'object': 'cdr2', + 'action': 'read', + 'start_date': service.last_cdr_sync or '2000-01-01', + 'end_date': yesterday, + 'domain': service.domain, + 'format': 'json' + } + url_path = self._api_url_build('/ns-api/?') + domain_data = requests.post( + url_path, + params=token_value, + headers={'Authorization': 'Bearer' + ' ' + token}) + if domain_data.status_code == 200: + domain_data = json.loads(domain_data.text) + return domain_data From 7434fa7facedd21551e4c65193883a1066bd6b41 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 15:06:09 +0000 Subject: [PATCH 07/14] [FIX] demo data --- connector_equipment_import_cdr/demo/product_demo.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/connector_equipment_import_cdr/demo/product_demo.xml b/connector_equipment_import_cdr/demo/product_demo.xml index f18d65d..b655b02 100644 --- a/connector_equipment_import_cdr/demo/product_demo.xml +++ b/connector_equipment_import_cdr/demo/product_demo.xml @@ -63,8 +63,4 @@ ref('connector_equipment_import_cdr.demo_product_attribute_value_3')])]"/> - - - - From 238db9002c0452fe8be364fa895145a356c332be Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 15:07:51 +0000 Subject: [PATCH 08/14] [FIX] Phone Rate: declare data file in manifest --- base_phone_rate/__manifest__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/base_phone_rate/__manifest__.py b/base_phone_rate/__manifest__.py index 1653fa0..965df4c 100644 --- a/base_phone_rate/__manifest__.py +++ b/base_phone_rate/__manifest__.py @@ -16,6 +16,7 @@ 'views/product_product.xml', 'views/phone_rate.xml', 'security/ir.model.access.csv', + 'data/decimal_precision.xml', ], 'installable': True, 'development_status': 'Beta', From 00460643e10a18fdbd248c7c0071b135fda40b0f Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 15:15:14 +0000 Subject: [PATCH 09/14] [FIX] Deprecated Warning exception --- .../models/agreement_serviceprofile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connector_equipment_import_cdr/models/agreement_serviceprofile.py b/connector_equipment_import_cdr/models/agreement_serviceprofile.py index 634cdd3..5570c0c 100644 --- a/connector_equipment_import_cdr/models/agreement_serviceprofile.py +++ b/connector_equipment_import_cdr/models/agreement_serviceprofile.py @@ -3,7 +3,7 @@ import datetime from odoo import api, fields, models, _ -from odoo.exceptions import Warning +from odoo.exceptions import UserError class AgreementServiceProfile(models.Model): @@ -41,7 +41,7 @@ def phone_to_product(outgoing_number, product_map): for service in self: analytic = service.agreement_id.analytic_account.id if not analytic: - raise Warning(_('Analytic Account is not found in database.')) + raise UserError(_('Analytic Account is not found in database.')) # Group Data Lines by Product backend = service.equipment_id.backend_id product_map = backend.product_line_ids From f6977b37a584ed21010f2b41b25584165b74af44 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Mon, 9 Dec 2019 15:27:25 +0000 Subject: [PATCH 10/14] Fix button --- .../views/agreement_serviceprofile.xml | 2 ++ connector_equipment_import_cdr/views/backend_view.xml | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/connector_equipment_import_cdr/views/agreement_serviceprofile.xml b/connector_equipment_import_cdr/views/agreement_serviceprofile.xml index 0fd62ae..da8ea87 100644 --- a/connector_equipment_import_cdr/views/agreement_serviceprofile.xml +++ b/connector_equipment_import_cdr/views/agreement_serviceprofile.xml @@ -10,6 +10,8 @@ +