Skip to content

Lucho #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
35 changes: 35 additions & 0 deletions migrations/versions/7f3fdc0ecd62_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"""empty message

Revision ID: 7f3fdc0ecd62
Revises: a5cffa318ac2
Create Date: 2025-05-05 18:45:14.298755

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '7f3fdc0ecd62'
down_revision = 'a5cffa318ac2'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('user')
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('user',
sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
sa.Column('email', sa.VARCHAR(length=120), autoincrement=False, nullable=False),
sa.Column('password', sa.VARCHAR(length=80), autoincrement=False, nullable=False),
sa.Column('is_active', sa.BOOLEAN(), autoincrement=False, nullable=False),
sa.PrimaryKeyConstraint('id', name='user_pkey'),
sa.UniqueConstraint('email', name='user_email_key')
)
# ### end Alembic commands ###
8 changes: 4 additions & 4 deletions src/admin.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import os
from flask_admin import Admin
from models import db, User
from models import db
from flask_admin.contrib.sqla import ModelView


def setup_admin(app):
app.secret_key = os.environ.get('FLASK_APP_KEY', 'sample key')
app.config['FLASK_ADMIN_SWATCH'] = 'cerulean'
admin = Admin(app, name='4Geeks Admin', template_mode='bootstrap3')


# Add your models here, for example this is how we add a the User model to the admin
admin.add_view(ModelView(User, db.session))
# admin.add_view(ModelView(User, db.session))

# You can duplicate that line to add mew models
# admin.add_view(ModelView(YourModelName, db.session))
# admin.add_view(ModelView(YourModelName, db.session))
38 changes: 25 additions & 13 deletions src/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,54 @@
from flask_cors import CORS
from utils import APIException, generate_sitemap
from admin import setup_admin
from models import db, User
#from models import Person
from models import db, Personaje, Planeta, Vehiculo, Usuario, PersonajeFavorito, PlanetaFavorito, VehiculoFavorito
from routes.personaje_routes import personaje_bp
from routes.planeta_routes import planeta_bp
from routes.vehiculo_routes import vehiculo_bp
from routes.usuario_routes import usuario_bp
from routes.favoritos_routes import favoritos_bp


app = Flask(__name__)
app.url_map.strict_slashes = False

# Configuración de la base de datos
db_url = os.getenv("DATABASE_URL")
if db_url is not None:
app.config['SQLALCHEMY_DATABASE_URI'] = db_url.replace("postgres://", "postgresql://")
app.config['SQLALCHEMY_DATABASE_URI'] = db_url.replace(
"postgres://", "postgresql://")
else:
app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:////tmp/test.db"
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False

# Inicialización de extensiones
MIGRATE = Migrate(app, db)
db.init_app(app)
CORS(app)
setup_admin(app)

# Handle/serialize errors like a JSON object
with app.app_context():
print("Tablas registradas:", db.metadata.tables.keys())
db.create_all()

app.register_blueprint(personaje_bp)
app.register_blueprint(planeta_bp)
app.register_blueprint(vehiculo_bp)
app.register_blueprint(usuario_bp)
app.register_blueprint(favoritos_bp)

@app.errorhandler(APIException)
def handle_invalid_usage(error):
return jsonify(error.to_dict()), error.status_code

# generate sitemap with all your endpoints
@app.route('/')
def sitemap():
return generate_sitemap(app)

@app.route('/user', methods=['GET'])
def handle_hello():

response_body = {
"msg": "Hello, this is your GET /user response "
}

return jsonify(response_body), 200
def validar_tipo(valor, tipo_esperado, nombre_campo):
if valor is not None and not isinstance(valor, tipo_esperado):
raise ValueError(
f"Campo '{nombre_campo}' debe ser de tipo {tipo_esperado.__name__}")

# this only runs if `$ python src/app.py` is executed
if __name__ == '__main__':
Expand Down
19 changes: 0 additions & 19 deletions src/models.py

This file was deleted.

6 changes: 6 additions & 0 deletions src/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from .database import db
from .usuario import Usuario
from .personaje import Personaje
from .vehiculo import Vehiculo
from .planeta import Planeta
from .associations import PersonajeFavorito, PlanetaFavorito, VehiculoFavorito
63 changes: 63 additions & 0 deletions src/models/associations.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
from .database import db
from sqlalchemy import ForeignKey, DateTime, func
from sqlalchemy.orm import Mapped, mapped_column, relationship
from datetime import datetime

class PlanetaFavorito(db.Model):
__tablename__ = "planetas_favoritos"

id: Mapped[int] = mapped_column(primary_key=True)
usuario_id: Mapped[int] = mapped_column(ForeignKey("usuarios.id"), nullable=False)
planeta_id: Mapped[int] = mapped_column(ForeignKey("planetas.id"), nullable=False)
fecha_agregado: Mapped[datetime] = mapped_column(DateTime, default=func.now())

def serialize(self):
return {
"id": self.id,
"usuario_id": self.usuario_id,
"planeta_id": self.planeta_id,
"fecha_agregado": self.fecha_agregado
}

usuario = relationship("Usuario", back_populates="planetas_favoritos")
planeta = relationship("Planeta", back_populates="favoritos")


class PersonajeFavorito(db.Model):
__tablename__ = "personajes_favoritos"

id: Mapped[int] = mapped_column(primary_key=True)
usuario_id: Mapped[int] = mapped_column(ForeignKey("usuarios.id"), nullable=False)
personaje_id: Mapped[int] = mapped_column(ForeignKey("personajes.id"), nullable=False)
fecha_agregado: Mapped[datetime] = mapped_column(DateTime, default=func.now())

def serialize(self):
return {
"id": self.id,
"usuario_id": self.usuario_id,
"personaje_id": self.planeta_id,
"fecha_agregado": self.fecha_agregado
}

usuario = relationship("Usuario", back_populates="personajes_favoritos")
personaje = relationship("Personaje", back_populates="favoritos")


class VehiculoFavorito(db.Model):
__tablename__ = "vehiculos_favoritos"

id: Mapped[int] = mapped_column(primary_key=True)
usuario_id: Mapped[int] = mapped_column(ForeignKey("usuarios.id"), nullable=False)
vehiculo_id: Mapped[int] = mapped_column(ForeignKey("vehiculos.id"), nullable=False)
fecha_agregado: Mapped[datetime] = mapped_column(DateTime, default=func.now())

def serialize(self):
return {
"id": self.id,
"usuario_id": self.usuario_id,
"vehiculo_id": self.planeta_id,
"fecha_agregado": self.fecha_agregado
}

usuario = relationship("Usuario", back_populates="vehiculos_favoritos")
vehiculo = relationship("Vehiculo", back_populates="favoritos")
3 changes: 3 additions & 0 deletions src/models/database.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from flask_sqlalchemy import SQLAlchemy

db = SQLAlchemy()
60 changes: 60 additions & 0 deletions src/models/personaje.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
from .database import db
from sqlalchemy import String, Integer, ForeignKey, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
from typing import TYPE_CHECKING
from .associations import PersonajeFavorito

if TYPE_CHECKING:
from .vehiculo import Vehiculo
from .planeta import Planeta


class Personaje(db.Model):
__tablename__ = "personajes"

id: Mapped[int] = mapped_column(primary_key=True)
nombre: Mapped[str] = mapped_column(String(100), nullable=False)
especie: Mapped[str] = mapped_column(String(50), nullable=True)
altura: Mapped[int] = mapped_column(Integer, nullable=True)
peso: Mapped[int] = mapped_column(Integer, nullable=True)
genero: Mapped[str] = mapped_column(String(20), nullable=True)
imagen_url: Mapped[str] = mapped_column(String(255), nullable=True)
descripcion: Mapped[str] = mapped_column(Text, nullable=True)
planeta_natal_id: Mapped[int] = mapped_column(
ForeignKey("planetas.id"), nullable=True)
vehiculo_id: Mapped[int] = mapped_column(
ForeignKey("vehiculos.id"), unique=True, nullable=True)

vehiculo: Mapped["Vehiculo"] = relationship(
"Vehiculo",
foreign_keys=[vehiculo_id],
back_populates="personaje",
uselist=False
)
planeta_natal: Mapped["Planeta"] = relationship(
"Planeta", back_populates="personajes")
favoritos: Mapped["PersonajeFavorito"] = relationship(
"PersonajeFavorito", back_populates="personaje")

def serialize(self):
return {
"id": self.id,
"nombre": self.nombre,
"especie": self.especie,
"altura": self.altura,
"peso": self.peso,
"genero": self.genero,
"imagen_url": self.imagen_url,
"descripcion": self.descripcion,
"planeta_natal_id": self.planeta_natal_id,
"vehiculo_id": self.vehiculo_id
}

def serialize_with_relations(self):
data = self.serialize()
if self.planeta_natal:
data['planeta_natal'] = self.planeta_natal.serialize()
if self.vehiculo:
data['vehiculo'] = self.vehiculo.serialize()
data['favoritos'] = [f.serialize() for f in self.favoritos]
return data
42 changes: 42 additions & 0 deletions src/models/planeta.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
from .database import db
from sqlalchemy import String, Integer, Text
from sqlalchemy.orm import Mapped, mapped_column, relationship
from typing import TYPE_CHECKING
from .associations import PlanetaFavorito

if TYPE_CHECKING:
from .personaje import Personaje


class Planeta(db.Model):
__tablename__ = "planetas"

id: Mapped[int] = mapped_column(primary_key=True)
nombre: Mapped[str] = mapped_column(String(100), nullable=False)
diametro: Mapped[int] = mapped_column(Integer, nullable=True)
clima: Mapped[str] = mapped_column(String(50), nullable=True)
poblacion: Mapped[int] = mapped_column(Integer, nullable=True)
imagen_url: Mapped[str] = mapped_column(String(255), nullable=True)
descripcion: Mapped[str] = mapped_column(Text, nullable=True)

personajes: Mapped["Personaje"] = relationship(
"Personaje", back_populates="planeta_natal")
favoritos: Mapped["PlanetaFavorito"] = relationship(
"PlanetaFavorito", back_populates="planeta")

def serialize(self):
return {
"id": self.id,
"nombre": self.nombre,
"diametro": self.diametro,
"clima": self.clima,
"poblacion": self.poblacion,
"imagen_url": self.imagen_url,
"descripcion": self.descripcion
}

def serialize_with_relations(self):
data = self.serialize()
data['personajes'] = [p.serialize() for p in self.personajes]
data['favoritos'] = [f.serialize() for f in self.favoritos]
return data
50 changes: 50 additions & 0 deletions src/models/usuario.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
from .database import db
from sqlalchemy import String, Boolean, DateTime, func
from sqlalchemy.orm import Mapped, mapped_column, relationship
from datetime import datetime
from .associations import PersonajeFavorito, PlanetaFavorito, VehiculoFavorito


class Usuario(db.Model):
__tablename__ = "usuarios"

id: Mapped[int] = mapped_column(primary_key=True)
nombre: Mapped[str] = mapped_column(String(100), nullable=False)
apellido: Mapped[str] = mapped_column(String(100), nullable=False)
email: Mapped[str] = mapped_column(
String(100), unique=True, nullable=False)
password: Mapped[str] = mapped_column(String(255), nullable=False)
fecha_registro: Mapped[datetime] = mapped_column(
DateTime, default=func.now())
ultima_conexion: Mapped[datetime] = mapped_column(
DateTime, default=func.now())
activo: Mapped[bool] = mapped_column(Boolean(), default=True)

# Relaciones
planetas_favoritos: Mapped["PlanetaFavorito"] = relationship(
"PlanetaFavorito", back_populates="usuario")
personajes_favoritos: Mapped["PersonajeFavorito"] = relationship(
"PersonajeFavorito", back_populates="usuario")
vehiculos_favoritos: Mapped["VehiculoFavorito"] = relationship(
"VehiculoFavorito", back_populates="usuario")

def serialize(self):
return {
"id": self.id,
"nombre": self.nombre,
"apellido": self.apellido,
"email": self.email,
"fecha_registro": self.fecha_registro,
"ultima_conexion": self.ultima_conexion,
"activo": self.activo
}

def serialize_with_relations(self):
data = self.serialize()
data['planetas_favoritos'] = [pf.serialize()
for pf in self.planetas_favoritos]
data['personajes_favoritos'] = [pef.serialize()
for pef in self.personajes_favoritos]
data['vehiculos_favoritos'] = [vf.serialize()
for vf in self.vehiculos_favoritos]
return data
Loading