add tag to resources & models, upd schemas

Author: Badx86

app.py

@@ -1,10 +1,10 @@
 import os
-import models
 from db import db
 from flask import Flask
 from flask_smorest import Api
 from resources.item import blp as ItemBlueprint
 from resources.store import blp as StoreBlueprint
+from resources.tag import blp as TagBlueprint
 
 
 def create_app(db_url=None):
@@ -28,7 +28,6 @@ def create_app(db_url=None):
     app.config["SQLALCHEMY_DATABASE_URI"] = db_url or os.getenv("DATABASE_URL", "sqlite:///data.db")
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
     db.init_app(app)
-
     api = Api(app)
 
     @app.before_request
@@ -43,5 +42,6 @@ def create_tables():
 
     api.register_blueprint(ItemBlueprint)
     api.register_blueprint(StoreBlueprint)
+    api.register_blueprint(TagBlueprint)
 
-    return app
+    return app

models/__init__.py

@@ -1,2 +1,3 @@
 from models.store import StoreModel
 from models.item import ItemModel
+from models.tag import TagModel

models/store.py

@@ -11,3 +11,4 @@ class StoreModel(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String(80), unique=True, nullable=False)
     items = db.relationship("ItemModel", back_populates="store", lazy="dynamic", cascade="all, delete")
+    tags = db.relationship("TagModel", back_populates="store", lazy="dynamic")

models/tag.py

@@ -0,0 +1,13 @@
+from db import db
+
+
+class TagModel(db.Model):
+    
+    __tablename__ = "tags"
+
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(80), unique=True, nullable=False)
+    store_id = db.Column(db.String(), db.ForeignKey("stores.id"), nullable=False)
+
+
+    items = db.relationship("StoreModel", back_populates="tags")

resources/store.py

@@ -17,15 +17,15 @@ class Store(MethodView):
     @blp.response(200, StoreSchema)
     def get(self, store_id):
         """Метод для получения информации о магазине по его ID"""
-        store = StoreModel.get_or_404(self, store_id)
+        store = StoreModel.query.get_or_404(self, store_id)
         return store
 
     def delete(self, store_id):
         """Метод для удаления магазина по его ID"""
         store = StoreModel.query.get_or_404(store_id)
         db.session.delete(store)
         db.session.commit()
-        return {"message": "Store deleted"}
+        return {"message": "Store deleted"}, 200
 
 
 # Создаем endpoint для получения списка магазинов и добавления нового магазина

resources/tag.py

@@ -13,16 +13,20 @@
 
 class PlainItemSchema(Schema):
     """Схема для создания элемента"""
-    id = fields.Str(dump_only=True)
+    id = fields.Int(dump_only=True)
     name = fields.Str(required=True)
     price = fields.Float(required=True)
 
 
 class PlainStoreSchema(Schema):
     """Схема для магазина"""
-    id = fields.Str(dump_only=True)
+    id = fields.Int(dump_only=True)
     name = fields.Str(required=True)
 
+class PlainTagSchema(Schema):
+    id = fields.Int(dump_only=True)
+    name = fields.Str()
+
 
 class ItemUpdateSchema(Schema):
     """Схема для обновления элемента"""