WestsideDiceghost/Liga-System
2
1
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 5 Releases Wiki Activity Graph

master #48

Merged
daniel merged 14 commits from master into dev_league_seasons 2026-05-31 12:03:26 +02:00
Conversation 0 Commits 14 Files Changed 10 +60 -396
10 changed files with 60 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
alembic.ini
View File

@ -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_db
[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

51
data/data_api.py
View File

@ -242,21 +242,60 @@ 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)
VALUES (%s, %s)
SELECT id FROM seasons
WHERE gamesystem_id = %s
ORDER BY start_date DESC
LIMIT 1
"""
logger.log(f"{get_player_name(player_id)} joined {gamesystem_id}")
cursor.execute(query, (player_id, gamesystem_id))
connection.commit()
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 {gamesystem_id} gefunden!")
# -----------------------------------------------------
# Matches: Lesen

28
data/database.py
View File

@ -1,4 +1,3 @@
import mariadb
import os
from dotenv import load_dotenv
@ -6,25 +5,24 @@ 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
if is_prod:
print("Verbindung mit Test DB")
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
gui/main_gui.py
View File

@ -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
# ---------------------------

1
migrations/README
View File

@ -1 +0,0 @@
Generic single-database configuration.

78
migrations/env.py
View File

@ -1,78 +0,0 @@
from logging.config import fileConfig
from sqlalchemy import engine_from_config
from sqlalchemy import pool
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.
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 = None
# 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()

16
migrations/generate_migration_code.py
View File

@ -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(")")

28
migrations/script.py.mako
View File

@ -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"}

129
migrations/versions/47a1e41aa62f_initial_setup.py
View File

@ -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

7
setup_env.sh
View File

@ -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 ..."