Skip to content

Commit a4fde4e

Browse files
committed
code cleanup & migration
1 parent a92fc1b commit a4fde4e

10 files changed

+80
-277
lines changed

backend/app/alembic/versions/1a31ce608336_add_cascade_delete_relationships.py

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
"""Initial migration after reset
2+
3+
Revision ID: 500f93e5ee22
4+
Revises:
5+
Create Date: 2024-10-14 02:55:15.837663
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
import sqlmodel.sql.sqltypes
11+
12+
13+
# revision identifiers, used by Alembic.
14+
revision = '500f93e5ee22'
15+
down_revision = None
16+
branch_labels = None
17+
depends_on = None
18+
19+
20+
def upgrade():
21+
# ### commands auto generated by Alembic - please adjust! ###
22+
op.create_table('user',
23+
sa.Column('email', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=False),
24+
sa.Column('is_active', sa.Boolean(), nullable=False),
25+
sa.Column('is_superuser', sa.Boolean(), nullable=False),
26+
sa.Column('full_name', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
27+
sa.Column('id', sa.Uuid(), nullable=False),
28+
sa.Column('hashed_password', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
29+
sa.PrimaryKeyConstraint('id')
30+
)
31+
op.create_index(op.f('ix_user_email'), 'user', ['email'], unique=True)
32+
op.create_table('item',
33+
sa.Column('title', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=False),
34+
sa.Column('description', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
35+
sa.Column('aiwscode', sqlmodel.sql.sqltypes.AutoString(length=50), nullable=False),
36+
sa.Column('name', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=False),
37+
sa.Column('location', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=False),
38+
sa.Column('expiry', sa.Date(), nullable=True),
39+
sa.Column('stk', sa.Date(), nullable=True),
40+
sa.Column('mtk', sa.Date(), nullable=True),
41+
sa.Column('lot', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
42+
sa.Column('serial', sqlmodel.sql.sqltypes.AutoString(length=255), nullable=True),
43+
sa.Column('notes', sqlmodel.sql.sqltypes.AutoString(length=1000), nullable=True),
44+
sa.Column('id', sa.Uuid(), nullable=False),
45+
sa.Column('owner_id', sa.Uuid(), nullable=False),
46+
sa.ForeignKeyConstraint(['owner_id'], ['user.id'], ondelete='CASCADE'),
47+
sa.PrimaryKeyConstraint('id')
48+
)
49+
# ### end Alembic commands ###
50+
51+
52+
def downgrade():
53+
# ### commands auto generated by Alembic - please adjust! ###
54+
op.drop_table('item')
55+
op.drop_index(op.f('ix_user_email'), table_name='user')
56+
op.drop_table('user')
57+
# ### end Alembic commands ###

backend/app/alembic/versions/9c0a54914c78_add_max_length_for_string_varchar_.py

Lines changed: 0 additions & 69 deletions
This file was deleted.

backend/app/alembic/versions/d98dd8ec85a3_edit_replace_id_integers_in_all_models_.py

Lines changed: 0 additions & 90 deletions
This file was deleted.

backend/app/alembic/versions/e2412789c190_initialize_models.py

Lines changed: 0 additions & 54 deletions
This file was deleted.

backend/app/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ class ItemBase(SQLModel):
6666
name: str = Field(min_length=1, max_length=255)
6767
location: str = Field(min_length=1, max_length=255)
6868
expiry: Optional[date] = Field(default=None)
69-
stk: int = Field(default=0)
70-
mtk: int = Field(default=0)
69+
stk: Optional[date] = Field(default=None)
70+
mtk: Optional[date] = Field(default=None)
7171
lot: Optional[str] = Field(default=None, max_length=255)
7272
serial: Optional[str] = Field(default=None, max_length=255)
7373
notes: Optional[str] = Field(default=None, max_length=1000)
@@ -94,8 +94,8 @@ class Item(ItemBase, table=True):
9494
name: str = Field(min_length=1, max_length=255)
9595
location: str = Field(min_length=1, max_length=255)
9696
expiry: Optional[date] = Field(default=None)
97-
stk: int = Field(default=0)
98-
mtk: int = Field(default=0)
97+
stk: Optional[date] = Field(default=None)
98+
mtk: Optional[date] = Field(default=None)
9999
lot: Optional[str] = Field(default=None, max_length=255)
100100
serial: Optional[str] = Field(default=None, max_length=255)
101101
notes: Optional[str] = Field(default=None, max_length=1000)

backend/app/tests/api/routes/test_items.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ def test_update_item_not_enough_permissions(
182182
"aiwscode": "UPDATED_AIWS",
183183
"name": "Updated Name",
184184
"location": "Warehouse B",
185-
"expiry": "2025-12-31",
186-
"stk": 150,
187-
"mtk": 20,
185+
"expiry": "2025-01-31",
186+
"stk": "2022-12-31",
187+
"mtk": "2021-10-30",
188188
"lot": "UPDATED_LOT",
189189
"serial": "UPDATED_SERIAL",
190190
"notes": "Updated notes"

frontend/src/client/models.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ export type ItemCreate = {
2020
name: string
2121
location: string
2222
expiry?: string | null
23-
stk: number
24-
mtk: number
23+
stk?: string | null
24+
mtk?: string | null
2525
lot?: string | null
2626
serial?: string | null
2727
notes?: string | null
@@ -36,8 +36,8 @@ export type ItemPublic = {
3636
name: string
3737
location: string
3838
expiry?: string | null
39-
stk: number
40-
mtk: number
39+
stk?: string | null
40+
mtk?: string | null
4141
lot?: string | null
4242
serial?: string | null
4343
notes?: string | null
@@ -52,8 +52,8 @@ export type ItemUpdate = {
5252
name: string| null
5353
location: string| null
5454
expiry?: string | null
55-
stk: number| null
56-
mtk: number| null
55+
stk?: string | null
56+
mtk?: string | null
5757
lot?: string | null
5858
serial?: string | null
5959
notes?: string | null

0 commit comments

Comments
 (0)