Skip to content
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

developer #607

Open
wants to merge 58 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
e59d215
repositorio limpio
Roberto-Torres-Martinez Mar 1, 2025
3d3f082
developer
ALCIDESCONTRERAS Mar 1, 2025
16f658d
models ready
ALCIDESCONTRERAS Mar 2, 2025
1d67ed3
Merge pull request #1 from 4GeeksAcademy/models
ALCIDESCONTRERAS Mar 2, 2025
0e29e28
endpoint phones
ALCIDESCONTRERAS Mar 2, 2025
dc8e4c7
Merge pull request #2 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 2, 2025
ed9df74
Cambios Modelos
Roberto-Torres-Martinez Mar 2, 2025
81116a2
Cambios Modelos
Roberto-Torres-Martinez Mar 2, 2025
6c53a3a
corregido endpoint
ALCIDESCONTRERAS Mar 2, 2025
688a567
Merge pull request #3 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 2, 2025
a647a7b
agregado a admin
ALCIDESCONTRERAS Mar 2, 2025
a2f1304
Merge pull request #4 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 2, 2025
4d24215
añadir cambio modelo
Roberto-Torres-Martinez Mar 2, 2025
eb4b79f
Modelo User Modificado
Roberto-Torres-Martinez Mar 2, 2025
6743d86
agarra imagen
ALCIDESCONTRERAS Mar 2, 2025
b450380
Merge pull request #5 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 2, 2025
7a1c6a4
changes
Roberto-Torres-Martinez Mar 2, 2025
9ff6168
Merge branch 'developer' into Roberto-Modelos
Roberto-Torres-Martinez Mar 2, 2025
cb46a57
Merge pull request #6 from 4GeeksAcademy/Roberto-Modelos
Roberto-Torres-Martinez Mar 2, 2025
3079a6c
Revert "Roberto modelos"
Roberto-Torres-Martinez Mar 2, 2025
eb2c36b
Merge pull request #7 from 4GeeksAcademy/revert-6-Roberto-Modelos
Roberto-Torres-Martinez Mar 2, 2025
41a2d14
Phones Get Endpoint
Roberto-Torres-Martinez Mar 2, 2025
634357e
Merge pull request #8 from 4GeeksAcademy/endpoint-phones
Roberto-Torres-Martinez Mar 2, 2025
1c07365
añadir metodo get phones
Roberto-Torres-Martinez Mar 2, 2025
b8bf633
Error Sintaxis Corregido
Roberto-Torres-Martinez Mar 2, 2025
7643047
Add Comment
Roberto-Torres-Martinez Mar 2, 2025
420f04e
Merge pull request #9 from 4GeeksAcademy/endpoint-phones
Roberto-Torres-Martinez Mar 2, 2025
47fb111
correcion
ALCIDESCONTRERAS Mar 2, 2025
b5845f4
resolviendo error
ALCIDESCONTRERAS Mar 2, 2025
8930462
quit comment
Roberto-Torres-Martinez Mar 2, 2025
bb339db
resolver conflictos
Roberto-Torres-Martinez Mar 2, 2025
e677ef6
get method
Roberto-Torres-Martinez Mar 2, 2025
9832529
Merge pull request #10 from 4GeeksAcademy/endpoint-phones
Roberto-Torres-Martinez Mar 2, 2025
c0e3cb8
correccion phones
ALCIDESCONTRERAS Mar 2, 2025
4c0d230
Merge pull request #11 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 2, 2025
0373e0a
TVs endpoints get y post
Roberto-Torres-Martinez Mar 2, 2025
8d8fc62
prueba
Roberto-Torres-Martinez Mar 2, 2025
fb436b3
Merge branch 'endpoints-tvs' of https://github.com/4GeeksAcademy/RAF-…
Roberto-Torres-Martinez Mar 2, 2025
1bff009
Cambios Endpoints
Roberto-Torres-Martinez Mar 2, 2025
df0f213
Merge pull request #12 from 4GeeksAcademy/endpoints-tvs
Roberto-Torres-Martinez Mar 2, 2025
3da2c20
cambio en phones
ALCIDESCONTRERAS Mar 2, 2025
66ad92f
Merge pull request #13 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 2, 2025
1e72f4b
Pull origin developer
Roberto-Torres-Martinez Mar 2, 2025
e784743
modelos modificados
Roberto-Torres-Martinez Mar 2, 2025
62a7889
Merge pull request #14 from 4GeeksAcademy/Roberto-Modelos
Roberto-Torres-Martinez Mar 2, 2025
b21ffee
Laptops Endpoints Get Post Done
Roberto-Torres-Martinez Mar 2, 2025
d7dd945
Merge pull request #15 from 4GeeksAcademy/endpoints-laptops
Roberto-Torres-Martinez Mar 2, 2025
a921283
correccion colores e imagen
ALCIDESCONTRERAS Mar 3, 2025
28f6b00
Merge pull request #16 from 4GeeksAcademy/endpoint-phones
ALCIDESCONTRERAS Mar 3, 2025
9a05faa
correccion en endpoint de tv
ALCIDESCONTRERAS Mar 3, 2025
b457a0e
Merge pull request #17 from 4GeeksAcademy/correciones-alcides
ALCIDESCONTRERAS Mar 3, 2025
8a7ed82
arreglo endpoint tv
ALCIDESCONTRERAS Mar 3, 2025
9a2e4ce
Merge pull request #18 from 4GeeksAcademy/correciones-alcides
ALCIDESCONTRERAS Mar 3, 2025
2fd8fe6
monto añadido a carrito
Roberto-Torres-Martinez Mar 3, 2025
3ff0688
cambio modelos
Roberto-Torres-Martinez Mar 3, 2025
0b65516
Merge pull request #19 from 4GeeksAcademy/Roberto-Modelos
Roberto-Torres-Martinez Mar 3, 2025
29ab91d
address added
Roberto-Torres-Martinez Mar 3, 2025
1eb350a
Merge pull request #20 from 4GeeksAcademy/Roberto-Modelos
Roberto-Torres-Martinez Mar 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
654 changes: 357 additions & 297 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions migrations/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Single-database configuration for Flask.
50 changes: 50 additions & 0 deletions migrations/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# A generic, single database configuration.

[alembic]
# template used to generate migration files
# file_template = %%(rev)s_%%(slug)s

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false


# Logging configuration
[loggers]
keys = root,sqlalchemy,alembic,flask_migrate

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARN
handlers = console
qualname =

[logger_sqlalchemy]
level = WARN
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[logger_flask_migrate]
level = INFO
handlers =
qualname = flask_migrate

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
113 changes: 113 additions & 0 deletions migrations/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import logging
from logging.config import fileConfig

from flask import current_app

from alembic import context

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config

# Interpret the config file for Python logging.
# This line sets up loggers basically.
fileConfig(config.config_file_name)
logger = logging.getLogger('alembic.env')


def get_engine():
try:
# this works with Flask-SQLAlchemy<3 and Alchemical
return current_app.extensions['migrate'].db.get_engine()
except (TypeError, AttributeError):
# this works with Flask-SQLAlchemy>=3
return current_app.extensions['migrate'].db.engine


def get_engine_url():
try:
return get_engine().url.render_as_string(hide_password=False).replace(
'%', '%%')
except AttributeError:
return str(get_engine().url).replace('%', '%%')


# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
# target_metadata = mymodel.Base.metadata
config.set_main_option('sqlalchemy.url', get_engine_url())
target_db = current_app.extensions['migrate'].db

# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.


def get_metadata():
if hasattr(target_db, 'metadatas'):
return target_db.metadatas[None]
return target_db.metadata


def run_migrations_offline():
"""Run migrations in 'offline' mode.
This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.
Calls to context.execute() here emit the given string to the
script output.
"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url, target_metadata=get_metadata(), literal_binds=True
)

with context.begin_transaction():
context.run_migrations()


def run_migrations_online():
"""Run migrations in 'online' mode.
In this scenario we need to create an Engine
and associate a connection with the context.
"""

# this callback is used to prevent an auto-migration from being generated
# when there are no changes to the schema
# reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
def process_revision_directives(context, revision, directives):
if getattr(config.cmd_opts, 'autogenerate', False):
script = directives[0]
if script.upgrade_ops.is_empty():
directives[:] = []
logger.info('No changes in schema detected.')

conf_args = current_app.extensions['migrate'].configure_args
if conf_args.get("process_revision_directives") is None:
conf_args["process_revision_directives"] = process_revision_directives

connectable = get_engine()

with connectable.connect() as connection:
context.configure(
connection=connection,
target_metadata=get_metadata(),
**conf_args
)

with context.begin_transaction():
context.run_migrations()


if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()
24 changes: 24 additions & 0 deletions migrations/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"""${message}

Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}

"""
from alembic import op
import sqlalchemy as sa
${imports if imports else ""}

# revision identifiers, used by Alembic.
revision = ${repr(up_revision)}
down_revision = ${repr(down_revision)}
branch_labels = ${repr(branch_labels)}
depends_on = ${repr(depends_on)}


def upgrade():
${upgrades if upgrades else "pass"}


def downgrade():
${downgrades if downgrades else "pass"}
113 changes: 113 additions & 0 deletions migrations/versions/1a2565240ff7_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
"""empty message

Revision ID: 1a2565240ff7
Revises:
Create Date: 2025-03-03 08:59:52.362596

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '1a2565240ff7'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('smartphones',
sa.Column('smartphone_id', sa.Integer(), nullable=False),
sa.Column('modelo', sa.String(length=150), nullable=False),
sa.Column('pantalla', sa.String(length=150), nullable=False),
sa.Column('procesador', sa.String(length=150), nullable=False),
sa.Column('memoria_ram', sa.String(length=150), nullable=False),
sa.Column('almacenamiento', sa.String(length=150), nullable=False),
sa.Column('camara', sa.String(length=150), nullable=False),
sa.Column('bateria', sa.String(length=150), nullable=False),
sa.Column('precio', sa.String(length=50), nullable=False),
sa.Column('conectividad', sa.String(length=150), nullable=False),
sa.Column('colores', sa.JSON(), nullable=False),
sa.Column('descripcion', sa.String(length=300), nullable=False),
sa.Column('imagen', sa.JSON(), nullable=True),
sa.PrimaryKeyConstraint('smartphone_id')
)
op.create_table('user',
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=50), nullable=False),
sa.Column('lastname', sa.String(length=75), nullable=False),
sa.Column('email', sa.String(length=75), nullable=False),
sa.Column('password', sa.String(length=50), nullable=False),
sa.Column('confirm_password', sa.String(length=50), nullable=False),
sa.Column('username', sa.String(length=50), nullable=False),
sa.Column('birthday_date', sa.String(length=15), nullable=False),
sa.Column('is_active', sa.Boolean(), nullable=False),
sa.Column('is_admin', sa.Boolean(), nullable=False),
sa.PrimaryKeyConstraint('user_id'),
sa.UniqueConstraint('birthday_date'),
sa.UniqueConstraint('email'),
sa.UniqueConstraint('username')
)
op.create_table('cart',
sa.Column('cart_id', sa.Integer(), nullable=False),
sa.Column('model', sa.String(length=150), nullable=False),
sa.Column('price', sa.String(length=25), nullable=False),
sa.Column('monto', sa.String(length=35), nullable=False),
sa.Column('smartphones_id', sa.Integer(), nullable=True),
sa.Column('user_id', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['smartphones_id'], ['smartphones.smartphone_id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.user_id'], ),
sa.PrimaryKeyConstraint('cart_id')
)
op.create_table('laptops',
sa.Column('laptop_id', sa.Integer(), nullable=False),
sa.Column('marca', sa.String(length=150), nullable=False),
sa.Column('modelo', sa.String(length=150), nullable=False),
sa.Column('pantalla', sa.String(length=150), nullable=False),
sa.Column('procesador', sa.String(length=150), nullable=False),
sa.Column('modelo_cpu', sa.String(length=150), nullable=False),
sa.Column('sistema_operativo', sa.String(length=150), nullable=False),
sa.Column('memoria_ram', sa.String(length=150), nullable=False),
sa.Column('almacenamiento', sa.String(length=300), nullable=False),
sa.Column('camara', sa.String(length=150), nullable=False),
sa.Column('bateria', sa.String(length=150), nullable=False),
sa.Column('precio', sa.String(length=50), nullable=False),
sa.Column('tecnologia', sa.String(length=150), nullable=False),
sa.Column('colores', sa.JSON(), nullable=False),
sa.Column('descripcion', sa.String(length=300), nullable=False),
sa.Column('imagen', sa.JSON(), nullable=False),
sa.Column('cart_id', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['cart_id'], ['cart.cart_id'], ),
sa.PrimaryKeyConstraint('laptop_id')
)
op.create_table('tv',
sa.Column('tv_id', sa.Integer(), nullable=False),
sa.Column('marca', sa.String(length=150), nullable=False),
sa.Column('contenido_de_la_caja', sa.String(length=150), nullable=False),
sa.Column('modelo', sa.String(length=150), nullable=False),
sa.Column('usos_recomendados', sa.String(length=150), nullable=False),
sa.Column('año_modelo', sa.String(length=50), nullable=False),
sa.Column('fabricante', sa.String(length=150), nullable=False),
sa.Column('precio', sa.String(length=50), nullable=False),
sa.Column('descripcion', sa.String(length=300), nullable=False),
sa.Column('pantalla', sa.String(length=150), nullable=False),
sa.Column('conectividad', sa.String(length=150), nullable=False),
sa.Column('medidas', sa.String(length=50), nullable=False),
sa.Column('imagen', sa.JSON(), nullable=False),
sa.Column('cart_id', sa.Integer(), nullable=True),
sa.ForeignKeyConstraint(['cart_id'], ['cart.cart_id'], ),
sa.PrimaryKeyConstraint('tv_id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('tv')
op.drop_table('laptops')
op.drop_table('cart')
op.drop_table('user')
op.drop_table('smartphones')
# ### end Alembic commands ###
34 changes: 34 additions & 0 deletions migrations/versions/60c91321df87_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""empty message

Revision ID: 60c91321df87
Revises: 1a2565240ff7
Create Date: 2025-03-03 09:00:46.823782

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '60c91321df87'
down_revision = '1a2565240ff7'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('user', schema=None) as batch_op:
batch_op.add_column(sa.Column('address', sa.String(length=50), nullable=False))
batch_op.drop_column('confirm_password')

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('user', schema=None) as batch_op:
batch_op.add_column(sa.Column('confirm_password', sa.VARCHAR(length=50), autoincrement=False, nullable=False))
batch_op.drop_column('address')

# ### end Alembic commands ###
3 changes: 2 additions & 1 deletion src/api/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import os
from flask_admin import Admin
from .models import db, User
from .models import db, User, Smartphones
from flask_admin.contrib.sqla import ModelView

def setup_admin(app):
Expand All @@ -12,6 +12,7 @@ def setup_admin(app):

# 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(Smartphones, db.session))

# You can duplicate that line to add mew models
# admin.add_view(ModelView(YourModelName, db.session))
Loading