tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changed initial_weight to be net weight, not gross weight

Browse Source
This commit is contained in:
Matt Gerega
2024-04-10 11:00:46 -04:00
parent dad446621f
commit c6f9abeced
14 changed files with 159 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
migrations/versions/2024_03_26_0948-aafcd7fb0e84_spool_weights.py
View File

@@ -23,12 +23,12 @@ def upgrade() -> None:
"initial_weight",
sa.Float(),
nullable=True,
comment="The initial total weight of the spool (gross weight).",
comment="The initial weight of the filament on the spool (net weight).",
),
)
op.add_column(
"spool",
sa.Column("empty_weight", sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."),
sa.Column("spool_weight", sa.Float(), nullable=True, comment="The weight of the empty spool (tare weight)."),
)
# ### end Alembic commands ###
@@ -36,6 +36,6 @@ def upgrade() -> None:
def downgrade() -> None:
"""Perform the downgrade."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column("spool", "empty_weight")
op.drop_column("spool", "spool_weight")
op.drop_column("spool", "initial_weight")
# ### end Alembic commands ###

8
migrations/versions/2024_03_26_1349-304a32906234_spool_weight_population.py
View File

@@ -37,7 +37,7 @@ def upgrade() -> None:
nullable=False,
),
sa.Column(
"empty_weight",
"spool_weight",
sa.Float(),
nullable=False,
),
@@ -48,13 +48,13 @@ def upgrade() -> None:
.where(filament.c.id == spool.c.filament_id)
.scalar_subquery()
)
empty_weight = sa.select(filament.c.spool_weight).where(filament.c.id == spool.c.filament_id).scalar_subquery()
spool_weight = sa.select(filament.c.spool_weight).where(filament.c.id == spool.c.filament_id).scalar_subquery()
set_initial_weight = sa.update(spool).values(initial_weight=initial_weight)
op.execute(set_initial_weight)
set_empty_weight = sa.update(spool).values(empty_weight=empty_weight)
op.execute(set_empty_weight)
set_spool_weight = sa.update(spool).values(spool_weight=spool_weight)
op.execute(set_spool_weight)
pass