diff --git a/app/dependencies.py b/app/dependencies.py index a29a7a1..26afbb9 100644 --- a/app/dependencies.py +++ b/app/dependencies.py @@ -1,11 +1,6 @@ -import sqlalchemy -from sqlalchemy.ext.automap import automap_base -from sqlalchemy.orm import Session +from sqlalchemy import create_engine +from sqlalchemy.orm import sessionmaker -Base = automap_base() - -dbEngine = sqlalchemy.create_engine('sqlite:///db.sqlite') - -dbSession = Session(dbEngine) - -Base.prepare(dbEngine, reflect=True) +engine = create_engine('sqlite:///db.sqlite') +Session = sessionmaker(engine) +session = Session() \ No newline at end of file diff --git a/app/main.py b/app/main.py index 19528c7..6183e33 100644 --- a/app/main.py +++ b/app/main.py @@ -3,6 +3,10 @@ from app.routers import admin, user, songs from fastapi.staticfiles import StaticFiles from fastapi.responses import HTMLResponse from fastapi.templating import Jinja2Templates +from app.dependencies import engine +from app.sql_models import Base + +Base.metadata.create_all(engine) app = FastAPI() @@ -10,7 +14,6 @@ app.include_router(admin.router) app.include_router(user.router) app.include_router(songs.router) - app.mount("/static", StaticFiles(directory="static"), name="static") templates = Jinja2Templates(directory="templates") @@ -24,7 +27,4 @@ async def root(request: Request, session_id : str = ""): else: return templates.TemplateResponse( request=request, name="voting.html" - ) - -# 1PMy17eraogNUz436w3aZKxyij39G1didaN02Ka_-45Q -# 71046222 \ No newline at end of file + ) \ No newline at end of file diff --git a/app/models.py b/app/models.py index d0b8b66..e374658 100644 --- a/app/models.py +++ b/app/models.py @@ -1,6 +1,7 @@ from typing import Optional, List import gspread from pydantic import BaseModel +from enum import Enum class GoogleFile(BaseModel): file_id: str @@ -11,7 +12,14 @@ class Genre(BaseModel): genre_name: str class Song(BaseModel): - song_id: Optional[int] - song_title: str - url: str - genres: List[Genre] \ No newline at end of file + id: int + og_artist: Optional[str] + aca_artist: Optional[str] + title: str + yt_url: Optional[str] + is_aca: bool + arng_url: Optional[str] + categories: dict[str, bool] + main_category: str + singable: bool + vote: Optional[int] \ No newline at end of file diff --git a/app/routers/admin.py b/app/routers/admin.py index 54e393f..62c6f2a 100644 --- a/app/routers/admin.py +++ b/app/routers/admin.py @@ -1,9 +1,7 @@ -from fastapi import APIRouter, HTTPException, Security, File, UploadFile -from app.models import GoogleFile -from app.dependencies import dbEngine +from fastapi import APIRouter, Security +from app.sql_models import SqlSong +from app.dependencies import session from app.routers.user import get_current_user -import gspread -from gspread.urls import DRIVE_FILES_API_V3_URL import pandas as pd import numpy as np @@ -13,87 +11,38 @@ router = APIRouter( responses={404: {"description": "Not found"}}, ) -gc = gspread.service_account(filename="service_account.json") # type: ignore -google_files: dict[str, GoogleFile] = {} - -spreadsheets: dict[str, gspread.Spreadsheet] = {} # type: ignore - -selected_worksheets: dict[tuple[str, int], bool] = {} - - -def fetch_files(): - if not (google_files): - for s in gc.http_client.request("get", DRIVE_FILES_API_V3_URL).json()["files"]: # - google_files[s["id"]] = GoogleFile( - file_id=s["id"], file_name=s["name"]) - - -def load_spreadsheet(file_id): - if file_id not in spreadsheets: - spreadsheets[file_id] = gc.open_by_key(file_id) - - -# Route to get google files (sheets) -@router.get("/files") -async def get_files() -> dict[str, GoogleFile]: - fetch_files() - return google_files - - -@router.get("/files/{file_id}") -def get_worksheets(file_id: str) -> dict[int, str]: - fetch_files() - if file_id not in google_files: - raise HTTPException(status_code=404, detail="Spreadsheet not found.") - - load_spreadsheet(file_id) - - # type: ignore - return {ws.id: ws.title for ws in spreadsheets[file_id].worksheets()} - - -@router.get("/selected_worksheets") -def list_selected_worksheet() -> dict[tuple[str, int], bool]: - return selected_worksheets - - -@router.post("/selected_worksheets") -def select_worksheet(file_id: str, worksheet_id: int, ignore_arrangement: bool = False): - selected_worksheets[(file_id, worksheet_id)] = ignore_arrangement - - -@router.delete("/selected_worksheets") -def deselect_worksheet(file_id: str, worksheet_id: int): - del selected_worksheets[(file_id, worksheet_id)] - - -@router.post("/process_worksheets") -def process_worksheets(): - fetch_files() - - song_list = [] - - for (file_id, worksheet_id), ignore_arrangement in selected_worksheets.items(): - load_spreadsheet(file_id) - worksheet = spreadsheets[file_id].get_worksheet_by_id(worksheet_id) - worksheet_df = pd.DataFrame(worksheet.get_all_records()) - - last_column = np.where(worksheet_df.columns == "Kommentare")[0][0] - - worksheet_df = worksheet_df.iloc[:, 0:last_column+1] - - worksheet_df["Ignore Arrangement"] = ignore_arrangement - - song_list.append(worksheet_df) - - song_list = pd.concat(song_list) - - song_list.to_sql(name='songs', con=dbEngine, - index=False, if_exists='append') - # song_list.to_csv("song-list.csv") +def get_main_category(categories) -> int: + if np.sum(categories != None) == 1: + return np.argmax(categories != None, axis=0) + elif "h" in categories: + return np.argmax(categories == "h", axis=0) + else: + return np.argmax(categories != None, axis=0) @router.post("/process_file") -async def create_upload_file(file: UploadFile): - return {"filename": file.filename} \ No newline at end of file +async def create_upload_file(link_share: str): + song_list = pd.read_excel(link_share) + song_list = song_list.replace({np.nan: None}) + song_list = song_list.replace({"n/a": None}) + + category_names = list(song_list.iloc[0][6:19]) + + for row in song_list[1:].iterrows(): + row = np.array(row[1]) + + s = SqlSong(og_artist=row[0], + aca_artist=row[1], + title=row[2], + yt_url=row[3], + is_aca=row[4] == "ja", + arng_url=row[5], + categories={n: v for n, v in zip( + category_names, row[6:19] != None)}, + main_category=category_names[get_main_category(row[6:19])], + singable=row[19] != "nein" + ) + + session.add(s) + session.commit() diff --git a/app/routers/songs.py b/app/routers/songs.py index 39da8c0..3c3571b 100644 --- a/app/routers/songs.py +++ b/app/routers/songs.py @@ -1,6 +1,7 @@ from fastapi import APIRouter, HTTPException, Security from app.models import Song -from app.dependencies import dbEngine, Base, dbSession +from app.sql_models import SqlSong, SqlVote +from app.dependencies import session from app.routers.user import get_current_user, User from typing import Annotated @@ -10,7 +11,20 @@ router = APIRouter( responses={404: {"description": "Not found"}}, ) - @router.get("/") -async def get_songs() -> list[dict]: - return dbSession.query(Base.songs).all() +async def get_songs(user_id : str = "") -> list[Song]: + sqlsongs = session.query(SqlSong).filter(SqlSong.singable == True).all() + votes = session.query(SqlVote).filter(SqlVote.user_id == user_id).all() + votes = {v.song_id : v.vote for v in votes} + + return [Song(**s.__dict__, vote=votes.get(s.id, None)) for s in sqlsongs] # type: ignore + +@router.post("/{song_id}/vote") +async def vote(song_id : str, user_id : str, vote : int): + vote_entry = session.query(SqlVote).filter((SqlVote.user_id == user_id) & (SqlVote.song_id == song_id)).first() + if vote_entry: + vote_entry.vote = str(vote) # type: ignore + else: + vote_entry = SqlVote(song_id=song_id, user_id=user_id, vote=vote) + session.add(vote_entry) + session.commit() diff --git a/app/sql_models.py b/app/sql_models.py new file mode 100644 index 0000000..082a176 --- /dev/null +++ b/app/sql_models.py @@ -0,0 +1,28 @@ +from sqlalchemy import Column, String, Integer, Boolean, PickleType, Enum +from sqlalchemy.orm import declarative_base +from typing import Optional + +Base = declarative_base() + +class SqlSong(Base): + __tablename__ = 'songs' + id = Column(Integer, primary_key=True) + og_artist = Column(String) + aca_artist = Column(String) + title = Column(String) + yt_url = Column(String) + is_aca = Column(Boolean) + arng_url = Column(String) + + categories = Column(PickleType) + + main_category = Column(String) + + singable = Column(Boolean) + +class SqlVote(Base): + __tablename__ = 'votes' + id = Column(Integer, primary_key=True) + song_id = Column(Integer) + user_id = Column(String) + vote = Column(Integer, nullable=True) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 447a959..b25acae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ fastapi uvicorn -gspread pandas numpy sqlalchemy python-jose[cryptography] passlib[bcrypt] python-multipart -jinja2 \ No newline at end of file +jinja2 +openpyxl \ No newline at end of file diff --git a/static/voting_script.js b/static/voting_script.js index dade61a..0b76135 100644 --- a/static/voting_script.js +++ b/static/voting_script.js @@ -1,4 +1,4 @@ -document.addEventListener('DOMContentLoaded', function () { +function makeScroll() { const eles = document.getElementsByClassName('categories'); Array.prototype.forEach.call(eles, ele => { @@ -44,27 +44,88 @@ document.addEventListener('DOMContentLoaded', function () { // Attach the handler ele.addEventListener('mousedown', mouseDownHandler); }); -}); +} + +function vote(song_id, vote) { + var session_id = getQueryParameter("session_id"); + + no_button = $("#song-" + song_id).find(".button-no") + yes_button = $("#song-" + song_id).find(".button-yes") + neutral_button = $("#song-" + song_id).find(".button-neutral") + + no_button.removeClass("selected") + yes_button.removeClass("selected") + neutral_button.removeClass("selected") + + switch (vote) { + case 0: + neutral_button.addClass("selected") + break; + case 1: + yes_button.addClass("selected") + break; + case -1: + no_button.addClass("selected") + default: + break; + } + + $.ajax({ + url: "/songs/" + song_id + "/vote?" + $.param({ user_id: session_id, vote: vote }), + method: "POST" + }) +} const getQueryParameter = (param) => new URLSearchParams(document.location.search.substring(1)).get(param); $(document).ready(function () { var session_id = getQueryParameter("session_id"); - $(".greeting-id").append(session_id); - $(".greeting-id").append("Foo"); + var songTemplate = $('script[data-template="song"]').text().split(/\$\{(.+?)\}/g); + + function render(props) { + return function(tok, i) { return (i % 2) ? props[tok] : tok; }; + } + + song_list = {} + $.ajax({ - url: "/songs" - }).then(function (user_list) { - $('.greeting-id').append(user_list.total); - localStorage.setItem("test-storage", user_list.total); - var users = []; - $.each(user_list.data, function (key, user) { - users.push("
  • " + user.first_name + "
    • "); + url: "/songs", + data: { user_id: session_id } + }).then(function (songs) { + $.each(songs, function (key, song) { + + var mc = song.main_category; + + if (!(mc in song_list)) { + song_list[mc] = "" + } + + var cats = "" + var cat_id = 1 + $.each(song.categories, function (cat_name, is_cat) { + if (is_cat) { + cats = cats + '' + cat_name + ''; + } + cat_id += 1 + }); + + + var s = songTemplate.map(render({ + "id" : song.id, + "title" : song.og_artist + ": " + song.title, + "cover_image" : "cover.jpg", + "no_selected" : (song.vote == -1) ? "selected" : "", + "neutral_selected" : (song.vote == 0) ? "selected" : "", + "yes_selected" : (song.vote == 1) ? "selected" : "", + "categories" : cats + })).join('') + + song_list[mc] += s + }); + $.each(song_list, function(mc, s) { + $('body').append("

    " + mc + "

    "); + $('body').append(s); }); - $("