Fixing #3 and #4

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)

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:

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)

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
+    buttons: list[ButtonGet]