[MIG] github_connector: Migration to 19.0

Author: juppe

github_connector/__manifest__.py

@@ -7,7 +7,7 @@
 {
     "name": "Github Connector",
     "summary": "Synchronize information from Github repositories",
-    "version": "18.0.1.0.0",
+    "version": "19.0.1.0.0",
     "category": "Connector",
     "license": "AGPL-3",
     "author": "Odoo Community Association (OCA), GRAP, Akretion, Tecnativa",

github_connector/models/abstract_github_model.py

@@ -284,8 +284,7 @@ def _update_from_github_data(self, data):
                 item.write(to_write)
 
     def get_github_connector(self):
-        ICP = self.env["ir.config_parameter"]
-        token = tools.config.get("github_token") or ICP.get_param(
+        token = tools.config.get("github_token") or self.env["ir.config_parameter"].sudo().get_param(
             "github.access_token", default=""
         )
         if not token:

github_connector/models/github_organization.py

@@ -119,39 +119,39 @@ def _compute_member_qty(self):
 
     @api.depends("repository_ids.organization_id")
     def _compute_repository_qty(self):
-        data = self.env["github.repository"].read_group(
+        data = self.env["github.repository"]._read_group(
             [("organization_id", "in", self.ids)],
-            ["organization_id"],
-            ["organization_id"],
+            groupby=["organization_id"],
+            aggregates=["__count"],
         )
         mapping = {
-            data["organization_id"][0]: data["organization_id_count"] for data in data
+            org.id: count for org, count in data
         }
         for item in self:
             item.repository_qty = mapping.get(item.id, 0)
 
     @api.depends("team_ids.organization_id")
     def _compute_team_qty(self):
-        data = self.env["github.team"].read_group(
+        data = self.env["github.team"]._read_group(
             [("organization_id", "in", self.ids)],
-            ["organization_id"],
-            ["organization_id"],
+            groupby=["organization_id"],
+            aggregates=["__count"],
         )
         mapping = {
-            data["organization_id"][0]: data["organization_id_count"] for data in data
+            org.id: count for org, count in data
         }
         for item in self:
             item.team_qty = mapping.get(item.id, 0)
 
     @api.depends("organization_serie_ids.organization_id")
     def _compute_organization_serie_qty(self):
-        data = self.env["github.organization.serie"].read_group(
+        data = self.env["github.organization.serie"]._read_group(
             [("organization_id", "in", self.ids)],
-            ["organization_id"],
-            ["organization_id"],
+            groupby=["organization_id"],
+            aggregates=["__count"],
         )
         mapping = {
-            data["organization_id"][0]: data["organization_id_count"] for data in data
+            org.id: count for org, count in data
         }
         for item in self:
             item.organization_serie_qty = mapping.get(item.id, 0)

github_connector/models/github_organization_serie.py

@@ -20,10 +20,7 @@ class GithubOrganizationSerie(models.Model):
         required=True,
     )
 
-    _sql_constraints = [
-        (
-            "sequence_organization_uniq",
-            "unique(organization_id, sequence)",
-            "Sequence serie must be unique by organization.",
-        )
-    ]
+    _sequence_organization_uniq = models.Constraint(
+        "unique(organization_id, sequence)",
+        "Sequence serie must be unique by organization.",
+    )

github_connector/models/github_repository.py

@@ -86,11 +86,11 @@ def _compute_ignore(self):
 
     @api.depends("team_ids")
     def _compute_team_qty(self):
-        data = self.env["github.team.repository"].read_group(
-            [("repository_id", "in", self.ids)], ["repository_id"], ["repository_id"]
+        data = self.env["github.team.repository"]._read_group(
+            [("repository_id", "in", self.ids)], groupby=["repository_id"], aggregates=["__count"]
         )
         mapping = {
-            data["repository_id"][0]: data["repository_id_count"] for data in data
+            repo.id: count for repo, count in data
         }
         for item in self:
             item.team_qty = mapping.get(item.id, 0)
@@ -104,11 +104,11 @@ def _compute_complete_name(self):
 
     @api.depends("repository_branch_ids.repository_id")
     def _compute_repository_branch_qty(self):
-        data = self.env["github.repository.branch"].read_group(
-            [("repository_id", "in", self.ids)], ["repository_id"], ["repository_id"]
+        data = self.env["github.repository.branch"]._read_group(
+            [("repository_id", "in", self.ids)], groupby=["repository_id"], aggregates=["__count"]
         )
         mapping = {
-            data["repository_id"][0]: data["repository_id_count"] for data in data
+            repo.id: count for repo, count in data
         }
         for item in self:
             item.repository_branch_qty = mapping.get(item.id, 0)
@@ -196,9 +196,13 @@ def button_sync_branch(self):
                     branch_ids.append(branch.id)
                 else:
                     _logger.warning(
-                        "the branch '%s'/'%s' has been ignored.",
+                        "The branch '%s'/'%s' has been ignored because '%s' is not "
+                        "configured as a series for organization '%s'. "
+                        "Please add this series in the organization configuration.",
                         repository.name,
                         gh_branch.name,
+                        gh_branch.name,
+                        repository.organization_id.name,
                     )
             repository.repository_branch_ids = [(6, 0, branch_ids)]
 

github_connector/models/github_repository_branch.py

@@ -8,8 +8,9 @@
 import logging
 import os
 import shutil
+import subprocess
 from datetime import datetime
-from subprocess import check_output
+
 
 from odoo import addons, api, exceptions, fields, models, tools
 from odoo.tools.safe_eval import safe_eval
@@ -162,15 +163,41 @@ def _download_code(self):
                             branch.local_path,
                         )
                     ) from None
-                command = f"git clone {gh_repo.clone_url} -b {branch.name} {branch.local_path}"  # noqa: E501
-                os.system(command)
+
+                # Get GitHub token for authenticated cloning
+                token = tools.config.get("github_token") or self.env["ir.config_parameter"].sudo().get_param(
+                    "github.access_token", default=""
+                )
+
+                # Use authenticated URL if token is available
+                clone_url = gh_repo.clone_url
+                if token and clone_url.startswith("https://github.com/"):
+                    clone_url = clone_url.replace("https://github.com/", f"https://{token}@github.com/")
+
+                # Build git clone command
+                command = ["git", "clone", "-b", branch.name, clone_url, branch.local_path]
+
+                # Set environment to disable git credential prompts
+                env = os.environ.copy()
+                env['GIT_TERMINAL_PROMPT'] = '0'  # Disable credential prompts
+                env['GIT_ASKPASS'] = 'echo'  # Return empty string for password prompts
+
+                subprocess.run(
+                    command,
+                    capture_output=True,
+                    text=True,
+                    timeout=300,  # 5 minute timeout
+                    check=True,
+                    env=env,
+                    stdin=subprocess.DEVNULL  # Don't wait for input
+                )
                 branch.write(
                     {"last_download_date": datetime.today(), "state": "to_analyze"}
                 )
             else:
                 # Update repository
                 try:
-                    res = check_output(
+                    res = subprocess.check_output(
                         ["git", "pull", "origin", branch.name], cwd=branch.local_path
                     )
                     vals = {"last_download_date": datetime.today()}
@@ -217,7 +244,7 @@ def _get_analysis_rules(self):
     def _call_cloc_command(self):
         """Execute the cloc command and save the result temporarily to access it in
         multiple places."""
-        res = check_output(["cloc", "--by-file", "--json", self.local_path])
+        res = subprocess.check_output(["cloc", "--by-file", "--json", self.local_path])
         return json.loads(res)
 
     def set_analysis_rule_info(self):
@@ -323,7 +350,7 @@ def _analyze_code(self):
                     # Mark the branch as analyzed
                     branch.write(vals)
                     if partial_commit:
-                        self._cr.commit()  # pylint: disable=invalid-commit
+                        self.env.cr.commit()  # pylint: disable=invalid-commit
                 except Exception as e:
                     _logger.warning(
                         "Cannot analyze branch %s so skipping it, error is: %s",

github_connector/models/github_team.py

@@ -84,19 +84,19 @@ def _compute_complete_name(self):
 
     @api.depends("partner_ids")
     def _compute_partner_qty(self):
-        data = self.env["github.team.partner"].read_group(
-            [("team_id", "in", self.ids)], ["team_id"], ["team_id"]
+        data = self.env["github.team.partner"]._read_group(
+            [("team_id", "in", self.ids)], groupby=["team_id"], aggregates=["__count"]
         )
-        mapping = {data["team_id"][0]: data["team_id_count"] for data in data}
+        mapping = {team.id: count for team, count in data}
         for item in self:
             item.partner_qty = mapping.get(item.id, 0)
 
     @api.depends("repository_ids")
     def _compute_repository_qty(self):
-        data = self.env["github.team.repository"].read_group(
-            [("team_id", "in", self.ids)], ["team_id"], ["team_id"]
+        data = self.env["github.team.repository"]._read_group(
+            [("team_id", "in", self.ids)], groupby=["team_id"], aggregates=["__count"]
         )
-        mapping = {data["team_id"][0]: data["team_id_count"] for data in data}
+        mapping = {team.id: count for team, count in data}
         for item in self:
             item.repository_qty = mapping.get(item.id, 0)
 

github_connector/models/res_partner.py

@@ -47,13 +47,10 @@ class ResPartner(models.Model):
     )
 
     # Constraints Section
-    _sql_constraints = [
-        (
-            "github_login_uniq",
-            "unique(github_name)",
-            "Two different partners cannot have the same Github Login",
-        )
-    ]
+    _github_login_uniq = models.Constraint(
+        "unique(github_name)",
+        "Two different partners cannot have the same Github Login",
+    )
 
     @api.constrains("github_name", "is_company")
     def _check_login_company(self):
@@ -74,10 +71,10 @@ def _compute_organization_qty(self):
 
     @api.depends("github_team_partner_ids")
     def _compute_github_team_qty(self):
-        data = self.env["github.team.partner"].read_group(
-            [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"]
+        data = self.env["github.team.partner"]._read_group(
+            [("partner_id", "in", self.ids)], groupby=["partner_id"], aggregates=["__count"]
         )
-        mapping = {data["partner_id"][0]: data["partner_id_count"] for data in data}
+        mapping = {partner.id: count for partner, count in data}
         for item in self:
             item.github_team_qty = mapping.get(item.id, 0)
 

github_connector/security/res_groups.xml

@@ -6,17 +6,23 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 -->
 <odoo>
     <record id="base.group_no_one" model="res.groups">
-        <field name="users" eval="[(4, ref('base.user_root'))]" />
+        <field name="user_ids" eval="[(4, ref('base.user_root'))]" />
     </record>
+
+    <record id="privilege_github_connector" model="res.groups.privilege">
+        <field name="name">Github Connector</field>
+        <field name="category_id" ref="module_category_github_connector"/>
+    </record>
+
     <record id="group_github_connector_user" model="res.groups">
-        <field name="name">Connector Github User</field>
-        <field name="category_id" ref="module_category_github_connector" />
+        <field name="name">User</field>
+        <field name="privilege_id" ref="privilege_github_connector" />
     </record>
     <record id="group_github_connector_manager" model="res.groups">
-        <field name="name">Connector Github Manager</field>
-        <field name="category_id" ref="module_category_github_connector" />
+        <field name="name">Manager</field>
+        <field name="privilege_id" ref="privilege_github_connector" />
         <field
-            name="users"
+            name="user_ids"
             eval="[(4, ref('base.user_admin')), (4, ref('base.user_root'))]"
         />
         <field

github_connector/views/view_github_repository.xml

@@ -15,13 +15,11 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                     filter_domain="['|', ('name', 'ilike', self), ('description', 'ilike', self)]"
                 />
                 <field name="organization_id" />
-                <group expand="1" string="Group By">
-                    <filter
-                        string="Organization"
-                        name="organization"
-                        context="{'group_by' : 'organization_id'}"
-                    />
-                </group>
+                <filter
+                    string="Organization"
+                    name="organization"
+                    context="{'group_by' : 'organization_id'}"
+                />
             </search>
         </field>
     </record>