Merge pull request #76 from DeliveryAPP-Project/feature/SCRUM-79-refatoracao-tabela-estabelecimentos

Feature/scrum 79 refatoracao tabela estabelecimentos

Author: bentoluizv

README.md

@@ -1,6 +1,6 @@
 # DeliveryAPP Backend
 
-Este é o backend do projeto DeliveryAPP. Ele é construído usando Flask e fornece uma API RESTful para gerenciar usuários, clientes, restaurantes, produtos e pedidos.
+Este é o backend do projeto DeliveryAPP. Ele é construído usando Flask e fornece uma API RESTful para gerenciar usuários, clientes, estabelecimentos, produtos e pedidos.
 
 ## Estrutura do Projeto
 

…ns/versions/7bc0658e9c3d_init_migrate.py migrations/versions/9255441d2a22_.pymigrations/versions/7bc0658e9c3d_init_migrate.py renamed to migrations/versions/9255441d2a22_.py migrations/versions/7bc0658e9c3d_init_migrate.py renamed to migrations/versions/9255441d2a22_.py

@@ -1,16 +1,16 @@
-"""init migrate
+"""empty message
 
-Revision ID: 7bc0658e9c3d
+Revision ID: 9255441d2a22
 Revises: 
-Create Date: 2025-03-23 13:21:15.057776
+Create Date: 2025-03-28 14:45:25.748190
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '7bc0658e9c3d'
+revision = '9255441d2a22'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -34,6 +34,22 @@ def upgrade():
     with op.batch_alter_table('client', schema=None) as batch_op:
         batch_op.create_index(batch_op.f('ix_client_email'), ['email'], unique=False)
 
+    op.create_table('establishment',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('official_name', sa.String(length=40), nullable=False),
+    sa.Column('fantasy_name', sa.String(length=40), nullable=False),
+    sa.Column('cnpj', sa.String(length=14), nullable=False),
+    sa.Column('telephone', sa.String(length=11), nullable=False),
+    sa.Column('zip_code', sa.String(length=9), nullable=False),
+    sa.Column('state', sa.String(length=19), nullable=False),
+    sa.Column('city', sa.String(length=30), nullable=False),
+    sa.Column('address', sa.String(length=120), nullable=False),
+    sa.Column('complement', sa.String(length=120), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('cnpj'),
+    sa.UniqueConstraint('fantasy_name'),
+    sa.UniqueConstraint('official_name')
+    )
     op.create_table('lead',
     sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
     sa.Column('created_at', sa.DateTime(), nullable=True),
@@ -43,19 +59,6 @@ def upgrade():
     with op.batch_alter_table('lead', schema=None) as batch_op:
         batch_op.create_index(batch_op.f('ix_lead_email'), ['email'], unique=True)
 
-    op.create_table('restaurant',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('name', sa.String(length=40), nullable=False),
-    sa.Column('description', sa.String(length=120), nullable=False),
-    sa.Column('classification', sa.Float(precision=3), nullable=False),
-    sa.Column('location', sa.String(length=120), nullable=False),
-    sa.Column('url_image_logo', sa.String(length=800), nullable=True),
-    sa.Column('url_image_banner', sa.String(length=800), nullable=True),
-    sa.Column('telephone', sa.String(length=11), nullable=False),
-    sa.Column('has_plastic', sa.Boolean(), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('name')
-    )
     op.create_table('user',
     sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
     sa.Column('firstname', sa.String(length=20), nullable=False),
@@ -68,11 +71,11 @@ def upgrade():
     sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
     sa.Column('created_at', sa.DateTime(), nullable=True),
     sa.Column('client_id', sa.Integer(), nullable=True),
-    sa.Column('restaurant_id', sa.Integer(), nullable=True),
+    sa.Column('establishment_id', sa.Integer(), nullable=True),
     sa.Column('total_value', sa.Float(), nullable=True),
     sa.Column('status', sa.Enum('pre_order', 'confirmed', 'doing', 'done', 'canceled', name='order_status'), nullable=True),
     sa.ForeignKeyConstraint(['client_id'], ['client.id'], ),
-    sa.ForeignKeyConstraint(['restaurant_id'], ['restaurant.id'], ),
+    sa.ForeignKeyConstraint(['establishment_id'], ['establishment.id'], ),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_table('product',
@@ -86,8 +89,8 @@ def upgrade():
     sa.Column('has_lactose', sa.Boolean(), nullable=False),
     sa.Column('is_vegan', sa.Boolean(), nullable=False),
     sa.Column('is_vegetarian', sa.Boolean(), nullable=False),
-    sa.Column('restaurant_id', sa.Integer(), nullable=False),
-    sa.ForeignKeyConstraint(['restaurant_id'], ['restaurant.id'], ),
+    sa.Column('establishment_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['establishment_id'], ['establishment.id'], ),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_table('order_product_association',
@@ -111,28 +114,29 @@ def upgrade():
     sa.ForeignKeyConstraint(['order_id'], ['order.id'], ),
     sa.PrimaryKeyConstraint('id')
     )
-    op.create_table('products_restaurants',
-    sa.Column('product_id', sa.Integer(), nullable=True),
-    sa.Column('restaurant_id', sa.Integer(), nullable=True),
+    op.create_table('products_establishment',
+    sa.Column('product_id', sa.Integer(), nullable=False),
+    sa.Column('establishment_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['establishment_id'], ['establishment.id'], ),
     sa.ForeignKeyConstraint(['product_id'], ['product.id'], ),
-    sa.ForeignKeyConstraint(['restaurant_id'], ['restaurant.id'], )
+    sa.PrimaryKeyConstraint('product_id', 'establishment_id')
     )
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('products_restaurants')
+    op.drop_table('products_establishment')
     op.drop_table('payment')
     op.drop_table('order_product_association')
     op.drop_table('product')
     op.drop_table('order')
     op.drop_table('user')
-    op.drop_table('restaurant')
     with op.batch_alter_table('lead', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_lead_email'))
 
     op.drop_table('lead')
+    op.drop_table('establishment')
     with op.batch_alter_table('client', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_client_email'))
 

project/controller/establishment_controller.py

@@ -0,0 +1,77 @@
+import json
+
+from flask import abort, request
+from flask_restx import Resource
+
+from project.doc_model.doc_models import api, establishment_model
+from project.ext.serializer import EstablishmentSchema
+from project.service.establishment_service import (
+    delete_establishment,
+    get_all_establishments,
+    get_one_establishment_with_products,
+    post_establishment,
+    update_establishment,
+)
+from project.utils.redis_utils import (
+    delete_redis_value,
+    get_redis_value,
+    set_redis_value,
+)
+
+establishment_schema_list = EstablishmentSchema(many=True)
+establishment_schema = EstablishmentSchema(many=False)
+
+
+class EstablishmentResource(Resource):
+    def get(self):
+        key_redis = "establishment"
+        establishments = get_redis_value(key_redis)
+        if establishments:
+            return establishments
+        establishments = get_all_establishments()
+        establishments = establishment_schema_list.dump(establishments)
+        set_redis_value(key_redis, json.dumps(establishments))
+        return establishments, 200
+
+    def post(self):
+        try:
+            establishment_data = request.json
+            response = post_establishment(establishment_data)
+            return response
+        
+        except Exception as e:
+            return {"error": str(e)}, 400
+
+
+class EstablishmentResourceID(Resource):
+    def get(self, id: int):
+        if establishment := get_one_establishment_with_products(id):
+            return establishment  # type: ignore
+        else:
+            return {"error": f"Estabelecimento com ID {id} não encontrado."}, 404
+
+    @api.expect(establishment_model)
+    def patch(self, id: int):
+        try:
+            establishment_data = request.json
+            result = update_establishment(id, establishment_data)  # type: ignore
+
+            if "error" in result:
+                abort(404, message=result["error"])
+            delete_redis_value("clients")
+            return {"message": result["message"]}, 200
+
+        except Exception as e:
+            return {"error": str(e)}, 500
+
+    def delete(self, id: int):
+        try:
+            result = delete_establishment(id)
+
+            if "error" in result:
+                return {"error": result["error"]}, 404
+            delete_redis_value("establishments")
+            return {"message": result["message"]}, 200
+
+        except Exception as e:
+            return {"error": str(e)}, 500

project/controller/restaurant_controller.py

@@ -11,30 +11,23 @@
     },
 )
 
-restaurant_model = api.model(
-    "Restaurant",
+establishment_model = api.model(
+    "Establishment",
     {
-        "name": fields.String(required=True, description="Nome do restaurante"),
-        "description": fields.String(
-            required=True, description="Descrição do restaurante"
-        ),
-        "classification": fields.Float(
-            required=True, description="Classificação do restaurante"
-        ),
-        "location": fields.String(
-            required=True, description="Localização do restaurante"
-        ),
-        "url_image_logo": fields.String(description="URL da logo do restaurante"),
-        "url_image_banner": fields.String(description="URL do banner do restaurante"),
-        "telephone": fields.String(
-            required=True, description="Telefone do restaurante"
-        ),
-        "has_plastic": fields.Boolean(
-            required=True, description="Indica se o restaurante usa plástico"
-        ),
+        "id": fields.Integer(description="ID do estabelecimento"),
+        "official_name": fields.String(required=True, description="Nome oficial do estabelecimento"),
+        "fantasy_name": fields.String(required=True, description="Nome fantasia do estabelecimento"),
+        "cnpj": fields.String(required=True, description="CNPJ do estabelecimento"),
+        "telephone": fields.String(required=True, description="Telefone do estabelecimento"),
+        "zip_code": fields.String(required=True, description="CEP do estabelecimento"),
+        "state": fields.String(required=True, description="Estado do estabelecimento"),
+        "city": fields.String(required=True, description="Cidade do estabelecimento"),
+        "address": fields.String(required=True, description="Endereço do estabelecimento"),
+        "complement": fields.String(description="Complemento do endereço")
     },
 )
 
+
 user_model = api.model(
     "User",
     {
@@ -64,15 +57,15 @@
         "is_vegetarian": fields.Boolean(
             required=True, description="Indica se o produto é vegetariano"
         ),
-        "restaurant_id": fields.Integer(required=True, description="ID do restaurante"),
+        "establishment_id": fields.Integer(required=True, description="ID do estabelecimento"),
     },
 )
 
 order_model = api.model(
     "Order",
     {
         "client_id": fields.Integer(required=True, description="ID do cliente"),
-        "restaurant_id": fields.Integer(required=True, description="ID do restaurante"),
+        "establishment_id": fields.Integer(required=True, description="ID do estabelecimento"),
         "products": fields.List(fields.Integer, description="ID dos produtos"),
     },
 )