AntonioMrtz · AntonioMrtz · Mar 18, 2024 · Mar 18, 2024
diff --git a/.github/workflows/backend-black.yml b/.github/workflows/backend-black.yml
@@ -26,7 +26,7 @@ jobs:
         run: pip install -r requirements.txt && pip install -r requirements-test.txt && pip install -r requirements-dev.txt
 
       - name: Run style check
-        working-directory: Backend/src
+        working-directory: Backend/
         run: python -m black . --check
 
       - name: Fail workflow on style check failure

diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
@@ -26,8 +26,8 @@ jobs:
         run: pip install -r requirements.txt && pip install -r requirements-test.txt
 
       - name: Run tests
-        working-directory: Backend/src
-        run: python -m pytest -s
+        working-directory: Backend/
+        run: python -m pytest .
         env:
           MONGO_URI : ${{ secrets.MONGO_URI }}
           SECRET_KEY_SIGN : ${{ secrets.SECRET_KEY_SIGN }}

diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
@@ -27,10 +27,9 @@ jobs:
       run: pip install -r requirements.txt
 
     - name: Run generate docs
-      working-directory: Backend/src
+      working-directory: Backend/
       run: |
         python generate-docs.py
-        mv -f api-docs-spotify-electron.html ../api-docs-spotify-electron.html
 
     - name: Add and commit changes
       working-directory: Backend/

diff --git a/Backend/.vscode/launch.json b/Backend/.vscode/launch.json
@@ -10,10 +10,10 @@
             "request": "launch",
             "module": "uvicorn",
             "args": [
-                "main:app",
+                "src.main:app",
                 "--reload"
             ],
-            "cwd": "${workspaceFolder}/src/",
+            "cwd": "${workspaceFolder}/",
             "jinja": true,
             "justMyCode": false
         },
@@ -25,10 +25,7 @@
             "args": [
                 "tests"
             ],
-            "cwd": "${workspaceFolder}/src/",
-            "env": {
-                "PYTHONPATH": "${workspaceFolder}"
-            },
+            "cwd": "${workspaceFolder}/",
             "console": "integratedTerminal",
             "justMyCode": false
         }

diff --git a/Backend/.vscode/settings.json b/Backend/.vscode/settings.json
@@ -3,4 +3,9 @@
     "flake8.args": [
         "--max-line-length=88"
     ],
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }
diff --git a/Backend/Dockerfile b/Backend/Dockerfile
@@ -7,8 +7,8 @@ RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
 
 COPY ./src /app/src
 
-WORKDIR /app/src
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+WORKDIR /code/
+CMD ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8000"]
 
 #docker build -t spotify_electron_backend_image .
 #docker run -d --name spotify_electron_backend -e MONGO_URI=mongo-uri SECRET_KEY_SIGN=secret-key DISTRIBUTION_ID=cloudfront-distribution-id -p 8000:8000 spotify_electron_backend_image
diff --git a/Backend/src/generate-docs.py → Backend/generate-docs.py b/Backend/src/generate-docs.py → Backend/generate-docs.py
@@ -2,7 +2,7 @@
 
 import json
 
-from main import app
+from src.main import app
 
 HTML_TEMPLATE = """<!DOCTYPE html>
 <html>

diff --git a/Backend/src/tests/assets/song.mp3 → Backend/src/__init__.py b/Backend/src/tests/assets/song.mp3 → Backend/src/__init__.py
diff --git a/Backend/src/main.py b/Backend/src/main.py
@@ -1,8 +1,15 @@
-from fastapi import FastAPI, Request, Response
+from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from middleware.middleware import CheckJwtAuth
-from routers import artistas, canciones, generos, login, playlists, search, usuarios
-from services.security_service import check_jwt_is_valid
+from src.middleware.middleware import CheckJwtAuth
+from src.routers import (
+    artistas,
+    canciones,
+    generos,
+    login,
+    playlists,
+    search,
+    usuarios,
+)
 
 app = FastAPI(
     title="SpotifyElectronAPI",

diff --git a/Backend/src/middleware/middleware.py b/Backend/src/middleware/middleware.py
@@ -1,5 +1,5 @@
 from fastapi import Request, Response
-from services.security_service import check_jwt_is_valid
+from src.services.security_service import check_jwt_is_valid
 from starlette.middleware.base import BaseHTTPMiddleware
 
 

diff --git a/Backend/src/model/Artist.py b/Backend/src/model/Artist.py
@@ -1,7 +1,7 @@
 import json
 from dataclasses import dataclass
 
-from model.User import User
+from src.model.User import User
 
 
 @dataclass

diff --git a/Backend/src/model/DTO/SongDTO.py b/Backend/src/model/DTO/SongDTO.py
@@ -1,7 +1,7 @@
 import json
 from dataclasses import dataclass
 
-from model.Genre import Genre
+from src.model.Genre import Genre
 
 
 @dataclass

diff --git a/Backend/src/model/Playlist.py b/Backend/src/model/Playlist.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-import services.song_service as song_service
+import src.services.song_service as song_service
 
 
 @dataclass

diff --git a/Backend/src/model/Song.py b/Backend/src/model/Song.py
@@ -1,7 +1,7 @@
 import json
 from dataclasses import dataclass
 
-from model.Genre import Genre
+from src.model.Genre import Genre
 
 
 @dataclass

diff --git a/Backend/src/routers/artistas.py b/Backend/src/routers/artistas.py
@@ -1,10 +1,10 @@
 import json
 from typing import Annotated, Union
 
-import services.artist_service as artist_service
+import src.services.artist_service as artist_service
 from fastapi import APIRouter, Header, HTTPException
 from fastapi.responses import Response
-from services.security_service import get_jwt_token
+from src.services.security_service import get_jwt_token
 
 router = APIRouter(
     prefix="/artistas",

diff --git a/Backend/src/routers/canciones.py b/Backend/src/routers/canciones.py
@@ -1,12 +1,17 @@
 import json
 from typing import Annotated, Union
 
-import services.dto_service as dto_service
-import services.song_service as song_service_streaming
-from fastapi import APIRouter, Header, HTTPException, UploadFile
+import src.services.dto_service as dto_service
+import src.services.song_service as song_service_streaming
+from fastapi import (
+    APIRouter,
+    Header,
+    HTTPException,
+    UploadFile,
+)
 from fastapi.responses import Response
-from model.Genre import Genre
-from services.security_service import get_jwt_token
+from src.model.Genre import Genre
+from src.services.security_service import get_jwt_token
 
 router = APIRouter(
     prefix="/canciones",

diff --git a/Backend/src/routers/generos.py b/Backend/src/routers/generos.py
@@ -1,4 +1,4 @@
-import services.genre_service as genre_service
+import src.services.genre_service as genre_service
 from fastapi import APIRouter
 from fastapi.responses import Response
 

diff --git a/Backend/src/routers/login.py b/Backend/src/routers/login.py
@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta, timezone
 from typing import Annotated
 
-import services.security_service as security_service
+import src.services.security_service as security_service
 from fastapi import APIRouter, Depends
 from fastapi.responses import Response
 from fastapi.security import OAuth2PasswordRequestForm

diff --git a/Backend/src/routers/playlists.py b/Backend/src/routers/playlists.py
@@ -1,11 +1,11 @@
 import json
 from typing import Annotated, Optional, Union
 
-import services.dto_service as dto_service
-import services.playlist_service as playlist_service
+import src.services.dto_service as dto_service
+import src.services.playlist_service as playlist_service
 from fastapi import APIRouter, Header, HTTPException
 from fastapi.responses import Response
-from services.security_service import get_jwt_token
+from src.services.security_service import get_jwt_token
 
 router = APIRouter(
     prefix="/playlists",

diff --git a/Backend/src/routers/search.py b/Backend/src/routers/search.py
@@ -1,4 +1,4 @@
-import services.search_service as search_service
+import src.services.search_service as search_service
 from fastapi import APIRouter
 from fastapi.responses import Response
 

diff --git a/Backend/src/routers/usuarios.py b/Backend/src/routers/usuarios.py
@@ -1,11 +1,11 @@
 from typing import Annotated, Union
 
-import services.all_users_service as all_users_service
-import services.security_service as security_service
-import services.user_service as user_service
+import src.services.all_users_service as all_users_service
+import src.services.security_service as security_service
+import src.services.user_service as user_service
 from fastapi import APIRouter, Header, HTTPException
 from fastapi.responses import Response
-from services.security_service import get_jwt_token
+from src.services.security_service import get_jwt_token
 
 router = APIRouter(
     prefix="/usuarios",

diff --git a/Backend/src/services/all_users_service.py b/Backend/src/services/all_users_service.py
@@ -1,12 +1,12 @@
 from sys import modules
 
-import services.artist_service as artist_service
-import services.user_service as user_service
-from database.Database import Database
+import src.services.artist_service as artist_service
+import src.services.user_service as user_service
+from src.database.Database import Database
 from fastapi import HTTPException
-from model.TokenData import TokenData
-from model.UserType import User_Type
-from services.utils import checkValidParameterString
+from src.model.TokenData import TokenData
+from src.model.UserType import User_Type
+from src.services.utils import checkValidParameterString
 
 if "pytest" in modules:
     user_collection = Database().connection["test.usuario"]

diff --git a/Backend/src/services/artist_service.py b/Backend/src/services/artist_service.py
@@ -3,11 +3,11 @@
 from sys import modules
 
 import bcrypt
-from database.Database import Database
+from src.database.Database import Database
 from fastapi import HTTPException
-from model.Artist import Artist
-from model.TokenData import TokenData
-from services.utils import checkValidParameterString
+from src.model.Artist import Artist
+from src.model.TokenData import TokenData
+from src.services.utils import checkValidParameterString
 
 if "pytest" in modules:
     artist_collection = Database().connection["test.artista"]

diff --git a/Backend/src/services/dto_service.py b/Backend/src/services/dto_service.py
@@ -1,11 +1,11 @@
 from sys import modules
 
-from database.Database import Database
+from src.database.Database import Database
 from fastapi import HTTPException
-from model.DTO.PlaylistDTO import PlaylistDTO
-from model.DTO.SongDTO import SongDTO
-from model.Genre import Genre
-from services.utils import checkValidParameterString
+from src.model.DTO.PlaylistDTO import PlaylistDTO
+from src.model.DTO.SongDTO import SongDTO
+from src.model.Genre import Genre
+from src.services.utils import checkValidParameterString
 
 if "pytest" in modules:
     song_collection = Database().connection["test.canciones.streaming"]

diff --git a/Backend/src/services/genre_service.py b/Backend/src/services/genre_service.py
@@ -1,6 +1,6 @@
 import json
 
-from model.Genre import Genre
+from src.model.Genre import Genre
 
 
 def get_genres() -> str:

diff --git a/Backend/src/services/playlist_service.py b/Backend/src/services/playlist_service.py
@@ -2,18 +2,18 @@
 from datetime import datetime
 from sys import modules
 
-import services.dto_service as dto_service
-from database.Database import Database
+import src.services.dto_service as dto_service
+from src.database.Database import Database
 from fastapi import HTTPException
-from model.Playlist import Playlist
-from model.TokenData import TokenData
-from services.all_users_service import (
+from src.model.Playlist import Playlist
+from src.model.TokenData import TokenData
+from src.services.all_users_service import (
     add_playlist_to_owner,
     check_user_exists,
     delete_playlist_from_owner,
 )
-from services.song_service import get_song
-from services.utils import checkValidParameterString
+from src.services.song_service import get_song
+from src.services.utils import checkValidParameterString
 
 if "pytest" in modules:
     playlistCollection = Database().connection["test.playlist"]

diff --git a/Backend/src/services/search_service.py b/Backend/src/services/search_service.py
@@ -1,11 +1,11 @@
 import json
 
-import services.artist_service as artist_service
-import services.playlist_service as playlist_service
-import services.song_service as song_service
-import services.user_service as user_service
+import src.services.artist_service as artist_service
+import src.services.playlist_service as playlist_service
+import src.services.song_service as song_service
+import src.services.user_service as user_service
 from fastapi import HTTPException
-from services.utils import checkValidParameterString
+from src.services.utils import checkValidParameterString
 
 
 def search_by_name(name: str) -> str:

diff --git a/Backend/src/services/security_service.py b/Backend/src/services/security_service.py
@@ -8,14 +8,14 @@
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
-from model.Artist import Artist
-from model.TokenData import TokenData
-from model.User import User
-from model.UserType import User_Type
-from services.all_users_service import check_user_exists, isArtistOrUser
-from services.artist_service import get_artist
-from services.user_service import get_user
-from services.utils import checkValidParameterString
+from src.model.Artist import Artist
+from src.model.TokenData import TokenData
+from src.model.User import User
+from src.model.UserType import User_Type
+from src.services.all_users_service import check_user_exists, isArtistOrUser
+from src.services.artist_service import get_artist
+from src.services.user_service import get_user
+from src.services.utils import checkValidParameterString
 
 SECRET_KEY = os.getenv("SECRET_KEY_SIGN")
 ALGORITHM = "HS256"

diff --git a/Backend/src/services/song_service.py b/Backend/src/services/song_service.py
@@ -6,20 +6,20 @@
 import boto3
 import librosa
 from botocore.exceptions import ClientError
-from database.Database import Database
+from src.database.Database import Database
 from dotenv import load_dotenv
 from fastapi import HTTPException
 from gridfs import GridFS
-from model.Genre import Genre
-from model.Song import Song
-from model.TokenData import TokenData
+from src.model.Genre import Genre
+from src.model.Song import Song
+from src.model.TokenData import TokenData
 from pymongo.errors import PyMongoError
-from services.artist_service import (
+from src.services.artist_service import (
     add_song_artist,
     check_artists_exists,
     delete_song_artist,
 )
-from services.utils import checkValidParameterString
+from src.services.utils import checkValidParameterString
 
 """ Insert songs with format [files,chunks] https://www.mongodb.com/docs/manual/core/gridfs/"""