1.1.7v

Merge pull request #41 from suchencjusz/1.1.7v
suchencjusz · Dec 3, 2024 · acc3591 · acc3591
2 parents 420cfcf + ff4e205
commit acc3591
Show file tree

Hide file tree

Showing 90 changed files with 579 additions and 324 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![GitHub License](https://img.shields.io/github/license/suchencjusz/filman2) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/suchencjusz/filman2) ![GitHub Action Docker](https://img.shields.io/github/actions/workflow/status/suchencjusz/filman2/docker-build.yml) ![Black format](https://img.shields.io/badge/code%20style-black-000000.svg)
+![Black format](https://img.shields.io/badge/code%20style-black-000000.svg) ![GitHub License](https://img.shields.io/github/license/suchencjusz/filman2) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/suchencjusz/filman2) ![GitHub Action Docker](https://img.shields.io/github/actions/workflow/status/suchencjusz/filman2/docker-build.yml)  [![Codacy Badge](https://app.codacy.com/project/badge/Grade/804ea9aa4ef147688ce59a0ab4342a09)](https://app.codacy.com/gh/suchencjusz/filman2/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 
 [Link z zaproszeniem bota na serwer discord](https://discord.com/oauth2/authorize?client_id=1182371658347065394&scope=bot&permissions=2147929152)
 

diff --git a/prof/combined.prof b/prof/combined.prof
diff --git a/prof/test_add_user_to_guild.prof b/prof/test_add_user_to_guild.prof
diff --git a/prof/test_add_watched_movie.prof b/prof/test_add_watched_movie.prof
diff --git a/prof/test_add_watched_series.prof b/prof/test_add_watched_series.prof
diff --git a/prof/test_configure_guild.prof b/prof/test_configure_guild.prof
diff --git a/prof/test_create_filmweb_movie.prof b/prof/test_create_filmweb_movie.prof
diff --git a/prof/test_create_filmweb_movie_existing.prof b/prof/test_create_filmweb_movie_existing.prof
diff --git a/prof/test_create_filmweb_series.prof b/prof/test_create_filmweb_series.prof
diff --git a/prof/test_create_filmweb_series_existing.prof b/prof/test_create_filmweb_series_existing.prof
diff --git a/prof/test_create_filmweb_watched_movie.prof b/prof/test_create_filmweb_watched_movie.prof
diff --git a/prof/test_create_filmweb_watched_movie_no_existing.prof b/prof/test_create_filmweb_watched_movie_no_existing.prof
diff --git a/prof/test_create_filmweb_watched_series.prof b/prof/test_create_filmweb_watched_series.prof
diff --git a/prof/test_create_filmweb_watched_series_no_existing.prof b/prof/test_create_filmweb_watched_series_no_existing.prof
diff --git a/prof/test_create_task.prof b/prof/test_create_task.prof
diff --git a/prof/test_delete_filmweb_mapping.prof b/prof/test_delete_filmweb_mapping.prof
diff --git a/prof/test_delete_filmweb_watched_movies.prof b/prof/test_delete_filmweb_watched_movies.prof
diff --git a/prof/test_delete_filmweb_watched_series_all.prof b/prof/test_delete_filmweb_watched_series_all.prof
diff --git a/prof/test_delete_guild.prof b/prof/test_delete_guild.prof
diff --git a/prof/test_delete_user_destination.prof b/prof/test_delete_user_destination.prof
diff --git a/prof/test_delete_user_destinations.prof b/prof/test_delete_user_destinations.prof
diff --git a/prof/test_get_filmweb_mapping_by_discord_id.prof b/prof/test_get_filmweb_mapping_by_discord_id.prof
diff --git a/prof/test_get_filmweb_mapping_by_discord_id2.prof b/prof/test_get_filmweb_mapping_by_discord_id2.prof
diff --git a/prof/test_get_filmweb_mapping_by_filmweb_id.prof b/prof/test_get_filmweb_mapping_by_filmweb_id.prof
diff --git a/prof/test_get_filmweb_mapping_by_filmweb_id2.prof b/prof/test_get_filmweb_mapping_by_filmweb_id2.prof
diff --git a/prof/test_get_filmweb_mapping_by_user_id.prof b/prof/test_get_filmweb_mapping_by_user_id.prof
diff --git a/prof/test_get_filmweb_mapping_by_user_id2.prof b/prof/test_get_filmweb_mapping_by_user_id2.prof
diff --git a/prof/test_get_filmweb_mapping_no_parameters.prof b/prof/test_get_filmweb_mapping_no_parameters.prof
diff --git a/prof/test_get_filmweb_movie_by_id.prof b/prof/test_get_filmweb_movie_by_id.prof
diff --git a/prof/test_get_filmweb_series_by_id.prof b/prof/test_get_filmweb_series_by_id.prof
diff --git a/prof/test_get_filmweb_user_watched_movies_by_user_id.prof b/prof/test_get_filmweb_user_watched_movies_by_user_id.prof
diff --git a/prof/test_get_filmweb_user_watched_series_all_by_user_id.prof b/prof/test_get_filmweb_user_watched_series_all_by_user_id.prof
diff --git a/prof/test_get_filmweb_watched_movie_by_id.prof b/prof/test_get_filmweb_watched_movie_by_id.prof
diff --git a/prof/test_get_filmweb_watched_movie_by_id_no_existing.prof b/prof/test_get_filmweb_watched_movie_by_id_no_existing.prof
diff --git a/prof/test_get_filmweb_watched_series_by_id.prof b/prof/test_get_filmweb_watched_series_by_id.prof
diff --git a/prof/test_get_filmweb_watched_series_by_id_no_existing.prof b/prof/test_get_filmweb_watched_series_by_id_no_existing.prof
diff --git a/prof/test_get_guild_by_id.prof b/prof/test_get_guild_by_id.prof
diff --git a/prof/test_get_guild_members.prof b/prof/test_get_guild_members.prof
diff --git a/prof/test_get_guilds.prof b/prof/test_get_guilds.prof
diff --git a/prof/test_get_user.prof b/prof/test_get_user.prof
diff --git a/prof/test_get_user_by_discord_id.prof b/prof/test_get_user_by_discord_id.prof
diff --git a/prof/test_get_user_by_filmweb_id.prof b/prof/test_get_user_by_filmweb_id.prof
diff --git a/prof/test_get_user_by_id.prof b/prof/test_get_user_by_id.prof
diff --git a/prof/test_get_user_by_non_existent_discord_id.prof b/prof/test_get_user_by_non_existent_discord_id.prof
diff --git a/prof/test_get_user_by_non_existent_filmweb_id.prof b/prof/test_get_user_by_non_existent_filmweb_id.prof
diff --git a/prof/test_get_user_by_non_existent_id.prof b/prof/test_get_user_by_non_existent_id.prof
diff --git a/prof/test_get_user_destination_by_user_id_user_in_guild.prof b/prof/test_get_user_destination_by_user_id_user_in_guild.prof
diff --git a/prof/test_get_user_destination_by_user_id_user_not_in_guild.prof b/prof/test_get_user_destination_by_user_id_user_not_in_guild.prof
diff --git a/prof/test_get_user_destinations_by_discord_user_id.prof b/prof/test_get_user_destinations_by_discord_user_id.prof
diff --git a/prof/test_get_user_destinations_by_non_existent_discord_user_id.prof b/prof/test_get_user_destinations_by_non_existent_discord_user_id.prof
diff --git a/prof/test_get_user_destinations_by_non_existent_user_id.prof b/prof/test_get_user_destinations_by_non_existent_user_id.prof
diff --git a/prof/test_get_user_destinations_by_user_id.prof b/prof/test_get_user_destinations_by_user_id.prof
diff --git a/prof/test_get_user_empty_database.prof b/prof/test_get_user_empty_database.prof
diff --git a/prof/test_get_user_no_parameters.prof b/prof/test_get_user_no_parameters.prof
diff --git a/prof/test_read_main.prof b/prof/test_read_main.prof
diff --git a/prof/test_remove_user_from_all_guilds.prof b/prof/test_remove_user_from_all_guilds.prof
diff --git a/prof/test_remove_user_from_guild.prof b/prof/test_remove_user_from_guild.prof
diff --git a/prof/test_sentry_debug.prof b/prof/test_sentry_debug.prof
diff --git a/prof/test_set_filmweb_mapping.prof b/prof/test_set_filmweb_mapping.prof
diff --git a/prof/test_set_filmweb_mapping2.prof b/prof/test_set_filmweb_mapping2.prof
diff --git a/prof/test_set_guild.prof b/prof/test_set_guild.prof
diff --git a/prof/test_set_user_destination.prof b/prof/test_set_user_destination.prof
diff --git a/prof/test_start.prof b/prof/test_start.prof
diff --git a/prof/test_task_update_task_status.prof b/prof/test_task_update_task_status.prof
diff --git a/prof/test_tasks_new_scrap_filmweb_movies.prof b/prof/test_tasks_new_scrap_filmweb_movies.prof
diff --git a/prof/test_tasks_new_scrap_filmweb_series.prof b/prof/test_tasks_new_scrap_filmweb_series.prof
diff --git a/prof/test_tasks_new_scrap_filmweb_users_movies.prof b/prof/test_tasks_new_scrap_filmweb_users_movies.prof
diff --git a/prof/test_tasks_new_scrap_filmweb_users_series.prof b/prof/test_tasks_new_scrap_filmweb_users_series.prof
diff --git a/prof/test_tasks_to_do_get.prof b/prof/test_tasks_to_do_get.prof
diff --git a/prof/test_tasks_to_do_head.prof b/prof/test_tasks_to_do_head.prof
diff --git a/prof/test_tasks_update_old_tasks.prof b/prof/test_tasks_update_old_tasks.prof
diff --git a/prof/test_tasks_update_stuck_tasks.prof b/prof/test_tasks_update_stuck_tasks.prof
diff --git a/prof/test_update_filmweb_movie.prof b/prof/test_update_filmweb_movie.prof
diff --git a/prof/test_update_filmweb_series.prof b/prof/test_update_filmweb_series.prof
diff --git a/prof/test_update_movie.prof b/prof/test_update_movie.prof
diff --git a/prof/test_update_series.prof b/prof/test_update_series.prof
diff --git a/prof/test_user_mapping_delete.prof b/prof/test_user_mapping_delete.prof
diff --git a/src/filman_crawler/Dockerfile b/src/filman_crawler/Dockerfile
@@ -1,26 +1,21 @@
-# FROM python:3.11-slim-bullseye
+FROM python:3.11-alpine
 
-# RUN apt update
-# RUN apt install -y pkg-config default-libmysqlclient-dev build-essential
+RUN apk update && apk add --no-cache \
+    gcc \
+    musl-dev \
+    libffi-dev \
+    openssl-dev \
+    mariadb-dev \
+    build-base
 
-# WORKDIR /src/filman_crawler
-
-# COPY requirements.txt requirements.txt
-# RUN pip3 install -r requirements.txt
-
-# COPY /src/filman_crawler .
-
-# ENV PYTHONPATH=/src
-
-# CMD [ "python3", "-m", "filman_crawler.main"]
-
-FROM python:3.11-slim-bullseye
-RUN apt update
-RUN apt install -y pkg-config default-libmysqlclient-dev build-essential
 WORKDIR /src
+
 COPY requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
 COPY /src/filman_server /src/filman_server
 COPY /src/filman_crawler /src/filman_crawler
+
 ENV PYTHONPATH=/src/filman_server:/src/filman_crawler
+
 CMD [ "python3", "-m", "filman_crawler.main" ]
diff --git a/src/filman_crawler/tasks/scrap_series.py b/src/filman_crawler/tasks/scrap_series.py
@@ -68,17 +68,6 @@ def scrap(self, task: Task):
             task_id=task.task_id,
         )
 
-        # update = self.update_data(
-        #     task.task_job,
-        #     title,
-        #     year,
-        #     other_year,
-        #     poster_url,
-        #     community_rate,
-        #     critics_rate,
-        #     task.task_id,
-        # )
-
         if update:
             logging.info(f"Updated series {title} ({year})")
         else:

diff --git a/src/filman_discord/Dockerfile b/src/filman_discord/Dockerfile
@@ -1,12 +1,17 @@
-FROM python:3.11-slim-bullseye
+FROM python:3.11-alpine
 
-RUN apt update
-RUN apt install -y pkg-config default-libmysqlclient-dev build-essential
+RUN apk update && apk add --no-cache \
+    gcc \
+    musl-dev \
+    libffi-dev \
+    openssl-dev \
+    mariadb-dev \
+    build-base
 
 WORKDIR /src/filman_discord
 
 COPY requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY /src/filman_discord .
 

diff --git a/src/filman_discord/endpoints/info.py b/src/filman_discord/endpoints/info.py
@@ -14,7 +14,7 @@ async def info_command(ctx: lightbulb.SlashContext) -> None:
 
     embed.add_field(
         name="Wersja i ostatnia aktualizacja",
-        value="`1.1.6` - `2024-12-01`",
+        value="`1.1.7` - `2024-12-03`",
     )
 
     embed.add_field(

diff --git a/src/filman_discord/main.py b/src/filman_discord/main.py
@@ -10,6 +10,8 @@
 from lightbulb.ext import tasks
 
 LOG_LEVEL = os.environ.get("LOG_LEVEL", "INFO")
+DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN")
+
 logging.basicConfig(
     level=LOG_LEVEL,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
@@ -18,8 +20,12 @@
 logging.getLogger("lightbulb").setLevel(LOG_LEVEL)
 logging.getLogger("hikari").setLevel(LOG_LEVEL)
 
+if DISCORD_TOKEN == None or DISCORD_TOKEN == "":  # todo check this
+    logging.error("Provide DISCORD_TOKEN!")
+    exit(-1)
+
 bot = lightbulb.BotApp(
-    os.environ.get("DISCORD_TOKEN"),
+    DISCORD_TOKEN,
     intents=hikari.Intents.ALL,
     banner=None,
 )
@@ -50,7 +56,7 @@ async def presence(app: lightbulb.BotApp) -> None:
     )
 
 
-@tasks.task(s=2, auto_start=True, pass_app=True, max_consecutive_failures=9999)
+@tasks.task(s=2, auto_start=True, pass_app=True, max_consecutive_failures=9999)  # test and refactor this is sometime
 async def notifications_task(app: lightbulb.BotApp) -> None:
     def filmweb_movie_url_generator(movie_title: str, movie_year: int, movie_id: int) -> str:
         movie_title = movie_title.replace(" ", "+")

diff --git a/src/filman_server/Dockerfile b/src/filman_server/Dockerfile
@@ -1,15 +1,20 @@
-FROM python:3.11-slim-bullseye
+FROM python:3.11-alpine
 
-RUN apt update
-RUN apt install -y pkg-config default-libmysqlclient-dev build-essential
+RUN apk update && apk add --no-cache \
+    gcc \
+    musl-dev \
+    libffi-dev \
+    openssl-dev \
+    mariadb-dev \
+    build-base
 
 WORKDIR /src/filman_server
 
 COPY requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
 
 COPY /src/filman_server .
 
 ENV PYTHONPATH=/src
 
-CMD [ "python3", "-m", "filman_server.main" ]
+CMD ["python3", "-m", "filman_server.main"]
diff --git a/src/filman_server/main.py b/src/filman_server/main.py
@@ -23,9 +23,6 @@
 logging.getLogger("uvicorn").setLevel(LOG_LEVEL)
 logging.getLogger("uvicorn.access").setLevel(LOG_LEVEL)
 
-
-models.Base.metadata.create_all(bind=engine)
-
 if os.environ.get("SENTRY_ENABLED", "false") == "true":
     sentry_sdk.init(
         dsn=os.environ.get("SENTRY_DSN"),
@@ -36,19 +33,16 @@
         ],
     )
 
-cron = Cron()
-cron.start()
+models.Base.metadata.create_all(bind=engine)
 
+cron = Cron()
 app = FastAPI()
 
 app.include_router(users.users_router)
 app.include_router(discord.discord_router)
 app.include_router(filmweb.filmweb_router)
 app.include_router(tasks.tasks_router)
 
-logging.debug("Application has started")
-logging.info("X")  # todo: remove
-
 
 @app.get("/")
 async def root():
@@ -61,4 +55,8 @@ async def trigger_error():
 
 
 if __name__ == "__main__":
+    logging.info("Filman server started")
     uvicorn.run(app, host="0.0.0.0", port=8000)
+    logging.debug("uvicorn running")
+    cron.start()
+    logging.debug("cron running")
diff --git a/src/filman_server/routes/filmweb.py b/src/filman_server/routes/filmweb.py
@@ -7,6 +7,8 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
+from urllib.parse import quote
+
 from filman_server.database import crud, schemas
 from filman_server.database.db import get_db
 
@@ -107,7 +109,10 @@ async def set_user_mapping(
     user_mapping: schemas.FilmWebUserMappingCreate,
     db: Session = Depends(get_db),
 ):
-    r = requests.get(f"https://www.filmweb.pl/api/v1/user/{user_mapping.filmweb_id}/preview")
+
+    filmweb_id_encoded = quote(user_mapping.filmweb_id)
+
+    r = requests.get(f"https://www.filmweb.pl/api/v1/user/{filmweb_id_encoded}/preview")
 
     if r.status_code != 200:
         raise HTTPException(status_code=404, detail="Filmweb user not found")

diff --git a/tests/integration/tests_filman_server/tests_routes/test_tasks_integration.py b/tests/integration/tests_filman_server/tests_routes/test_tasks_integration.py
@@ -16,13 +16,12 @@
 TestingSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 
-# Override the get_db dependency to use the test database
 def override_get_db():
     try:
         db = TestingSessionLocal()
         yield db
     finally:
-        db.close()
+        db.close_all()
 
 
 app.dependency_overrides[get_db] = override_get_db
@@ -39,6 +38,7 @@ def test_client():
 
 @pytest.fixture(autouse=True)
 def clear_database():
+    engine = create_engine(SQLALCHEMY_DATABASE_URL)
     Base.metadata.drop_all(bind=engine)
     Base.metadata.create_all(bind=engine)