Use PostgreSQL 14 in docker-compose (#644)

wctaylor · almeidaraul · web-flow · commit ea409fe78e93 · 2026-03-12T17:00:48.000-03:00
* Bring docker-compose PostgreSQL in line with production, tweak broken migration script

* Remove postgresql_nulls_not_distinct=True

* Remove nullable from ArtefactMatchingRule

* wip: fix failing tests

* chore: update schema

---------

Co-authored-by: Raul Almeida &lt;raul.almeida@canonical.com&gt;
diff --git a/backend/migrations/versions/2026_02_09_1734-e9ada0b8b7a4_migrate_reviewer_families_to_artefact_matching_rules.py b/backend/migrations/versions/2026_02_09_1734-e9ada0b8b7a4_migrate_reviewer_families_to_artefact_matching_rules.py
@@ -83,9 +83,9 @@ def upgrade() -> None:
                     """
                     SELECT id FROM artefact_matching_rule 
                     WHERE family = :family 
-                    AND stage IS NULL 
-                    AND track IS NULL 
-                    AND branch IS NULL
+                    AND stage = '' 
+                    AND track = '' 
+                    AND branch = ''
                     """
                 ),
                 {"family": family}
@@ -99,7 +99,7 @@ def upgrade() -> None:
                     sa.text(
                         """
                         INSERT INTO artefact_matching_rule (family, stage, track, branch, created_at, updated_at)
-                        VALUES (:family, NULL, NULL, NULL, NOW(), NOW())
+                        VALUES (:family, '', '', '', NOW(), NOW())
                         RETURNING id
                         """
                     ),
diff --git a/backend/migrations/versions/2026_02_27_1246-40b42f906881_add_artefact_matching_rules.py b/backend/migrations/versions/2026_02_27_1246-40b42f906881_add_artefact_matching_rules.py
@@ -39,14 +39,14 @@ def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('artefact_matching_rule',
     sa.Column('family', family_type, nullable=False),
-    sa.Column('stage', sa.String(length=100), nullable=True),
-    sa.Column('track', sa.String(length=200), nullable=True),
-    sa.Column('branch', sa.String(length=200), nullable=True),
+    sa.Column('stage', sa.String(length=100), nullable=False, server_default=''),
+    sa.Column('track', sa.String(length=200), nullable=False, server_default=''),
+    sa.Column('branch', sa.String(length=200), nullable=False, server_default=''),
     sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
     sa.Column('created_at', sa.DateTime(), nullable=False),
     sa.Column('updated_at', sa.DateTime(), nullable=False),
     sa.PrimaryKeyConstraint('id', name=op.f('artefact_matching_rule_pkey')),
-    sa.UniqueConstraint('family', 'stage', 'track', 'branch', name=op.f('artefact_matching_rule_family_stage_track_branch_key'), postgresql_nulls_not_distinct=True)
+    sa.UniqueConstraint('family', 'stage', 'track', 'branch', name=op.f('artefact_matching_rule_family_stage_track_branch_key'))
     )
     op.create_table('artefact_matching_rule_team_association',
     sa.Column('artefact_matching_rule_id', sa.Integer(), nullable=False),
diff --git a/backend/schemata/openapi.json b/backend/schemata/openapi.json
@@ -4609,37 +4609,19 @@
             "$ref": "#/components/schemas/FamilyName"
           },
           "stage": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Stage"
+            "type": "string",
+            "title": "Stage",
+            "default": ""
           },
           "track": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Track"
+            "type": "string",
+            "title": "Track",
+            "default": ""
           },
           "branch": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Branch"
+            "type": "string",
+            "title": "Branch",
+            "default": ""
           }
         },
         "type": "object",
@@ -4659,36 +4641,15 @@
             "$ref": "#/components/schemas/FamilyName"
           },
           "stage": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "type": "string",
             "title": "Stage"
           },
           "track": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "type": "string",
             "title": "Track"
           },
           "branch": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "type": "string",
             "title": "Branch"
           }
         },
@@ -4773,37 +4734,19 @@
             "$ref": "#/components/schemas/FamilyName"
           },
           "stage": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Stage"
+            "type": "string",
+            "title": "Stage",
+            "default": ""
           },
           "track": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Track"
+            "type": "string",
+            "title": "Track",
+            "default": ""
           },
           "branch": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Branch"
+            "type": "string",
+            "title": "Branch",
+            "default": ""
           },
           "team_ids": {
             "items": {
@@ -4831,36 +4774,15 @@
             "$ref": "#/components/schemas/FamilyName"
           },
           "stage": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "type": "string",
             "title": "Stage"
           },
           "track": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "type": "string",
             "title": "Track"
           },
           "branch": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
+            "type": "string",
             "title": "Branch"
           },
           "teams": {
diff --git a/backend/test_observer/controllers/artefact_matching_rules/artefact_matching_rules.py b/backend/test_observer/controllers/artefact_matching_rules/artefact_matching_rules.py
@@ -204,10 +204,10 @@ def update_artefact_matching_rule(
     # Check if updated rule would conflict with existing rule
     existing_rule = db.execute(
         select(ArtefactMatchingRule).where(
-            ArtefactMatchingRule.family == request.family,
-            ArtefactMatchingRule.stage == request.stage,
-            ArtefactMatchingRule.track == request.track,
-            ArtefactMatchingRule.branch == request.branch,
+            ArtefactMatchingRule.family == (request.family if request.family is not None else rule.family),
+            ArtefactMatchingRule.stage == (request.stage if request.stage is not None else rule.stage),
+            ArtefactMatchingRule.track == (request.track if request.track is not None else rule.track),
+            ArtefactMatchingRule.branch == (request.branch if request.branch is not None else rule.branch),
             ArtefactMatchingRule.id != rule_id,
         )
     ).scalar_one_or_none()
diff --git a/backend/test_observer/controllers/artefact_matching_rules/models.py b/backend/test_observer/controllers/artefact_matching_rules/models.py
@@ -25,18 +25,18 @@
 class ArtefactMatchingRuleBase(BaseModel):
     """Base model for artefact matching rule with common fields"""
     family: FamilyName
-    stage: str | None = None
-    track: str | None = None
-    branch: str | None = None
+    stage: str = ""
+    track: str = ""
+    branch: str = ""
 
 
 class ArtefactMatchingRuleInResponse(BaseModel):
     """Artefact matching rule fields when included in responses (no relationships)"""
     id: int
     family: FamilyName
-    stage: str | None
-    track: str | None
-    branch: str | None
+    stage: str
+    track: str
+    branch: str
 
 
 class TeamMinimal(BaseModel):
@@ -48,9 +48,9 @@ class ArtefactMatchingRuleResponse(BaseModel):
     """Artefact matching rule with associated teams"""
     id: int
     family: FamilyName
-    stage: str | None
-    track: str | None
-    branch: str | None
+    stage: str
+    track: str
+    branch: str
     teams: list[TeamMinimal]
 
 
diff --git a/backend/test_observer/controllers/test_executions/start_test.py b/backend/test_observer/controllers/test_executions/start_test.py
@@ -17,20 +17,20 @@
 from datetime import date, timedelta
 
 from fastapi import APIRouter, Body, Depends, Security
-from sqlalchemy import select, and_, or_
+from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session
 
 from test_observer.common.permissions import Permission, permission_checker
 from test_observer.data_access.models import (
     Artefact,
     ArtefactBuild,
     ArtefactBuildEnvironmentReview,
+    ArtefactMatchingRule,
     Environment,
     Team,
     TestExecution,
     TestPlan,
     User,
-    ArtefactMatchingRule,
 )
 from test_observer.data_access.repository import (
     create_test_execution_relevant_link,
@@ -88,14 +88,17 @@ def assign_reviewer(self):
                 .where(
                     and_(
                         ArtefactMatchingRule.family == family_str,
-                        or_(ArtefactMatchingRule.stage == self.artefact.stage, ArtefactMatchingRule.stage.is_(None)),
-                        or_(ArtefactMatchingRule.track == self.artefact.track, ArtefactMatchingRule.track.is_(None)),
-                        or_(ArtefactMatchingRule.branch == self.artefact.branch, ArtefactMatchingRule.branch.is_(None)),
+                        or_(ArtefactMatchingRule.stage == self.artefact.stage, ArtefactMatchingRule.stage == ""),
+                        or_(ArtefactMatchingRule.track == self.artefact.track, ArtefactMatchingRule.track == ""),
+                        or_(ArtefactMatchingRule.branch == self.artefact.branch, ArtefactMatchingRule.branch == ""),
                     ),
             )).scalars().all()
 
-            # sort rules by number of non-null fields to prioritize specificity
-            rules_with_score = [[r, sum(1 for field in [r.stage, r.track, r.branch] if field is not None)] for r in possible_rules]
+            # sort rules by number of non-empty fields to prioritize specificity
+            rules_with_score = [
+                [r, sum(1 for field in [r.stage, r.track, r.branch] if field != "")]
+                for r in possible_rules
+            ]
             sorted_rules = sorted(rules_with_score, key=lambda x: x[1], reverse=True)
             highest_score = sorted_rules[0][1] if sorted_rules else 0
             rules = [r[0] for r in sorted_rules if r[1] == highest_score]
diff --git a/backend/test_observer/data_access/models.py b/backend/test_observer/data_access/models.py
@@ -196,9 +196,9 @@ class ArtefactMatchingRule(Base):
     __tablename__ = "artefact_matching_rule"
 
     family: Mapped[FamilyName]
-    stage: Mapped[str | None] = mapped_column(String(100), default=None)
-    track: Mapped[str | None] = mapped_column(String(200), default=None)
-    branch: Mapped[str | None] = mapped_column(String(200), default=None)
+    stage: Mapped[str] = mapped_column(String(100), default="", server_default="")
+    track: Mapped[str] = mapped_column(String(200), default="", server_default="")
+    branch: Mapped[str] = mapped_column(String(200), default="", server_default="")
 
     teams: Mapped[list[Team]] = relationship(
         secondary="artefact_matching_rule_team_association",
@@ -207,7 +207,7 @@ class ArtefactMatchingRule(Base):
 
     __table_args__ = (
         UniqueConstraint(
-            "family", "stage", "track", "branch", postgresql_nulls_not_distinct=True
+            "family", "stage", "track", "branch"
         ),
     )
 
diff --git a/backend/tests/controllers/artefact_matching_rules/test_artefact_matching_rules.py b/backend/tests/controllers/artefact_matching_rules/test_artefact_matching_rules.py
@@ -41,8 +41,8 @@ def test_create_artefact_matching_rule(test_client: TestClient, generator: DataG
     data = response.json()
     assert data["family"] == "snap"
     assert data["track"] == "22"
-    assert data["stage"] is None
-    assert data["branch"] is None
+    assert data["stage"] == ""
+    assert data["branch"] == ""
     assert len(data["teams"]) == 1
     assert data["teams"][0]["id"] == team.id
     assert "id" in data
@@ -90,9 +90,9 @@ def test_create_artefact_matching_rule_family_only(test_client: TestClient, gene
     assert response.status_code == 201
     data = response.json()
     assert data["family"] == "deb"
-    assert data["track"] is None
-    assert data["stage"] is None
-    assert data["branch"] is None
+    assert data["track"] == ""
+    assert data["stage"] == ""
+    assert data["branch"] == ""
     assert len(data["teams"]) == 1
 
 
@@ -305,7 +305,7 @@ def test_update_artefact_matching_rule(
     assert data["family"] == "snap"
     assert data["track"] == "24"
     assert data["stage"] == "stable"
-    assert data["branch"] is None
+    assert data["branch"] == ""
     # Teams should be preserved
     assert len(data["teams"]) == 1
     assert data["teams"][0]["id"] == team.id
diff --git a/backend/tests/controllers/teams/test_teams.py b/backend/tests/controllers/teams/test_teams.py
diff --git a/backend/tests/data_generator.py b/backend/tests/data_generator.py
diff --git a/docker-compose.yml b/docker-compose.yml
