mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-08-11 00:30:12 -04:00
af7874546a
Projects made of many distinct files that each need N prints (e.g. 13
plates x 10 sets = 130 prints) only had aggregate progress. Finding out
"how many times have I printed plate_7?" meant reading the Activity
Timeline line by line, unusable at 130 events.
Projects now take an optional Copies per File target. Every printable
file in the project's linked folders shows an X / N badge with a mini
progress bar (gray not started, amber in progress, green done), and the
progress card gains a Complete Sets bar - the minimum per-file count,
i.e. how many finished assemblies can be shipped right now. Without the
target, printable files show a plain printed-count badge.
Counting matches the aggregate project stats: completed runs only,
served by a new /projects/{id}/file-progress endpoint. Runs attribute
to a file via a new library_file_id stamp on queue-dispatched archives,
falling back to content hash and then filename for historical rows.
Also fixed: files queued from a project-linked File Manager folder now
inherit that project, so their prints count toward project statistics -
previously only prints started from the project page were attributed.
Test-harness fix along the way: the test suite's get_db override never
committed, unlike production get_db, so endpoints relying on the
request-scoped commit silently lost their writes in tests. The override
now mirrors production commit/rollback semantics.
84 lines
3.8 KiB
Python
84 lines
3.8 KiB
Python
from datetime import datetime
|
|
|
|
from sqlalchemy import JSON, Boolean, DateTime, Float, ForeignKey, Integer, String, Text, func
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from backend.app.core.database import Base
|
|
|
|
|
|
class Project(Base):
|
|
"""Project to group related prints (e.g., 'Voron Build' with multiple parts)."""
|
|
|
|
__tablename__ = "projects"
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True)
|
|
name: Mapped[str] = mapped_column(String(255))
|
|
description: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
color: Mapped[str | None] = mapped_column(String(20), nullable=True) # Hex color for UI
|
|
status: Mapped[str] = mapped_column(String(20), default="active") # active, completed, archived
|
|
|
|
# External link rendered as a clickable icon next to the project name (#1155).
|
|
url: Mapped[str | None] = mapped_column(String(2048), nullable=True)
|
|
# Filename of the cover photo inside the project's attachments dir; serves as
|
|
# the card's hero image when set (#1155). The file lives alongside other
|
|
# attachments but is tracked here separately so users can manage one without
|
|
# the other.
|
|
cover_image_filename: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
|
target_count: Mapped[int | None] = mapped_column(
|
|
Integer, nullable=True
|
|
) # Optional target number of prints (plates)
|
|
target_parts_count: Mapped[int | None] = mapped_column(
|
|
Integer, nullable=True
|
|
) # Optional target number of parts/objects
|
|
# Optional copies-per-file target (#1897): every printable file in the
|
|
# project's linked folders should be printed this many times ("sets").
|
|
target_sets: Mapped[int | None] = mapped_column(Integer, nullable=True)
|
|
|
|
# Phase 2: Rich text notes (HTML from WYSIWYG editor)
|
|
notes: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
|
|
# Phase 3: File attachments stored as JSON array
|
|
# Format: [{"filename": "x.stl", "original_name": "part.stl", "size": 1234, "uploaded_at": "..."}]
|
|
attachments: Mapped[list | None] = mapped_column(JSON, nullable=True)
|
|
|
|
# Phase 4: Tags (comma-separated)
|
|
tags: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
|
|
# Phase 5: Due dates and priority
|
|
due_date: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
|
priority: Mapped[str] = mapped_column(String(20), default="normal") # low, normal, high, urgent
|
|
|
|
# Phase 6: Budget tracking
|
|
budget: Mapped[float | None] = mapped_column(Float, nullable=True)
|
|
|
|
# Phase 8: Templates
|
|
is_template: Mapped[bool] = mapped_column(Boolean, default=False)
|
|
template_source_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
|
|
|
|
# Phase 10: Sub-projects (hierarchical)
|
|
parent_id: Mapped[int | None] = mapped_column(ForeignKey("projects.id"), nullable=True)
|
|
|
|
# Timestamps
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now(), onupdate=func.now())
|
|
|
|
# Relationships
|
|
archives: Mapped[list["PrintArchive"]] = relationship(back_populates="project")
|
|
queue_items: Mapped[list["PrintQueueItem"]] = relationship(back_populates="project")
|
|
children: Mapped[list["Project"]] = relationship(
|
|
"Project",
|
|
back_populates="parent",
|
|
foreign_keys="Project.parent_id",
|
|
)
|
|
parent: Mapped["Project | None"] = relationship(
|
|
"Project",
|
|
back_populates="children",
|
|
remote_side="Project.id",
|
|
foreign_keys="Project.parent_id",
|
|
)
|
|
bom_items: Mapped[list["ProjectBOMItem"]] = relationship(back_populates="project", cascade="all, delete-orphan")
|
|
|
|
|
|
from backend.app.models.archive import PrintArchive # noqa: E402
|
|
from backend.app.models.print_queue import PrintQueueItem # noqa: E402
|
|
from backend.app.models.project_bom import ProjectBOMItem # noqa: E402
|