From 3616588f02a5a16e1a2e495da86f0e3783bf1ed4 Mon Sep 17 00:00:00 2001 From: Volodiay616 <108336612+Volodiay616@users.noreply.github.com> Date: Sun, 29 Oct 2023 12:38:24 -0500 Subject: [PATCH 1/2] [IMP] project_task_pull_request_state: add module --- project_task_pull_request_state/README.rst | 101 ++++ project_task_pull_request_state/__init__.py | 3 + .../__manifest__.py | 21 + .../models/__init__.py | 5 + .../models/project_project.py | 14 + .../models/project_task.py | 41 ++ .../models/res_config_settings.py | 15 + .../readme/CONFIGURE.rst | 6 + .../readme/CONTEXT.rst | 4 + .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 6 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 437 ++++++++++++++++++ .../tests/__init__.py | 3 + .../test_project_task_pull_request_state.py | 177 +++++++ .../views/project_project_view.xml | 16 + .../views/project_task_view.xml | 45 ++ .../views/res_config_settings_view.xml | 31 ++ .../addons/project_task_pull_request_state | 1 + .../project_task_pull_request_state/setup.py | 6 + 20 files changed, 935 insertions(+) create mode 100644 project_task_pull_request_state/README.rst create mode 100644 project_task_pull_request_state/__init__.py create mode 100644 project_task_pull_request_state/__manifest__.py create mode 100644 project_task_pull_request_state/models/__init__.py create mode 100644 project_task_pull_request_state/models/project_project.py create mode 100644 project_task_pull_request_state/models/project_task.py create mode 100644 project_task_pull_request_state/models/res_config_settings.py create mode 100644 project_task_pull_request_state/readme/CONFIGURE.rst create mode 100644 project_task_pull_request_state/readme/CONTEXT.rst create mode 100644 project_task_pull_request_state/readme/CONTRIBUTORS.rst create mode 100644 project_task_pull_request_state/readme/DESCRIPTION.rst create mode 100644 project_task_pull_request_state/static/description/icon.png create mode 100644 project_task_pull_request_state/static/description/index.html create mode 100644 project_task_pull_request_state/tests/__init__.py create mode 100644 project_task_pull_request_state/tests/test_project_task_pull_request_state.py create mode 100644 project_task_pull_request_state/views/project_project_view.xml create mode 100644 project_task_pull_request_state/views/project_task_view.xml create mode 100644 project_task_pull_request_state/views/res_config_settings_view.xml create mode 120000 setup/project_task_pull_request_state/odoo/addons/project_task_pull_request_state create mode 100644 setup/project_task_pull_request_state/setup.py diff --git a/project_task_pull_request_state/README.rst b/project_task_pull_request_state/README.rst new file mode 100644 index 0000000000..9234199b9e --- /dev/null +++ b/project_task_pull_request_state/README.rst @@ -0,0 +1,101 @@ +=============================== +Project Task Pull Request State +=============================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:acd2039cd12805d8338b8489c2a4826a6997cd805e91aa6f03d2bd5960f0d88a + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fproject-lightgray.png?logo=github + :target: https://github.com/OCA/project/tree/16.0/project_task_pull_request_state + :alt: OCA/project +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/project-16-0/project-16-0-project_task_pull_request_state + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/project&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends functionality of the project_task_pull_request module. It adds a +"State" field to Task alongside with PR URI field. + +Following pre-defined states are available: "Draft", "Open", "Merged", "Closed". You can +add or modify this list easily by overriding the "\_selection_pr_state" function in the +"project.task" model + +**Table of contents** + +.. contents:: + :local: + +Use Cases / Context +=================== + +This module is designed as a basis for further automation based on the pull +request state of the task. For example one can use webhooks to set PR state +in the task when it is updated in the GitHub. And use automated actions afterwards +to update task status, assign and activity or do any other related actions. + +Configuration +============= + +#. In General Settings -> Project -> Project Task Pull Request section select default PR + State for all tasks + +To define custom default PR state for particular project: + +#. Select project -> Open "Settings" -> Set "Default PR State" + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Cetmix + +Contributors +~~~~~~~~~~~~ + +* Cetmix + Ivan Sokolov + Vladimir Kalmykov + +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/project `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/project_task_pull_request_state/__init__.py b/project_task_pull_request_state/__init__.py new file mode 100644 index 0000000000..26c59c0ad4 --- /dev/null +++ b/project_task_pull_request_state/__init__.py @@ -0,0 +1,3 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from . import models diff --git a/project_task_pull_request_state/__manifest__.py b/project_task_pull_request_state/__manifest__.py new file mode 100644 index 0000000000..4329914981 --- /dev/null +++ b/project_task_pull_request_state/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +{ + "name": "Project Task Pull Request State", + "summary": "Track Pull Request state in tasks", + "version": "16.0.1.0.0", + "category": "Project Management", + "website": "https://github.com/OCA/project", + "author": "Cetmix, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "project_task_pull_request", + ], + "data": [ + "views/project_task_view.xml", + "views/project_project_view.xml", + "views/res_config_settings_view.xml", + ], +} diff --git a/project_task_pull_request_state/models/__init__.py b/project_task_pull_request_state/models/__init__.py new file mode 100644 index 0000000000..2729576d95 --- /dev/null +++ b/project_task_pull_request_state/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from . import project_task +from . import project_project +from . import res_config_settings diff --git a/project_task_pull_request_state/models/project_project.py b/project_task_pull_request_state/models/project_project.py new file mode 100644 index 0000000000..482c8242ea --- /dev/null +++ b/project_task_pull_request_state/models/project_project.py @@ -0,0 +1,14 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from odoo import fields, models + + +class ProjectState(models.Model): + _inherit = "project.project" + + pr_state_default = fields.Selection( + selection=lambda self: self.env["project.task"]._selection_pr_state(), + string="Default PR State", + help="Default PR state that will be set when PR URI " + "is added to a task in this project", + ) diff --git a/project_task_pull_request_state/models/project_task.py b/project_task_pull_request_state/models/project_task.py new file mode 100644 index 0000000000..264bb84cb3 --- /dev/null +++ b/project_task_pull_request_state/models/project_task.py @@ -0,0 +1,41 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from odoo import api, fields, models + + +class ProjectTaskState(models.Model): + _inherit = "project.task" + + pr_state = fields.Selection( + selection=lambda self: self._selection_pr_state(), + tracking=True, + copy=False, + string="PR State", + compute="_compute_pr_state", + precompute=True, + store=True, + readonly=False, + ) + + def _selection_pr_state(self): + """Function to select the state of the pull request""" + return [ + ("open", "Open"), + ("draft", "Draft"), + ("merged", "Merged"), + ("closed", "Closed"), + ] + + @api.depends("pr_uri") + def _compute_pr_state(self): + ICPSudo = self.env["ir.config_parameter"].sudo() + pr_state_default = ICPSudo.get_param( + "project_task_pull_request_state.pr_state_default" + ) + for task in self: + if not task.pr_uri: + task.pr_state = False + elif task.project_id and task.project_id.pr_state_default: + task.pr_state = task.project_id.pr_state_default + else: + task.pr_state = pr_state_default or False diff --git a/project_task_pull_request_state/models/res_config_settings.py b/project_task_pull_request_state/models/res_config_settings.py new file mode 100644 index 0000000000..a405f3e0df --- /dev/null +++ b/project_task_pull_request_state/models/res_config_settings.py @@ -0,0 +1,15 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + pr_state_default = fields.Selection( + selection=lambda self: self.env["project.task"]._selection_pr_state(), + string="Default PR State", + config_parameter="project_task_pull_request_state.pr_state_default", + help="Default PR state that will be set when " + "PR URI is added to a task in this project", + ) diff --git a/project_task_pull_request_state/readme/CONFIGURE.rst b/project_task_pull_request_state/readme/CONFIGURE.rst new file mode 100644 index 0000000000..ff61874dbb --- /dev/null +++ b/project_task_pull_request_state/readme/CONFIGURE.rst @@ -0,0 +1,6 @@ +#. In General Settings -> Project -> Project Task Pull Request section select default PR + State for all tasks + +To define custom default PR state for particular project: + +#. Select project -> Open "Settings" -> Set "Default PR State" diff --git a/project_task_pull_request_state/readme/CONTEXT.rst b/project_task_pull_request_state/readme/CONTEXT.rst new file mode 100644 index 0000000000..382cfb73b9 --- /dev/null +++ b/project_task_pull_request_state/readme/CONTEXT.rst @@ -0,0 +1,4 @@ +This module is designed as a basis for further automation based on the pull +request state of the task. For example one can use webhooks to set PR state +in the task when it is updated in the GitHub. And use automated actions afterwards +to update task status, assign and activity or do any other related actions. diff --git a/project_task_pull_request_state/readme/CONTRIBUTORS.rst b/project_task_pull_request_state/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..63e9232e48 --- /dev/null +++ b/project_task_pull_request_state/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Cetmix + Ivan Sokolov + Vladimir Kalmykov diff --git a/project_task_pull_request_state/readme/DESCRIPTION.rst b/project_task_pull_request_state/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..9632c15a9d --- /dev/null +++ b/project_task_pull_request_state/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +This module extends functionality of the project_task_pull_request module. It adds a +"State" field to Task alongside with PR URI field. + +Following pre-defined states are available: "Draft", "Open", "Merged", "Closed". You can +add or modify this list easily by overriding the "\_selection_pr_state" function in the +"project.task" model diff --git a/project_task_pull_request_state/static/description/icon.png b/project_task_pull_request_state/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/project_task_pull_request_state/static/description/index.html b/project_task_pull_request_state/static/description/index.html new file mode 100644 index 0000000000..85780f324c --- /dev/null +++ b/project_task_pull_request_state/static/description/index.html @@ -0,0 +1,437 @@ + + + + + + +Project Task Pull Request State + + + +
+

Project Task Pull Request State

+ + +

Beta License: AGPL-3 OCA/project Translate me on Weblate Try me on Runboat

+

This module extends functionality of the project_task_pull_request +module. It adds a “State” field to Task alongside with PR URI field.

+

Following pre-defined states are available: “Draft”, “Open”, “Merged”, +“Closed”. You can add or modify this list easily by overriding the +“_selection_pr_state” function in the “project.task” model

+

Table of contents

+ +
+

Configuration

+
    +
  • In General Settings -> Project -> Project Task Pull Request section +select default PR State for all tasks
    • +
+

To define custom default PR state for particular project:

+
    +
  • Select project -> Open “Settings” -> Set “Default PR State”
    • +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Cetmix
    • +
+
+ +
+

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/project project on GitHub.

+

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

+
+
+
+ + diff --git a/project_task_pull_request_state/tests/__init__.py b/project_task_pull_request_state/tests/__init__.py new file mode 100644 index 0000000000..c9a88e36f3 --- /dev/null +++ b/project_task_pull_request_state/tests/__init__.py @@ -0,0 +1,3 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from . import test_project_task_pull_request_state diff --git a/project_task_pull_request_state/tests/test_project_task_pull_request_state.py b/project_task_pull_request_state/tests/test_project_task_pull_request_state.py new file mode 100644 index 0000000000..3d07849f59 --- /dev/null +++ b/project_task_pull_request_state/tests/test_project_task_pull_request_state.py @@ -0,0 +1,177 @@ +# Copyright Cetmix OU 2023 +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). +from odoo.tests.common import TransactionCase + + +class TestPullRequestState(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + cls.Project = cls.env["project.project"] + cls.Task = cls.env["project.task"] + cls.Stage = cls.env["project.task.type"] + + cls.stage_draft = cls.Stage.create({"name": "Draft"}) + cls.stage_progress = cls.Stage.create({"name": "Progress"}) + + # Used to set res config settings + cls.res_config = cls.env["res.config.settings"] + + cls.project_1 = cls.Project.create( + { + "name": "Test Project 1", + "type_ids": [(4, cls.stage_draft.id), (4, cls.stage_progress.id)], + "pr_state_default": "draft", + } + ) + cls.project_2 = cls.Project.create( + { + "name": "Test Project 2", + "type_ids": [(4, cls.stage_draft.id), (4, cls.stage_progress.id)], + "pr_state_default": "open", + } + ) + cls.project_3 = cls.Project.create( + { + "name": "Test Project 3", + "type_ids": [(4, cls.stage_draft.id), (4, cls.stage_progress.id)], + } + ) + cls.task_1 = cls.Task.create( + { + "name": "Test Task for project 1", + "project_id": cls.project_1.id, + } + ) + cls.task_2 = cls.Task.create( + { + "name": "Test Task for project 2", + "project_id": cls.project_2.id, + } + ) + cls.task_3 = cls.Task.create( + { + "name": "Test Task without project", + } + ) + + def _set_default_pr_state(self, state): + """Set the default pull request state. + + :param state(str): The default state for pull requests. + + :return: The result of executing the record creation operation. + """ + return self.res_config.create({"pr_state_default": state}).execute() + + def test_pull_request_state_set_default(self): + """Set default PR state from project when PR URI is added to task""" + + # Set default PR state + self._set_default_pr_state("closed") + + # Set to several existing tasks at once + tasks = self.Task.browse([self.task_1.id, self.task_2.id, self.task_3.id]) + tasks.write({"pr_uri": "https://@my.pr.uri/pr"}) + + self.assertEqual(self.task_1.pr_state, "draft", "PR state must be 'draft") + self.assertEqual(self.task_2.pr_state, "open", "PR state must be 'open") + self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed") + + # Change pr_state + tasks.write({"pr_state": "closed"}) + + self.assertEqual(self.task_1.pr_state, "closed", "PR state must be 'closed") + self.assertEqual(self.task_2.pr_state, "closed", "PR state must be 'closed") + self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed") + + def test_pull_request_state_set_explicit(self): + """Set PR state from vals when PR URI is added to task""" + # Set to several existing tasks at once + tasks = self.Task.browse([self.task_1.id, self.task_2.id, self.task_3.id]) + tasks.write({"pr_uri": "https://@my.pr.uri/pr", "pr_state": "merged"}) + + self.assertEqual(self.task_1.pr_state, "merged", "PR state must be 'merged") + self.assertEqual(self.task_2.pr_state, "merged", "PR state must be 'merged") + self.assertEqual(self.task_3.pr_state, "merged", "PR state must be 'merged") + + def test_create_task_with_uri(self): + """Add PR URI when task created""" + task_with_uri = self.Task.create( + { + "name": "Test Task with URI", + "project_id": self.project_2.id, + "pr_uri": "https://@my.pr.uri/pr", + } + ) + self.assertEqual(task_with_uri.pr_state, "open", "PR state must be 'open'") + + def test_multi_create(self): + """Create several tasks at the one time""" + self._set_default_pr_state("closed") + test_tasks_data = [ + { + "name": "Test Task 1", + "project_id": self.project_1.id, + "pr_uri": "https://@my.pr.uri/pr", + }, + { + "name": "Test Task 2", + "project_id": self.project_2.id, + "pr_uri": "https://@my.pr.uri/pr", + }, + { + "name": "Test Task 3", + "project_id": self.project_3.id, + "pr_uri": "https://@my.pr.uri/pr", + }, + ] + test_tasks = self.Task.create(test_tasks_data) + + self.assertEqual(test_tasks[0].pr_state, "draft", "PR state must be 'draft") + self.assertEqual(test_tasks[1].pr_state, "open", "PR state must be 'open") + self.assertEqual(test_tasks[2].pr_state, "closed", "PR state must be 'closed") + + def test_set_pr_state(self): + """Test _set_pr_state function""" + self.task_3.write({"pr_uri": "https://@my.pr.uri/pr"}) + self.assertFalse(self.task_3.pr_state, "PR state must be False") + # Set system wide default PR state + self._set_default_pr_state("closed") + + self.task_3.write({"pr_uri": "https://@my.pr.uri/new_pr"}) + self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed") + + self.task_1.write({"pr_uri": "https://@my.pr.uri/pr"}) + self.assertEqual(self.task_1.pr_state, "draft", "PR state must be 'draft") + # Remove PR URI + self.task_1.write({"pr_uri": ""}) + self.assertFalse(self.task_1.pr_state, "PR state must be False") + + # Create task for project without pr_state_default + test_task = self.Task.create( + { + "name": "Test Task", + "project_id": self.project_3.id, + "pr_uri": "https://@my.pr.uri/pr", + } + ) + self.assertEqual(test_task.pr_state, "closed", "PR state must be 'closed") + + def test_set_pr_state_default(self): + """Set values for the pr_state_default parameter""" + self.env["res.config.settings"].create( + { + "pr_state_default": "open", + } + ).execute() + + # Verify that the parameter has been set to the desired value + pr_state_default_param = self.env["ir.config_parameter"].get_param( + "project_task_pull_request_state.pr_state_default" + ) + self.assertEqual( + pr_state_default_param, "open", "PR state default parameter must be 'open'" + ) diff --git a/project_task_pull_request_state/views/project_project_view.xml b/project_task_pull_request_state/views/project_project_view.xml new file mode 100644 index 0000000000..594849d493 --- /dev/null +++ b/project_task_pull_request_state/views/project_project_view.xml @@ -0,0 +1,16 @@ + + + + + project.project.form + project.project + + + + + + + + + + diff --git a/project_task_pull_request_state/views/project_task_view.xml b/project_task_pull_request_state/views/project_task_view.xml new file mode 100644 index 0000000000..3b3856b743 --- /dev/null +++ b/project_task_pull_request_state/views/project_task_view.xml @@ -0,0 +1,45 @@ + + + + + project.project.form + project.task + + + + + + + + + + Project.task.pr.state.search + project.task + + + + + + + + + + + + + + + + + diff --git a/project_task_pull_request_state/views/res_config_settings_view.xml b/project_task_pull_request_state/views/res_config_settings_view.xml new file mode 100644 index 0000000000..baf55f3172 --- /dev/null +++ b/project_task_pull_request_state/views/res_config_settings_view.xml @@ -0,0 +1,31 @@ + + + res.config.settings.view.form.pr.state + res.config.settings + + + +

Project Task Pull Request

+
+
+
+
+
+
+ + + + diff --git a/setup/project_task_pull_request_state/odoo/addons/project_task_pull_request_state b/setup/project_task_pull_request_state/odoo/addons/project_task_pull_request_state new file mode 120000 index 0000000000..4966ebea9c --- /dev/null +++ b/setup/project_task_pull_request_state/odoo/addons/project_task_pull_request_state @@ -0,0 +1 @@ +../../../../project_task_pull_request_state \ No newline at end of file diff --git a/setup/project_task_pull_request_state/setup.py b/setup/project_task_pull_request_state/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/project_task_pull_request_state/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From d195054b9b83f9a68e040505ec6811ea3b388ec9 Mon Sep 17 00:00:00 2001 From: Volodiay616 <108336612+Volodiay616@users.noreply.github.com> Date: Sun, 21 Jan 2024 21:30:08 -0600 Subject: [PATCH 2/2] [IMP] project_task_pull_request_state:after review fix --- project_task_pull_request_state/README.rst | 11 +++---- .../models/__init__.py | 2 -- .../models/project_project.py | 4 +-- .../models/project_task.py | 6 ++-- .../models/res_config_settings.py | 2 +- .../readme/CONTRIBUTORS.rst | 7 +++-- .../readme/DESCRIPTION.rst | 2 +- .../test_project_task_pull_request_state.py | 30 +++++++++---------- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/project_task_pull_request_state/README.rst b/project_task_pull_request_state/README.rst index 9234199b9e..6a5fc6d2a1 100644 --- a/project_task_pull_request_state/README.rst +++ b/project_task_pull_request_state/README.rst @@ -7,7 +7,7 @@ Project Task Pull Request State !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:acd2039cd12805d8338b8489c2a4826a6997cd805e91aa6f03d2bd5960f0d88a + !! source digest: sha256:e4361ed521f7d798fd58d0076a5554ecb61e5a99e05a6720cce230670b2bd6cf !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -32,7 +32,7 @@ This module extends functionality of the project_task_pull_request module. It ad "State" field to Task alongside with PR URI field. Following pre-defined states are available: "Draft", "Open", "Merged", "Closed". You can -add or modify this list easily by overriding the "\_selection_pr_state" function in the +add or modify this list easily by overriding the "selection_pr_state" function in the "project.task" model **Table of contents** @@ -79,9 +79,10 @@ Authors Contributors ~~~~~~~~~~~~ -* Cetmix - Ivan Sokolov - Vladimir Kalmykov +* `Cetmix `__ + + * Ivan Sokolov + * Vladimir Kalmykov Maintainers ~~~~~~~~~~~ diff --git a/project_task_pull_request_state/models/__init__.py b/project_task_pull_request_state/models/__init__.py index 2729576d95..fcf8c4e0d6 100644 --- a/project_task_pull_request_state/models/__init__.py +++ b/project_task_pull_request_state/models/__init__.py @@ -1,5 +1,3 @@ -# Copyright Cetmix OU 2023 -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl-3.0). from . import project_task from . import project_project from . import res_config_settings diff --git a/project_task_pull_request_state/models/project_project.py b/project_task_pull_request_state/models/project_project.py index 482c8242ea..e849705d8d 100644 --- a/project_task_pull_request_state/models/project_project.py +++ b/project_task_pull_request_state/models/project_project.py @@ -3,11 +3,11 @@ from odoo import fields, models -class ProjectState(models.Model): +class Project(models.Model): _inherit = "project.project" pr_state_default = fields.Selection( - selection=lambda self: self.env["project.task"]._selection_pr_state(), + selection=lambda self: self.env["project.task"].selection_pr_state(), string="Default PR State", help="Default PR state that will be set when PR URI " "is added to a task in this project", diff --git a/project_task_pull_request_state/models/project_task.py b/project_task_pull_request_state/models/project_task.py index 264bb84cb3..7b8e2b6b75 100644 --- a/project_task_pull_request_state/models/project_task.py +++ b/project_task_pull_request_state/models/project_task.py @@ -3,11 +3,11 @@ from odoo import api, fields, models -class ProjectTaskState(models.Model): +class ProjectTask(models.Model): _inherit = "project.task" pr_state = fields.Selection( - selection=lambda self: self._selection_pr_state(), + selection=lambda self: self.selection_pr_state(), tracking=True, copy=False, string="PR State", @@ -17,7 +17,7 @@ class ProjectTaskState(models.Model): readonly=False, ) - def _selection_pr_state(self): + def selection_pr_state(self): """Function to select the state of the pull request""" return [ ("open", "Open"), diff --git a/project_task_pull_request_state/models/res_config_settings.py b/project_task_pull_request_state/models/res_config_settings.py index a405f3e0df..2c01439cc7 100644 --- a/project_task_pull_request_state/models/res_config_settings.py +++ b/project_task_pull_request_state/models/res_config_settings.py @@ -7,7 +7,7 @@ class ResConfigSettings(models.TransientModel): _inherit = "res.config.settings" pr_state_default = fields.Selection( - selection=lambda self: self.env["project.task"]._selection_pr_state(), + selection=lambda self: self.env["project.task"].selection_pr_state(), string="Default PR State", config_parameter="project_task_pull_request_state.pr_state_default", help="Default PR state that will be set when " diff --git a/project_task_pull_request_state/readme/CONTRIBUTORS.rst b/project_task_pull_request_state/readme/CONTRIBUTORS.rst index 63e9232e48..7c03b7eb60 100644 --- a/project_task_pull_request_state/readme/CONTRIBUTORS.rst +++ b/project_task_pull_request_state/readme/CONTRIBUTORS.rst @@ -1,3 +1,4 @@ -* Cetmix - Ivan Sokolov - Vladimir Kalmykov +* `Cetmix `__ + + * Ivan Sokolov + * Vladimir Kalmykov diff --git a/project_task_pull_request_state/readme/DESCRIPTION.rst b/project_task_pull_request_state/readme/DESCRIPTION.rst index 9632c15a9d..0df6d8d5bc 100644 --- a/project_task_pull_request_state/readme/DESCRIPTION.rst +++ b/project_task_pull_request_state/readme/DESCRIPTION.rst @@ -2,5 +2,5 @@ This module extends functionality of the project_task_pull_request module. It ad "State" field to Task alongside with PR URI field. Following pre-defined states are available: "Draft", "Open", "Merged", "Closed". You can -add or modify this list easily by overriding the "\_selection_pr_state" function in the +add or modify this list easily by overriding the "selection_pr_state" function in the "project.task" model diff --git a/project_task_pull_request_state/tests/test_project_task_pull_request_state.py b/project_task_pull_request_state/tests/test_project_task_pull_request_state.py index 3d07849f59..54627c82ea 100644 --- a/project_task_pull_request_state/tests/test_project_task_pull_request_state.py +++ b/project_task_pull_request_state/tests/test_project_task_pull_request_state.py @@ -76,16 +76,16 @@ def test_pull_request_state_set_default(self): tasks = self.Task.browse([self.task_1.id, self.task_2.id, self.task_3.id]) tasks.write({"pr_uri": "https://@my.pr.uri/pr"}) - self.assertEqual(self.task_1.pr_state, "draft", "PR state must be 'draft") - self.assertEqual(self.task_2.pr_state, "open", "PR state must be 'open") - self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed") + self.assertEqual(self.task_1.pr_state, "draft", "PR state must be 'draft'") + self.assertEqual(self.task_2.pr_state, "open", "PR state must be 'open'") + self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed'") # Change pr_state tasks.write({"pr_state": "closed"}) - self.assertEqual(self.task_1.pr_state, "closed", "PR state must be 'closed") - self.assertEqual(self.task_2.pr_state, "closed", "PR state must be 'closed") - self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed") + self.assertEqual(self.task_1.pr_state, "closed", "PR state must be 'closed'") + self.assertEqual(self.task_2.pr_state, "closed", "PR state must be 'closed'") + self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed'") def test_pull_request_state_set_explicit(self): """Set PR state from vals when PR URI is added to task""" @@ -93,9 +93,9 @@ def test_pull_request_state_set_explicit(self): tasks = self.Task.browse([self.task_1.id, self.task_2.id, self.task_3.id]) tasks.write({"pr_uri": "https://@my.pr.uri/pr", "pr_state": "merged"}) - self.assertEqual(self.task_1.pr_state, "merged", "PR state must be 'merged") - self.assertEqual(self.task_2.pr_state, "merged", "PR state must be 'merged") - self.assertEqual(self.task_3.pr_state, "merged", "PR state must be 'merged") + self.assertEqual(self.task_1.pr_state, "merged", "PR state must be 'merged'") + self.assertEqual(self.task_2.pr_state, "merged", "PR state must be 'merged'") + self.assertEqual(self.task_3.pr_state, "merged", "PR state must be 'merged'") def test_create_task_with_uri(self): """Add PR URI when task created""" @@ -130,9 +130,9 @@ def test_multi_create(self): ] test_tasks = self.Task.create(test_tasks_data) - self.assertEqual(test_tasks[0].pr_state, "draft", "PR state must be 'draft") - self.assertEqual(test_tasks[1].pr_state, "open", "PR state must be 'open") - self.assertEqual(test_tasks[2].pr_state, "closed", "PR state must be 'closed") + self.assertEqual(test_tasks[0].pr_state, "draft", "PR state must be 'draft'") + self.assertEqual(test_tasks[1].pr_state, "open", "PR state must be 'open'") + self.assertEqual(test_tasks[2].pr_state, "closed", "PR state must be 'closed'") def test_set_pr_state(self): """Test _set_pr_state function""" @@ -142,10 +142,10 @@ def test_set_pr_state(self): self._set_default_pr_state("closed") self.task_3.write({"pr_uri": "https://@my.pr.uri/new_pr"}) - self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed") + self.assertEqual(self.task_3.pr_state, "closed", "PR state must be 'closed'") self.task_1.write({"pr_uri": "https://@my.pr.uri/pr"}) - self.assertEqual(self.task_1.pr_state, "draft", "PR state must be 'draft") + self.assertEqual(self.task_1.pr_state, "draft", "PR state must be 'draft'") # Remove PR URI self.task_1.write({"pr_uri": ""}) self.assertFalse(self.task_1.pr_state, "PR state must be False") @@ -158,7 +158,7 @@ def test_set_pr_state(self): "pr_uri": "https://@my.pr.uri/pr", } ) - self.assertEqual(test_task.pr_state, "closed", "PR state must be 'closed") + self.assertEqual(test_task.pr_state, "closed", "PR state must be 'closed'") def test_set_pr_state_default(self): """Set values for the pr_state_default parameter"""