From ea4a89fc761ddce7691667d80e52d0be66327080 Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Thu, 28 May 2026 11:16:45 +0000 Subject: [PATCH 1/8] Umbau auf 1 DB mit Test UND Prod --- data/database.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/data/database.py b/data/database.py index 5f0daa1..bac929c 100644 --- a/data/database.py +++ b/data/database.py @@ -1,4 +1,3 @@ - import mariadb import os from dotenv import load_dotenv @@ -6,25 +5,20 @@ from dotenv import load_dotenv load_dotenv() def db_connection(): + # Wir wählen die Konfiguration basierend auf der URL + is_prod = os.getenv("APP_URL") == "https://liga.au-fab.eu" + + # Prefix für die Umgebungsvariablen wählen + prefix = "DB_" if is_prod else "DB_TEST_" + try: connection = mariadb.connect( host=os.getenv("DB_HOST", "localhost"), port=int(os.getenv("DB_PORT", 3306)), - user=os.getenv("DB_USER"), + user=os.getenv(f"{prefix}USER"), password=os.getenv("DB_PASSWORD"), - database=os.getenv("DB_NAME") + database=os.getenv(f"{prefix}NAME") ) return connection except mariadb.Error as e: - raise RuntimeError(f"Fehler beim Verbinden mit DB: {e}") - - - - - - - - - - - + raise RuntimeError(f"Fehler beim Verbinden mit {'Prod' if is_prod else 'Test'}-DB: {e}") -- 2.43.0 From 5bd43a896b48a8ef16e49323af40d799de6cb75a Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Thu, 28 May 2026 12:47:56 +0000 Subject: [PATCH 2/8] =?UTF-8?q?alembic=20ini=20anpassen=20m=C3=BCssen=20an?= =?UTF-8?q?=20die=20neue=20DB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alembic.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alembic.ini b/alembic.ini index 370f462..4796f76 100644 --- a/alembic.ini +++ b/alembic.ini @@ -60,7 +60,7 @@ version_path_separator = os # Use os.pathsep. Default configuration used for ne # are written from script.py.mako # output_encoding = utf-8 -sqlalchemy.url = mysql+pymysql://admin:PWM_556rtX@192.168.0.113:3306/league_db +sqlalchemy.url = mysql+pymysql://admin:PWM_556rtX@192.168.0.113:3306/league_prod [post_write_hooks] -- 2.43.0 From 77bd91ab87f66b401e7b7753cdd66d4e4a8f095e Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Thu, 28 May 2026 14:28:54 +0000 Subject: [PATCH 3/8] =?UTF-8?q?WIP.=20Halb=20im=20Alembic=20Daten=20M?= =?UTF-8?q?=C3=BCll=20aufr=C3=A4umen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/database.py | 4 + migrations/env.py | 4 +- .../0d26fec6cbc5_clubs_table_eingefügt.py | 66 +++++++++ .../versions/47a1e41aa62f_initial_setup.py | 129 ------------------ ...7cde4ea3395a_korrektur_aller_relationen.py | 45 ++++++ models.py | 108 +++++++++++++++ 6 files changed, 226 insertions(+), 130 deletions(-) create mode 100644 migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py delete mode 100644 migrations/versions/47a1e41aa62f_initial_setup.py create mode 100644 migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py create mode 100644 models.py diff --git a/data/database.py b/data/database.py index bac929c..a77c6ed 100644 --- a/data/database.py +++ b/data/database.py @@ -11,6 +11,7 @@ def db_connection(): # Prefix für die Umgebungsvariablen wählen prefix = "DB_" if is_prod else "DB_TEST_" + try: connection = mariadb.connect( host=os.getenv("DB_HOST", "localhost"), @@ -20,5 +21,8 @@ def db_connection(): database=os.getenv(f"{prefix}NAME") ) return connection + if is_prod: + print("Verbindung mit Test DB") + except mariadb.Error as e: raise RuntimeError(f"Fehler beim Verbinden mit {'Prod' if is_prod else 'Test'}-DB: {e}") diff --git a/migrations/env.py b/migrations/env.py index 36112a3..55c0ce3 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -5,6 +5,8 @@ from sqlalchemy import pool from alembic import context +from models import Base + # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config @@ -18,7 +20,7 @@ if config.config_file_name is not None: # for 'autogenerate' support # from myapp import mymodel # target_metadata = mymodel.Base.metadata -target_metadata = None +target_metadata = Base.metadata # other values from the config, defined by the needs of env.py, # can be acquired: diff --git a/migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py b/migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py new file mode 100644 index 0000000..f8683b1 --- /dev/null +++ b/migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py @@ -0,0 +1,66 @@ +"""Clubs Table eingefügt + +Revision ID: 0d26fec6cbc5 +Revises: 7cde4ea3395a +Create Date: 2026-05-28 14:20:05.578971 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '0d26fec6cbc5' +down_revision: Union[str, Sequence[str], None] = '7cde4ea3395a' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('clubs', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=255), nullable=False), + sa.Column('description', sa.Text(), nullable=False), + sa.Column('icon', sa.Text(), nullable=True), + sa.Column('misc', sa.Text(), nullable=True), + sa.Column('subsciption', sa.Integer(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.drop_index(op.f('player_achievements_FK_2_0'), table_name='player_achievements') + op.drop_constraint(op.f('player_achievements_ibfk_1'), 'player_achievements', type_='foreignkey') + op.drop_index(op.f('player_id'), table_name='player_game_statistic') + op.drop_index(op.f('discord_id'), table_name='players') + op.drop_index(op.f('sqlite_autoindex_players_1'), table_name='players') + op.drop_index(op.f('sqlite_autoindex_players_1_1'), table_name='players') + op.drop_index(op.f('sqlite_autoindex_players_1_2'), table_name='players') + op.drop_index(op.f('sqlite_autoindex_players_1_3'), table_name='players') + op.drop_index(op.f('sqlite_autoindex_players_1_4'), table_name='players') + op.drop_index(op.f('sqlite_autoindex_players_1_5'), table_name='players') + op.drop_index(op.f('gamesystem_id'), table_name='season_schedule') + op.drop_index(op.f('idx_schedule_date'), table_name='season_schedule') + op.drop_index(op.f('idx_seasons_current'), table_name='seasons') + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_index(op.f('idx_seasons_current'), 'seasons', ['gamesystem_id', 'start_date', 'end_date'], unique=False) + op.create_index(op.f('idx_schedule_date'), 'season_schedule', ['start_month', 'start_day'], unique=False) + op.create_index(op.f('gamesystem_id'), 'season_schedule', ['gamesystem_id', 'start_month', 'start_day'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_5'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_4'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_3'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_2'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_1'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('discord_id'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('player_id'), 'player_game_statistic', ['player_id', 'gamesystem_id', 'season_id'], unique=True) + op.create_foreign_key(op.f('player_achievements_ibfk_1'), 'player_achievements', 'gamesystems', ['earned_in'], ['id']) + op.create_index(op.f('player_achievements_FK_2_0'), 'player_achievements', ['earned_in'], unique=False) + op.drop_table('clubs') + # ### end Alembic commands ### diff --git a/migrations/versions/47a1e41aa62f_initial_setup.py b/migrations/versions/47a1e41aa62f_initial_setup.py deleted file mode 100644 index 9afcfa5..0000000 --- a/migrations/versions/47a1e41aa62f_initial_setup.py +++ /dev/null @@ -1,129 +0,0 @@ -"""initial_setup - -Revision ID: 47a1e41aa62f -Revises: -Create Date: 2026-05-28 08:32:26.064485 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '47a1e41aa62f' -down_revision: Union[str, Sequence[str], None] = None -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - - # Tabellen-Definition für: achievements - op.create_table('achievements', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('name', sa.VARCHAR(), nullable=False), - sa.Column('description', sa.TEXT(), nullable=False), - sa.Column('icon', sa.TEXT(), nullable=True), - sa.Column('misc', sa.TEXT(), nullable=True), - ) - - # Tabellen-Definition für: gamesystems - op.create_table('gamesystems', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('name', sa.VARCHAR(), nullable=False), - sa.Column('picture', sa.TEXT(), nullable=True), - sa.Column('description', sa.TEXT(), nullable=True), - sa.Column('active_players', sa.INTEGER(), nullable=True), - sa.Column('min_score', sa.INTEGER(), nullable=True), - sa.Column('max_score', sa.INTEGER(), nullable=True), - ) - - # Tabellen-Definition für: matches - op.create_table('matches', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('gamesystem_id', sa.INTEGER(), nullable=True), - sa.Column('player1_id', sa.INTEGER(), nullable=True), - sa.Column('score_player1', sa.INTEGER(), nullable=True), - sa.Column('player2_id', sa.INTEGER(), nullable=True), - sa.Column('score_player2', sa.INTEGER(), nullable=True), - sa.Column('played_at', sa.TIMESTAMP(), nullable=True), - sa.Column('player1_base_change', sa.INTEGER(), nullable=True), - sa.Column('player1_khorne', sa.INTEGER(), nullable=True), - sa.Column('player1_slaanesh', sa.INTEGER(), nullable=True), - sa.Column('player1_tzeentch', sa.INTEGER(), nullable=True), - sa.Column('player1_mmr_change', sa.INTEGER(), nullable=True), - sa.Column('player2_base_change', sa.INTEGER(), nullable=True), - sa.Column('player2_khorne', sa.INTEGER(), nullable=True), - sa.Column('player2_slaanesh', sa.INTEGER(), nullable=True), - sa.Column('player2_tzeentch', sa.INTEGER(), nullable=True), - sa.Column('player2_mmr_change', sa.INTEGER(), nullable=True), - sa.Column('player2_check', sa.INTEGER(), nullable=True), - sa.Column('match_is_counted', sa.INTEGER(), nullable=True), - sa.Column('rust_factor', sa.DOUBLE(), nullable=True), - sa.Column('point_inflation', sa.DOUBLE(), nullable=True), - sa.Column('elo_factor', sa.DOUBLE(), nullable=True), - ) - - # Tabellen-Definition für: players - op.create_table('players', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('discord_id', sa.VARCHAR(), nullable=True), - sa.Column('discord_name', sa.VARCHAR(), nullable=False), - sa.Column('discord_avatar_url', sa.TEXT(), nullable=True), - sa.Column('display_name', sa.VARCHAR(), nullable=True), - ) - - # Tabellen-Definition für: player_achievements - op.create_table('player_achievements', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('player_id', sa.INTEGER(), nullable=True), - sa.Column('achievement_id', sa.INTEGER(), nullable=True), - sa.Column('earned_at', sa.TIMESTAMP(), nullable=True), - sa.Column('earned_in', sa.INTEGER(), nullable=True), - ) - - # Tabellen-Definition für: player_game_statistic - op.create_table('player_game_statistic', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('player_id', sa.INTEGER(), nullable=True), - sa.Column('gamesystem_id', sa.INTEGER(), nullable=True), - sa.Column('mmr', sa.INTEGER(), nullable=True), - sa.Column('games_in_system', sa.INTEGER(), nullable=True), - sa.Column('points', sa.INTEGER(), nullable=True), - sa.Column('avv_points', sa.INTEGER(), nullable=True), - sa.Column('last_played', sa.TIMESTAMP(), nullable=True), - sa.Column('win_rate', sa.INTEGER(), nullable=True), - sa.Column('win_streak', sa.INTEGER(), nullable=True), - sa.Column('wins', sa.INTEGER(), nullable=True), - sa.Column('loss', sa.INTEGER(), nullable=True), - sa.Column('draws', sa.INTEGER(), nullable=True), - sa.Column('trend', sa.INTEGER(), nullable=True), - sa.Column('tyrann_id', sa.INTEGER(), nullable=True), - sa.Column('pushover_id', sa.INTEGER(), nullable=True), - sa.Column('nemesis_id', sa.INTEGER(), nullable=True), - sa.Column('season_id', sa.INTEGER(), nullable=False), - ) - - # Tabellen-Definition für: seasons - op.create_table('seasons', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('gamesystem_id', sa.INTEGER(), nullable=False), - sa.Column('name', sa.VARCHAR(), nullable=False), - sa.Column('start_date', sa.DATE(), nullable=False), - sa.Column('end_date', sa.DATE(), nullable=True), - ) - - # Tabellen-Definition für: season_schedule - op.create_table('season_schedule', - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('gamesystem_id', sa.INTEGER(), nullable=False), - sa.Column('start_month', sa.INTEGER(), nullable=False), - sa.Column('start_day', sa.INTEGER(), nullable=False), - ) - - -def downgrade() -> None: - """Downgrade schema.""" - pass diff --git a/migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py b/migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py new file mode 100644 index 0000000..dc1599a --- /dev/null +++ b/migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py @@ -0,0 +1,45 @@ +"""Korrektur aller Relationen + +Revision ID: 7cde4ea3395a +Revises: +Create Date: 2026-05-28 14:07:29.811432 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '7cde4ea3395a' +down_revision: Union[str, Sequence[str], None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + + op.create_foreign_key(None, 'player_achievements', 'seasons', ['earned_in'], ['id']) + + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_index(op.f('idx_seasons_current'), 'seasons', ['gamesystem_id', 'start_date', 'end_date'], unique=False) + op.create_index(op.f('idx_schedule_date'), 'season_schedule', ['start_month', 'start_day'], unique=False) + op.create_index(op.f('gamesystem_id'), 'season_schedule', ['gamesystem_id', 'start_month', 'start_day'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_5'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_4'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_3'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_2'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1_1'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('sqlite_autoindex_players_1'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('discord_id'), 'players', ['discord_id'], unique=True) + op.create_index(op.f('player_id'), 'player_game_statistic', ['player_id', 'gamesystem_id', 'season_id'], unique=True) + op.drop_constraint(None, 'player_achievements', type_='foreignkey') + op.create_foreign_key(op.f('player_achievements_FK_2_0'), 'player_achievements', 'gamesystems', ['earned_in'], ['id']) + # ### end Alembic commands ### diff --git a/models.py b/models.py new file mode 100644 index 0000000..b73027f --- /dev/null +++ b/models.py @@ -0,0 +1,108 @@ +from sqlalchemy import Column, Integer, String, Text, TIMESTAMP, DATE, DOUBLE, ForeignKey +from sqlalchemy.orm import declarative_base + +Base = declarative_base() + +class Club(Base): + __tablename__ = 'clubs' + id = Column(Integer, primary_key=True) + name = Column(String(255), nullable=False) + description = Column(Text, nullable=False) + icon = Column(Text, nullable=True) + misc = Column(Text, nullable=True) + subsciption = Column(Integer) + +class Achievement(Base): + __tablename__ = 'achievements' + id = Column(Integer, primary_key=True) + name = Column(String(255), nullable=False) + description = Column(Text, nullable=False) + icon = Column(Text, nullable=True) + misc = Column(Text, nullable=True) + +class GameSystem(Base): + __tablename__ = 'gamesystems' + id = Column(Integer, primary_key=True) + name = Column(String(255), nullable=False) + picture = Column(Text, nullable=True) + description = Column(Text, nullable=True) + active_players = Column(Integer, nullable=True) + min_score = Column(Integer, nullable=True) + max_score = Column(Integer, nullable=True) + +class Match(Base): + __tablename__ = 'matches' + id = Column(Integer, primary_key=True) + gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=True) + player1_id = Column(Integer, ForeignKey('players.id'), nullable=True) + score_player1 = Column(Integer, nullable=True) + player2_id = Column(Integer, ForeignKey('players.id'), nullable=True) + score_player2 = Column(Integer, nullable=True) + played_at = Column(TIMESTAMP, nullable=True) + player1_base_change = Column(Integer, nullable=True) + player1_khorne = Column(Integer, nullable=True) + player1_slaanesh = Column(Integer, nullable=True) + player1_tzeentch = Column(Integer, nullable=True) + player1_mmr_change = Column(Integer, nullable=True) + player2_base_change = Column(Integer, nullable=True) + player2_khorne = Column(Integer, nullable=True) + player2_slaanesh = Column(Integer, nullable=True) + player2_tzeentch = Column(Integer, nullable=True) + player2_mmr_change = Column(Integer, nullable=True) + player2_check = Column(Integer, nullable=True) + match_is_counted = Column(Integer, nullable=True) + rust_factor = Column(DOUBLE, nullable=True) + point_inflation = Column(DOUBLE, nullable=True) + elo_factor = Column(DOUBLE, nullable=True) + +class Player(Base): + __tablename__ = 'players' + id = Column(Integer, primary_key=True) + discord_id = Column(String(255), nullable=True) + discord_name = Column(String(255), nullable=False) + discord_avatar_url = Column(Text, nullable=True) + display_name = Column(String(255), nullable=True) + +class PlayerAchievement(Base): + __tablename__ = 'player_achievements' + id = Column(Integer, primary_key=True) + player_id = Column(Integer, ForeignKey('players.id'), nullable=True) + achievement_id = Column(Integer, ForeignKey('achievements.id'), nullable=True) + earned_at = Column(TIMESTAMP, nullable=True) + earned_in = Column(Integer, ForeignKey('seasons.id'), nullable=True) + +class PlayerGameStatistic(Base): + __tablename__ = 'player_game_statistic' + id = Column(Integer, primary_key=True) + player_id = Column(Integer, ForeignKey('players.id'), nullable=True) + gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=True) + mmr = Column(Integer, nullable=True) + games_in_system = Column(Integer, nullable=True) + points = Column(Integer, nullable=True) + avv_points = Column(Integer, nullable=True) + last_played = Column(TIMESTAMP, nullable=True) + win_rate = Column(Integer, nullable=True) + win_streak = Column(Integer, nullable=True) + wins = Column(Integer, nullable=True) + loss = Column(Integer, nullable=True) + draws = Column(Integer, nullable=True) + trend = Column(Integer, nullable=True) + tyrann_id = Column(Integer, nullable=True) + pushover_id = Column(Integer, nullable=True) + nemesis_id = Column(Integer, nullable=True) + season_id = Column(Integer, ForeignKey('seasons.id'), nullable=False) + +class Season(Base): + __tablename__ = 'seasons' + id = Column(Integer, primary_key=True) + gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=False) + name = Column(String(100), nullable=False) + start_date = Column(DATE, nullable=False) + end_date = Column(DATE, nullable=True) + +class SeasonSchedule(Base): + __tablename__ = 'season_schedule' + id = Column(Integer, primary_key=True) + gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=False) + start_month = Column(Integer, nullable=False) + start_day = Column(Integer, nullable=False) -- 2.43.0 From b5b041c889e4b067ad7e6b6ca5b4d10196356925 Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Fri, 29 May 2026 08:20:09 +0000 Subject: [PATCH 4/8] error handling join_league() --- data/data_api.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/data/data_api.py b/data/data_api.py index cb88fb5..1d4dd52 100644 --- a/data/data_api.py +++ b/data/data_api.py @@ -250,12 +250,16 @@ def join_league(player_id, gamesystem_id): INSERT INTO player_game_statistic (player_id, gamesystem_id) VALUES (%s, %s) """ - logger.log(f"{get_player_name(player_id)} joined {gamesystem_id}") - cursor.execute(query, (player_id, gamesystem_id)) - connection.commit() - - cursor.close() - connection.close() + try: + cursor.execute(query, (player_id, gamesystem_id)) + connection.commit() + logger.log(f"{get_player_name(player_id)} joined {gamesystem_id}") + except mariadb.Error as e: + logger.log(f"FEHLER beim Insert: {e}") # WICHTIG! + raise + finally: + cursor.close() + connection.close() # ----------------------------------------------------- -- 2.43.0 From 049089cb5fdc11f791c3a9b99b9c8f73f4a8521b Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Fri, 29 May 2026 08:23:07 +0000 Subject: [PATCH 5/8] WIP Fehler --- data/data_api.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/data/data_api.py b/data/data_api.py index 1d4dd52..d20e1f0 100644 --- a/data/data_api.py +++ b/data/data_api.py @@ -247,16 +247,15 @@ def join_league(player_id, gamesystem_id): cursor = connection.cursor() query = """ - INSERT INTO player_game_statistic (player_id, gamesystem_id) - VALUES (%s, %s) + INSERT INTO player_game_statistic (player_id, gamesystem_id, season_id) + VALUES (%s, %s, 1) # Ich habe season_id mal testweise auf 1 gesetzt! """ try: cursor.execute(query, (player_id, gamesystem_id)) connection.commit() - logger.log(f"{get_player_name(player_id)} joined {gamesystem_id}") - except mariadb.Error as e: - logger.log(f"FEHLER beim Insert: {e}") # WICHTIG! - raise + logger.log(f"Erfolg: {player_id} joined {gamesystem_id}") + except Exception as e: + print(f"DATENBANK-FEHLER: {e}") finally: cursor.close() connection.close() -- 2.43.0 From 0b42c081fe269be8e99f7810f3927eecff4cc0c0 Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Fri, 29 May 2026 09:23:28 +0000 Subject: [PATCH 6/8] =?UTF-8?q?Error=20handling=20f=C3=BCr=20join=5Fleague?= =?UTF-8?q?=20und=20aktive=20season=20abfrage.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/data_api.py | 60 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/data/data_api.py b/data/data_api.py index d20e1f0..8a537a5 100644 --- a/data/data_api.py +++ b/data/data_api.py @@ -242,23 +242,59 @@ def get_player_rank(player_id, system_id): return row['rank'] return None + + def join_league(player_id, gamesystem_id): + try: + # 1. Die richtige Season für dieses System holen + season_id = get_current_season_id(gamesystem_id) + + connection = db_connection() + cursor = connection.cursor() + + query = """ + INSERT INTO player_game_statistic + (player_id, gamesystem_id, season_id) + VALUES (%s, %s, %s) + """ + cursor.execute(query, (player_id, gamesystem_id, season_id)) + connection.commit() + + logger.log(f"Erfolg: Spieler {player_id} joined System {gamesystem_id} in Season {season_id}") + + except Exception as e: + logger.log(f"FEHLER beim Beitreten: {e}") + raise + finally: + # Hier ist ein kleiner Check, ob die connection überhaupt existiert + if 'connection' in locals() and connection: + cursor.close() + connection.close() + + + +def get_current_season_id(gamesystem_id): connection = db_connection() - cursor = connection.cursor() + cursor = connection.cursor(dictionary=True) query = """ - INSERT INTO player_game_statistic (player_id, gamesystem_id, season_id) - VALUES (%s, %s, 1) # Ich habe season_id mal testweise auf 1 gesetzt! + SELECT id FROM seasons + WHERE gamesystem_id = %s + ORDER BY start_date DESC + LIMIT 1 """ - try: - cursor.execute(query, (player_id, gamesystem_id)) - connection.commit() - logger.log(f"Erfolg: {player_id} joined {gamesystem_id}") - except Exception as e: - print(f"DATENBANK-FEHLER: {e}") - finally: - cursor.close() - connection.close() + cursor.execute(query, (gamesystem_id,)) + result = cursor.fetchone() + + cursor.close() + connection.close() + + if result: + return result['id'] + else: + # Hier wissen wir jetzt genau, welches Spielsystem keine Saison hat + raise RuntimeError(f"Keine Saison für Spielsystem {gamesystem_id} gefunden!") + # ----------------------------------------------------- -- 2.43.0 From b1cc40061198a0d3b3e5d3081d872cfe326e174d Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Fri, 29 May 2026 09:26:21 +0000 Subject: [PATCH 7/8] Refractor --- data/data_api.py | 2 +- gui/main_gui.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/data/data_api.py b/data/data_api.py index 8a537a5..fdb1ec4 100644 --- a/data/data_api.py +++ b/data/data_api.py @@ -293,7 +293,7 @@ def get_current_season_id(gamesystem_id): return result['id'] else: # Hier wissen wir jetzt genau, welches Spielsystem keine Saison hat - raise RuntimeError(f"Keine Saison für Spielsystem {gamesystem_id} gefunden!") + raise RuntimeError(f"Keine Saison für {gamesystem_id} gefunden!") diff --git a/gui/main_gui.py b/gui/main_gui.py index 19052c4..bdb841e 100644 --- a/gui/main_gui.py +++ b/gui/main_gui.py @@ -244,8 +244,6 @@ def setup_routes(admin_discord_id): ui.label(text=f"MMR: {stat['mmr']}").classes("text-lg font-bold text-accenttext") ui.label(text=f"Spiele: {stat['games_in_system']}").classes("text-lg font-bold text-accenttext") - - # --------------------------- # Match Historie # --------------------------- -- 2.43.0 From 128f27587bff4e124e51f04a6ac19ed026c33726 Mon Sep 17 00:00:00 2001 From: Daniel Nagel Date: Sun, 31 May 2026 10:48:25 +0200 Subject: [PATCH 8/8] =?UTF-8?q?Alembic=20und=20SQLAlchemy=20wieder=20raus?= =?UTF-8?q?=20gel=C3=B6scht.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alembic.ini | 116 ------------------ migrations/README | 1 - migrations/env.py | 80 ------------ migrations/generate_migration_code.py | 16 --- migrations/script.py.mako | 28 ----- .../0d26fec6cbc5_clubs_table_eingefügt.py | 66 ---------- ...7cde4ea3395a_korrektur_aller_relationen.py | 45 ------- models.py | 108 ---------------- setup_env.sh | 7 +- 9 files changed, 2 insertions(+), 465 deletions(-) delete mode 100644 alembic.ini delete mode 100644 migrations/README delete mode 100644 migrations/env.py delete mode 100644 migrations/generate_migration_code.py delete mode 100644 migrations/script.py.mako delete mode 100644 migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py delete mode 100644 migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py delete mode 100644 models.py diff --git a/alembic.ini b/alembic.ini deleted file mode 100644 index 4796f76..0000000 --- a/alembic.ini +++ /dev/null @@ -1,116 +0,0 @@ -# A generic, single database configuration. - -[alembic] -# path to migration scripts -script_location = migrations - -# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s -# Uncomment the line below if you want the files to be prepended with date and time -# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file -# for all available tokens -# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s - -# sys.path path, will be prepended to sys.path if present. -# defaults to the current working directory. -prepend_sys_path = . - -# timezone to use when rendering the date within the migration file -# as well as the filename. -# If specified, requires the python>=3.9 or backports.zoneinfo library. -# Any required deps can installed by adding `alembic[tz]` to the pip requirements -# string value is passed to ZoneInfo() -# leave blank for localtime -# timezone = - -# max length of characters to apply to the -# "slug" field -# truncate_slug_length = 40 - -# set to 'true' to run the environment during -# the 'revision' command, regardless of autogenerate -# revision_environment = false - -# set to 'true' to allow .pyc and .pyo files without -# a source .py file to be detected as revisions in the -# versions/ directory -# sourceless = false - -# version location specification; This defaults -# to migrations/versions. When using multiple version -# directories, initial revisions must be specified with --version-path. -# The path separator used here should be the separator specified by "version_path_separator" below. -# version_locations = %(here)s/bar:%(here)s/bat:migrations/versions - -# version path separator; As mentioned above, this is the character used to split -# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep. -# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas. -# Valid values for version_path_separator are: -# -# version_path_separator = : -# version_path_separator = ; -# version_path_separator = space -version_path_separator = os # Use os.pathsep. Default configuration used for new projects. - -# set to 'true' to search source files recursively -# in each "version_locations" directory -# new in Alembic version 1.10 -# recursive_version_locations = false - -# the output encoding used when revision files -# are written from script.py.mako -# output_encoding = utf-8 - -sqlalchemy.url = mysql+pymysql://admin:PWM_556rtX@192.168.0.113:3306/league_prod - - -[post_write_hooks] -# post_write_hooks defines scripts or Python functions that are run -# on newly generated revision scripts. See the documentation for further -# detail and examples - -# format using "black" - use the console_scripts runner, against the "black" entrypoint -# hooks = black -# black.type = console_scripts -# black.entrypoint = black -# black.options = -l 79 REVISION_SCRIPT_FILENAME - -# lint with attempts to fix using "ruff" - use the exec runner, execute a binary -# hooks = ruff -# ruff.type = exec -# ruff.executable = %(here)s/.venv/bin/ruff -# ruff.options = --fix REVISION_SCRIPT_FILENAME - -# Logging configuration -[loggers] -keys = root,sqlalchemy,alembic - -[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 - -[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 diff --git a/migrations/README b/migrations/README deleted file mode 100644 index 98e4f9c..0000000 --- a/migrations/README +++ /dev/null @@ -1 +0,0 @@ -Generic single-database configuration. \ No newline at end of file diff --git a/migrations/env.py b/migrations/env.py deleted file mode 100644 index 55c0ce3..0000000 --- a/migrations/env.py +++ /dev/null @@ -1,80 +0,0 @@ -from logging.config import fileConfig - -from sqlalchemy import engine_from_config -from sqlalchemy import pool - -from alembic import context - -from models import Base - -# 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. -if config.config_file_name is not None: - fileConfig(config.config_file_name) - -# add your model's MetaData object here -# for 'autogenerate' support -# from myapp import mymodel -# target_metadata = mymodel.Base.metadata -target_metadata = Base.metadata - -# 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 run_migrations_offline() -> None: - """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=target_metadata, - literal_binds=True, - dialect_opts={"paramstyle": "named"}, - ) - - with context.begin_transaction(): - context.run_migrations() - - -def run_migrations_online() -> None: - """Run migrations in 'online' mode. - - In this scenario we need to create an Engine - and associate a connection with the context. - - """ - connectable = engine_from_config( - config.get_section(config.config_ini_section, {}), - prefix="sqlalchemy.", - poolclass=pool.NullPool, - ) - - with connectable.connect() as connection: - context.configure( - connection=connection, target_metadata=target_metadata - ) - - with context.begin_transaction(): - context.run_migrations() - - -if context.is_offline_mode(): - run_migrations_offline() -else: - run_migrations_online() diff --git a/migrations/generate_migration_code.py b/migrations/generate_migration_code.py deleted file mode 100644 index 2ef4eaa..0000000 --- a/migrations/generate_migration_code.py +++ /dev/null @@ -1,16 +0,0 @@ -from sqlalchemy import create_engine, MetaData - -DATABASE_URL = "mysql+pymysql://admin:PWM_556rtX@192.168.0.113:3306/league_db" -engine = create_engine(DATABASE_URL) -metadata = MetaData() -metadata.reflect(bind=engine) - -print("Kopiere das hier in dein Alembic-Script:") -for table in metadata.tables.values(): - print(f"\n# Tabellen-Definition für: {table.name}") - print(f"op.create_table('{table.name}',") - for column in table.columns: - col_type = str(column.type) - nullable = "True" if column.nullable else "False" - print(f" sa.Column('{column.name}', sa.{col_type.split('(')[0].upper()}(), nullable={nullable}),") - print(")") diff --git a/migrations/script.py.mako b/migrations/script.py.mako deleted file mode 100644 index 1101630..0000000 --- a/migrations/script.py.mako +++ /dev/null @@ -1,28 +0,0 @@ -"""${message} - -Revision ID: ${up_revision} -Revises: ${down_revision | comma,n} -Create Date: ${create_date} - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa -${imports if imports else ""} - -# revision identifiers, used by Alembic. -revision: str = ${repr(up_revision)} -down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} -branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} -depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} - - -def upgrade() -> None: - """Upgrade schema.""" - ${upgrades if upgrades else "pass"} - - -def downgrade() -> None: - """Downgrade schema.""" - ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py b/migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py deleted file mode 100644 index f8683b1..0000000 --- a/migrations/versions/0d26fec6cbc5_clubs_table_eingefügt.py +++ /dev/null @@ -1,66 +0,0 @@ -"""Clubs Table eingefügt - -Revision ID: 0d26fec6cbc5 -Revises: 7cde4ea3395a -Create Date: 2026-05-28 14:20:05.578971 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '0d26fec6cbc5' -down_revision: Union[str, Sequence[str], None] = '7cde4ea3395a' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - """Upgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('clubs', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(length=255), nullable=False), - sa.Column('description', sa.Text(), nullable=False), - sa.Column('icon', sa.Text(), nullable=True), - sa.Column('misc', sa.Text(), nullable=True), - sa.Column('subsciption', sa.Integer(), nullable=True), - sa.PrimaryKeyConstraint('id') - ) - op.drop_index(op.f('player_achievements_FK_2_0'), table_name='player_achievements') - op.drop_constraint(op.f('player_achievements_ibfk_1'), 'player_achievements', type_='foreignkey') - op.drop_index(op.f('player_id'), table_name='player_game_statistic') - op.drop_index(op.f('discord_id'), table_name='players') - op.drop_index(op.f('sqlite_autoindex_players_1'), table_name='players') - op.drop_index(op.f('sqlite_autoindex_players_1_1'), table_name='players') - op.drop_index(op.f('sqlite_autoindex_players_1_2'), table_name='players') - op.drop_index(op.f('sqlite_autoindex_players_1_3'), table_name='players') - op.drop_index(op.f('sqlite_autoindex_players_1_4'), table_name='players') - op.drop_index(op.f('sqlite_autoindex_players_1_5'), table_name='players') - op.drop_index(op.f('gamesystem_id'), table_name='season_schedule') - op.drop_index(op.f('idx_schedule_date'), table_name='season_schedule') - op.drop_index(op.f('idx_seasons_current'), table_name='seasons') - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_index(op.f('idx_seasons_current'), 'seasons', ['gamesystem_id', 'start_date', 'end_date'], unique=False) - op.create_index(op.f('idx_schedule_date'), 'season_schedule', ['start_month', 'start_day'], unique=False) - op.create_index(op.f('gamesystem_id'), 'season_schedule', ['gamesystem_id', 'start_month', 'start_day'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_5'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_4'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_3'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_2'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_1'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('discord_id'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('player_id'), 'player_game_statistic', ['player_id', 'gamesystem_id', 'season_id'], unique=True) - op.create_foreign_key(op.f('player_achievements_ibfk_1'), 'player_achievements', 'gamesystems', ['earned_in'], ['id']) - op.create_index(op.f('player_achievements_FK_2_0'), 'player_achievements', ['earned_in'], unique=False) - op.drop_table('clubs') - # ### end Alembic commands ### diff --git a/migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py b/migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py deleted file mode 100644 index dc1599a..0000000 --- a/migrations/versions/7cde4ea3395a_korrektur_aller_relationen.py +++ /dev/null @@ -1,45 +0,0 @@ -"""Korrektur aller Relationen - -Revision ID: 7cde4ea3395a -Revises: -Create Date: 2026-05-28 14:07:29.811432 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '7cde4ea3395a' -down_revision: Union[str, Sequence[str], None] = None -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - """Upgrade schema.""" - - op.create_foreign_key(None, 'player_achievements', 'seasons', ['earned_in'], ['id']) - - # ### end Alembic commands ### - - -def downgrade() -> None: - """Downgrade schema.""" - # ### commands auto generated by Alembic - please adjust! ### - op.create_index(op.f('idx_seasons_current'), 'seasons', ['gamesystem_id', 'start_date', 'end_date'], unique=False) - op.create_index(op.f('idx_schedule_date'), 'season_schedule', ['start_month', 'start_day'], unique=False) - op.create_index(op.f('gamesystem_id'), 'season_schedule', ['gamesystem_id', 'start_month', 'start_day'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_5'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_4'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_3'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_2'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1_1'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('sqlite_autoindex_players_1'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('discord_id'), 'players', ['discord_id'], unique=True) - op.create_index(op.f('player_id'), 'player_game_statistic', ['player_id', 'gamesystem_id', 'season_id'], unique=True) - op.drop_constraint(None, 'player_achievements', type_='foreignkey') - op.create_foreign_key(op.f('player_achievements_FK_2_0'), 'player_achievements', 'gamesystems', ['earned_in'], ['id']) - # ### end Alembic commands ### diff --git a/models.py b/models.py deleted file mode 100644 index b73027f..0000000 --- a/models.py +++ /dev/null @@ -1,108 +0,0 @@ -from sqlalchemy import Column, Integer, String, Text, TIMESTAMP, DATE, DOUBLE, ForeignKey -from sqlalchemy.orm import declarative_base - -Base = declarative_base() - -class Club(Base): - __tablename__ = 'clubs' - id = Column(Integer, primary_key=True) - name = Column(String(255), nullable=False) - description = Column(Text, nullable=False) - icon = Column(Text, nullable=True) - misc = Column(Text, nullable=True) - subsciption = Column(Integer) - -class Achievement(Base): - __tablename__ = 'achievements' - id = Column(Integer, primary_key=True) - name = Column(String(255), nullable=False) - description = Column(Text, nullable=False) - icon = Column(Text, nullable=True) - misc = Column(Text, nullable=True) - -class GameSystem(Base): - __tablename__ = 'gamesystems' - id = Column(Integer, primary_key=True) - name = Column(String(255), nullable=False) - picture = Column(Text, nullable=True) - description = Column(Text, nullable=True) - active_players = Column(Integer, nullable=True) - min_score = Column(Integer, nullable=True) - max_score = Column(Integer, nullable=True) - -class Match(Base): - __tablename__ = 'matches' - id = Column(Integer, primary_key=True) - gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=True) - player1_id = Column(Integer, ForeignKey('players.id'), nullable=True) - score_player1 = Column(Integer, nullable=True) - player2_id = Column(Integer, ForeignKey('players.id'), nullable=True) - score_player2 = Column(Integer, nullable=True) - played_at = Column(TIMESTAMP, nullable=True) - player1_base_change = Column(Integer, nullable=True) - player1_khorne = Column(Integer, nullable=True) - player1_slaanesh = Column(Integer, nullable=True) - player1_tzeentch = Column(Integer, nullable=True) - player1_mmr_change = Column(Integer, nullable=True) - player2_base_change = Column(Integer, nullable=True) - player2_khorne = Column(Integer, nullable=True) - player2_slaanesh = Column(Integer, nullable=True) - player2_tzeentch = Column(Integer, nullable=True) - player2_mmr_change = Column(Integer, nullable=True) - player2_check = Column(Integer, nullable=True) - match_is_counted = Column(Integer, nullable=True) - rust_factor = Column(DOUBLE, nullable=True) - point_inflation = Column(DOUBLE, nullable=True) - elo_factor = Column(DOUBLE, nullable=True) - -class Player(Base): - __tablename__ = 'players' - id = Column(Integer, primary_key=True) - discord_id = Column(String(255), nullable=True) - discord_name = Column(String(255), nullable=False) - discord_avatar_url = Column(Text, nullable=True) - display_name = Column(String(255), nullable=True) - -class PlayerAchievement(Base): - __tablename__ = 'player_achievements' - id = Column(Integer, primary_key=True) - player_id = Column(Integer, ForeignKey('players.id'), nullable=True) - achievement_id = Column(Integer, ForeignKey('achievements.id'), nullable=True) - earned_at = Column(TIMESTAMP, nullable=True) - earned_in = Column(Integer, ForeignKey('seasons.id'), nullable=True) - -class PlayerGameStatistic(Base): - __tablename__ = 'player_game_statistic' - id = Column(Integer, primary_key=True) - player_id = Column(Integer, ForeignKey('players.id'), nullable=True) - gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=True) - mmr = Column(Integer, nullable=True) - games_in_system = Column(Integer, nullable=True) - points = Column(Integer, nullable=True) - avv_points = Column(Integer, nullable=True) - last_played = Column(TIMESTAMP, nullable=True) - win_rate = Column(Integer, nullable=True) - win_streak = Column(Integer, nullable=True) - wins = Column(Integer, nullable=True) - loss = Column(Integer, nullable=True) - draws = Column(Integer, nullable=True) - trend = Column(Integer, nullable=True) - tyrann_id = Column(Integer, nullable=True) - pushover_id = Column(Integer, nullable=True) - nemesis_id = Column(Integer, nullable=True) - season_id = Column(Integer, ForeignKey('seasons.id'), nullable=False) - -class Season(Base): - __tablename__ = 'seasons' - id = Column(Integer, primary_key=True) - gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=False) - name = Column(String(100), nullable=False) - start_date = Column(DATE, nullable=False) - end_date = Column(DATE, nullable=True) - -class SeasonSchedule(Base): - __tablename__ = 'season_schedule' - id = Column(Integer, primary_key=True) - gamesystem_id = Column(Integer, ForeignKey('gamesystems.id'), nullable=False) - start_month = Column(Integer, nullable=False) - start_day = Column(Integer, nullable=False) diff --git a/setup_env.sh b/setup_env.sh index 7e0dfc0..06f9211 100644 --- a/setup_env.sh +++ b/setup_env.sh @@ -31,8 +31,7 @@ sudo apt install -y \ python3-venv \ python3-full \ libmariadb3 \ - libmariadb-dev \ - alembic + libmariadb-dev echo "✅ Updates installiert. Überprüfe Softwarestand von Git ..." @@ -62,9 +61,7 @@ pip install \ requests \ python-dotenv \ pymysql \ - schedule \ - sqlalchemy \ - alembic + schedule echo "✅ Pakete installiert. Starte Liga Service ..." -- 2.43.0