tegwick
8ab6e6c9c5
Implements CUST-WP-0007. Resolves inconsistencies I-1, I-2, I-5, I-6
identified in the GEMS audit (GenericEntityModellingSystem.md).
Pass 1 (e1f2a3b4c5d6): domain_id FK on extension_points and
technical_debt (replaces raw string column); repo_id FK on contributions.
Fixes domain-filtering bugs in EP/TD dashboard pages.
Pass 2 (f2a3b4c5d6e7): repo_id nullable FK on workstreams, aligning
the GEMS primary attachment with ADR-001 (repo > topic). Dashboard
pages updated to prefer repo->domain over topic->domain.
Pass 3 (a3b4c5d6e7f8): SBOMSnapshot container entity (GEMS Complex
between Repository and SBOMEntry). Ingest is now additive — each call
creates a new snapshot; history is retained. List/report endpoints
filter to latest snapshot per repo via _latest_snapshot_ids_subquery().
New endpoints: GET /sbom/snapshots/, GET /sbom/snapshots/{id}/.
Dashboard gains a Snapshot History section.
Also adds GEMS analysis artefacts: wiki/GEMS-StateHub-TypeRegistry.md,
wiki/GEMS-StateHub-SWOT.md, workplans/CUST-WP-0006 (analysis),
workplans/CUST-WP-0007 (migration, now completed).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
67 lines
2.5 KiB
Python
67 lines
2.5 KiB
Python
import enum
|
|
import uuid
|
|
from datetime import datetime
|
|
|
|
from sqlalchemy import Boolean, DateTime, Enum, ForeignKey, String, Text
|
|
from sqlalchemy.dialects.postgresql import UUID
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from api.models.base import Base, TimestampMixin, new_uuid
|
|
|
|
|
|
class ContributionType(str, enum.Enum):
|
|
br = "br"
|
|
fr = "fr"
|
|
ep = "ep"
|
|
upr = "upr"
|
|
|
|
|
|
class ContributionStatus(str, enum.Enum):
|
|
draft = "draft"
|
|
submitted = "submitted"
|
|
acknowledged = "acknowledged"
|
|
accepted = "accepted"
|
|
rejected = "rejected"
|
|
merged = "merged"
|
|
withdrawn = "withdrawn"
|
|
|
|
|
|
class Contribution(Base, TimestampMixin):
|
|
__tablename__ = "contributions"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(
|
|
UUID(as_uuid=True), primary_key=True, default=new_uuid
|
|
)
|
|
type: Mapped[ContributionType] = mapped_column(
|
|
Enum(ContributionType, name="contributiontype"), nullable=False
|
|
)
|
|
target_org: Mapped[str | None] = mapped_column(String(200), nullable=True)
|
|
target_repo: Mapped[str | None] = mapped_column(String(200), nullable=True)
|
|
slug: Mapped[str | None] = mapped_column(String(200), nullable=True)
|
|
title: Mapped[str] = mapped_column(String(500), nullable=False)
|
|
status: Mapped[ContributionStatus] = mapped_column(
|
|
Enum(ContributionStatus, name="contributionstatus"),
|
|
nullable=False, default=ContributionStatus.draft,
|
|
)
|
|
body_path: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
related_topic_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("topics.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
related_workstream_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("workstreams.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
repo_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("managed_repos.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
submitted_at: Mapped[datetime | None] = mapped_column(
|
|
DateTime(timezone=True), nullable=True
|
|
)
|
|
resolved_at: Mapped[datetime | None] = mapped_column(
|
|
DateTime(timezone=True), nullable=True
|
|
)
|
|
notes: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
|
|
topic: Mapped["Topic"] = relationship("Topic", lazy="selectin") # noqa: F821
|
|
workstream: Mapped["Workstream"] = relationship("Workstream", lazy="selectin") # noqa: F821
|
|
repo: Mapped["ManagedRepo"] = relationship("ManagedRepo", lazy="selectin") # noqa: F821
|