Создание и первичная инициализация базы даных успешно завершена. Наполнение демо-данными прошло без ошибок
This commit is contained in:
+14
-10
@@ -1,7 +1,16 @@
|
||||
from datetime import datetime
|
||||
from sqlalchemy import Column, DateTime, Float, ForeignKey, Integer, String, Text
|
||||
from sqlalchemy import (
|
||||
Boolean,
|
||||
Column,
|
||||
DateTime,
|
||||
Float,
|
||||
ForeignKey,
|
||||
Integer,
|
||||
String,
|
||||
Text,
|
||||
)
|
||||
from sqlalchemy.dialects.postgresql import JSONB
|
||||
from db import Base
|
||||
from db import Base, CRUD
|
||||
import utils
|
||||
|
||||
|
||||
@@ -28,18 +37,19 @@ class StocksRecords(Base):
|
||||
init_user_id = Column(
|
||||
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=False
|
||||
)
|
||||
accept_user_id = Column(
|
||||
decision_user_id = Column(
|
||||
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True
|
||||
)
|
||||
reason = Column(Text, nullable=False)
|
||||
quantity = Column(Integer, nullable=False)
|
||||
price = Column(Float, nullable=False)
|
||||
accepted = Column(Boolean, default=None, nullable=True)
|
||||
edit_user_id = Column(
|
||||
Integer, ForeignKey("users.id", ondelete="CASCADE"), nullable=True
|
||||
)
|
||||
edited = Column(JSONB, nullable=True)
|
||||
created_at = Column(DateTime, default=datetime.now)
|
||||
accepted_at = Column(DateTime, nullable=True)
|
||||
decided_at = Column(DateTime, nullable=True)
|
||||
edited_at = Column(DateTime, nullable=True)
|
||||
updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now)
|
||||
|
||||
@@ -51,13 +61,9 @@ class StocksRecords(Base):
|
||||
return utils.toDict(self)
|
||||
|
||||
async def save(self):
|
||||
from db import CRUD
|
||||
|
||||
return await CRUD.create(self, refresh=True)
|
||||
|
||||
async def edit(self, **kwargs):
|
||||
from db import CRUD
|
||||
|
||||
return await CRUD.update(StocksRecords, self.id, **kwargs)
|
||||
|
||||
|
||||
@@ -77,6 +83,4 @@ class ServicesRecords(Base):
|
||||
return utils.toDict(self)
|
||||
|
||||
async def save(self):
|
||||
from db import CRUD
|
||||
|
||||
return await CRUD.create(self, refresh=True)
|
||||
|
||||
Reference in New Issue
Block a user