From 0d70e7636fabf9de9cac22d7963dc92e62bc9ef2 Mon Sep 17 00:00:00 2001 From: Wudext Date: Thu, 8 Dec 2022 14:56:47 +0300 Subject: [PATCH 1/2] Fixing #3 and #4 --- services_backend/routes/button.py | 2 +- services_backend/routes/category.py | 3 ++- services_backend/routes/models/category.py | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services_backend/routes/button.py b/services_backend/routes/button.py index bb6d54f..7cdeeb9 100644 --- a/services_backend/routes/button.py +++ b/services_backend/routes/button.py @@ -7,7 +7,7 @@ button = APIRouter() -@button.post("/", response_model=ButtonCreate) +@button.post("/", response_model=ButtonGet) def create_button(button_inp: ButtonCreate): category = db.session.query(Category).filter(Category.id == button_inp.category_id).one_or_none() if not category: diff --git a/services_backend/routes/category.py b/services_backend/routes/category.py index d538082..27f5ead 100644 --- a/services_backend/routes/category.py +++ b/services_backend/routes/category.py @@ -6,7 +6,8 @@ category = APIRouter() -@category.post("/", response_model=CategoryCreate) + +@category.post("/", response_model=CategoryGet) def create_category(category_inp: CategoryCreate): category = Category(**category_inp.dict()) db.session.add(category) diff --git a/services_backend/routes/models/category.py b/services_backend/routes/models/category.py index a148d98..97752d0 100644 --- a/services_backend/routes/models/category.py +++ b/services_backend/routes/models/category.py @@ -1,4 +1,5 @@ from .base import Base +from .button import ButtonGet class CategoryCreate(Base): @@ -15,4 +16,5 @@ class CategoryGet(Base): id: int type: str | None name: str | None + button: list[ButtonGet] From e15f2e2eb49c2be9336bd5eb21fb8634a3ab3fd6 Mon Sep 17 00:00:00 2001 From: Wudext Date: Thu, 8 Dec 2022 15:15:00 +0300 Subject: [PATCH 2/2] Cleaning --- services_backend/models/database.py | 4 ++-- services_backend/routes/models/category.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services_backend/models/database.py b/services_backend/models/database.py index c275dc2..31c0685 100644 --- a/services_backend/models/database.py +++ b/services_backend/models/database.py @@ -7,12 +7,12 @@ class Category(Base): id = Column(Integer, primary_key=True) name = Column(String) type = Column(String) - button = relationship("Button", back_populates="category", foreign_keys="Button.category_id") + buttons = relationship("Button", back_populates="category", foreign_keys="Button.category_id") class Button(Base): id = Column(Integer, primary_key=True) name = Column(String) category_id = Column(Integer, ForeignKey(Category.id)) - category = relationship("Category", back_populates="button", foreign_keys=[category_id]) + category = relationship("Category", back_populates="buttons", foreign_keys=[category_id]) icon = Column(String) diff --git a/services_backend/routes/models/category.py b/services_backend/routes/models/category.py index 97752d0..a76d10e 100644 --- a/services_backend/routes/models/category.py +++ b/services_backend/routes/models/category.py @@ -16,5 +16,5 @@ class CategoryGet(Base): id: int type: str | None name: str | None - button: list[ButtonGet] + buttons: list[ButtonGet]