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

Sincro backend #622

Open
wants to merge 48 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4d323b4
First Commit
Galifrey21 Feb 21, 2025
1657702
First Commit
JaimeBernet Feb 21, 2025
a78c9b3
Merge pull request #1 from 4GeeksAcademy/Jaime
JaimeBernet Feb 21, 2025
17c2b38
First Commit
Galifrey21 Feb 24, 2025
e57f04c
First Commit
Galifrey21 Feb 24, 2025
2dc23aa
Merge pull request #2 from 4GeeksAcademy/oscar
Galifrey21 Feb 24, 2025
8c469fb
Final Commit
Galifrey21 Feb 24, 2025
edea737
Merge pull request #3 from 4GeeksAcademy/oscar
Galifrey21 Feb 24, 2025
b846874
First commit
Galifrey21 Feb 25, 2025
791b9a4
Merge pull request #4 from 4GeeksAcademy/ForgotPassword
Galifrey21 Feb 25, 2025
01d196d
Genre view
RafaSalG Feb 26, 2025
8d8c69c
Merge pull request #5 from 4GeeksAcademy/Genres
RafaSalG Feb 26, 2025
81bcd48
Genre view modified
RafaSalG Feb 26, 2025
04e5a04
Merge pull request #6 from 4GeeksAcademy/Genres
RafaSalG Feb 26, 2025
de77081
cambios en login, creacion user/artist data
Galifrey21 Mar 2, 2025
d2ea739
Merge branch 'main' into ForgotPassword
Galifrey21 Mar 2, 2025
518c13e
Merge pull request #7 from 4GeeksAcademy/ForgotPassword
Galifrey21 Mar 2, 2025
62b7ab7
1commit
JaimeBernet Mar 3, 2025
0776cc5
Merge branch 'main' into ArtistViews
Galifrey21 Mar 3, 2025
2910e1e
Merge pull request #8 from 4GeeksAcademy/ArtistViews
Galifrey21 Mar 3, 2025
1090fa7
Load Genres API
RafaSalG Mar 5, 2025
43ee3e8
Merge pull request #9 from 4GeeksAcademy/Genres_api_backend
RafaSalG Mar 5, 2025
7c78c57
Models First commit
RafaSalG Mar 5, 2025
2a1e870
Database models Second commit
RafaSalG Mar 5, 2025
a8cfc5a
Database models done
RafaSalG Mar 5, 2025
a69c23d
creacion de usuarios y login
Galifrey21 Mar 5, 2025
9db4a6f
Database Models BACKEND done after reset migrations
RafaSalG Mar 5, 2025
cd11f85
Merge branch 'main' into login
Galifrey21 Mar 5, 2025
27fbcb5
Merge pull request #10 from 4GeeksAcademy/login
Galifrey21 Mar 5, 2025
73653fc
Database models Final commit
RafaSalG Mar 6, 2025
54984ce
Database Model user modified
RafaSalG Mar 6, 2025
bb2b197
Merge branch 'main' into Database-Models-BACKEND
RafaSalG Mar 6, 2025
506ef87
Merge pull request #11 from 4GeeksAcademy/Database-Models-BACKEND
RafaSalG Mar 6, 2025
911fbfc
Last commit I promise
RafaSalG Mar 6, 2025
4942f8d
Merge pull request #12 from 4GeeksAcademy/Database-Models-BACKEND
RafaSalG Mar 6, 2025
9587dfe
Created videos routes
RafaSalG Mar 7, 2025
97e6e27
Merge pull request #13 from 4GeeksAcademy/Artists-video-routes-BACKEND
RafaSalG Mar 7, 2025
a6f5a87
Music routes created
RafaSalG Mar 7, 2025
315616e
Merge pull request #14 from 4GeeksAcademy/Artists-music-routes-BACKEND
RafaSalG Mar 7, 2025
834e1f9
Footer done
RafaSalG Mar 8, 2025
cdc044d
Merge pull request #15 from 4GeeksAcademy/About-view-footer
RafaSalG Mar 8, 2025
da49249
SavedSong, FollowArtist and GET user favourite routes created + Music…
RafaSalG Mar 10, 2025
6e1d96d
Merge pull request #16 from 4GeeksAcademy/Saved-Music-&-Saved-artists…
RafaSalG Mar 10, 2025
d10e9c7
comentario commit
Galifrey21 Mar 10, 2025
a51f2a8
logindefinitivo
Galifrey21 Mar 10, 2025
79460c3
arreglando conflictos
Galifrey21 Mar 10, 2025
0056ec9
Merge pull request #17 from 4GeeksAcademy/sincroBackend
Galifrey21 Mar 10, 2025
45fd4de
espero que vaya
Galifrey21 Mar 10, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,4 @@ database.database
database.db
diagram.png
__pycache__/
migrations
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[css]": {
"editor.defaultFormatter": "vscode.css-language-features"
}
}
5 changes: 4 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
flask-extended = "*"
requests = "*"
flask-jwt-extended = "*"
pyjwt = "==2.9.0"

[requires]
python_version = "3.10"
Expand Down
776 changes: 479 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"}
9 changes: 8 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, Genre, ArtistProfile,Photo,Video,Song,SavedSong,FollowArtist
from flask_admin.contrib.sqla import ModelView

def setup_admin(app):
Expand All @@ -12,6 +12,13 @@ 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(Genre, db.session))
admin.add_view(ModelView(Photo, db.session))
admin.add_view(ModelView(Video, db.session))
admin.add_view(ModelView(Song, db.session))
admin.add_view(ModelView(SavedSong, db.session))
admin.add_view(ModelView(FollowArtist, db.session))
admin.add_view(ModelView(ArtistProfile, db.session))

# You can duplicate that line to add mew models
# admin.add_view(ModelView(YourModelName, db.session))
13 changes: 13 additions & 0 deletions src/api/auth.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from flask_jwt_extended import JWTManager
from api.models import User

jwt = JWTManager()

@jwt.user_identity_loader
def user_identity_lookup(user):
return user.id

@jwt.user_lookup_loader
def user_lookuo_callback(_jwtheader, jwt_data):
identity = jwt_data["sub"]
return User.query.filter_by(id=identity).one_or_none()
Loading