Merge pull request #1174 from MarechJ/feat/soldier-and-account-tables

Persisting and extending player profile details

Author: timraay

alembic/versions/0ac19ea4739e_add_playerprofile_table.py

@@ -0,0 +1,101 @@
+"""Add PlayerAccount and PlayerSoldier tables
+
+Revision ID: 0ac19ea4739e
+Revises: 78098bd1bbb0
+Create Date: 2025-10-28 15:08:24.036663
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import text
+
+
+# revision identifiers, used by Alembic.
+revision = '0ac19ea4739e'
+down_revision = '78098bd1bbb0'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Create the player_account table
+    op.create_table(
+        'player_account',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('playersteamid_id', sa.Integer(), nullable=False),
+        sa.Column('name', sa.String(), nullable=True),
+        sa.Column('discord_id', sa.String(), nullable=True),
+        sa.Column('is_member', sa.Boolean(), nullable=False, default=sa.false()),
+        sa.Column('country', sa.String(2), nullable=True),
+        sa.Column('lang', sa.String(2), nullable=False, default='en'),
+        sa.Column('updated', sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.now()),
+        sa.ForeignKeyConstraint(['playersteamid_id'], ['steam_id_64.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('playersteamid_id', name='unique_player_account')
+    )
+
+    # Create the player_soldier table
+    op.create_table(
+        'player_soldier',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('playersteamid_id', sa.Integer(), nullable=False),
+        sa.Column('name', sa.String(), nullable=True),
+        sa.Column('level', sa.Integer(), nullable=False, default=0),
+        sa.Column('platform', sa.String(), nullable=True),
+        sa.Column('clan_tag', sa.String(), nullable=True),
+        sa.Column('updated', sa.TIMESTAMP(timezone=True), nullable=False, default=sa.func.now()),
+        sa.ForeignKeyConstraint(['playersteamid_id'], ['steam_id_64.id'], ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('playersteamid_id', name='unique_player_soldier')
+    )
+    
+    # Populate the player_account & player_soldier tables with data from existing tables
+    connection = op.get_bind()
+    
+    connection.execute(text("""
+        INSERT INTO player_account (playersteamid_id, country, is_member, lang, updated)
+        SELECT 
+            p.id as playersteamid_id,
+            CASE 
+                WHEN si.country = 'private' THEN NULL
+                ELSE si.country
+            END as country,
+            false as is_member,
+            'en' as lang, 
+            NOW() as updated
+        FROM steam_id_64 p
+        LEFT JOIN steam_info si ON si.playersteamid_id = p.id
+    """))
+
+    connection.execute(text("""
+        INSERT INTO player_soldier (playersteamid_id, name, level, platform, updated)
+        SELECT 
+            p.id as playersteamid_id,
+            pn.name as name,
+            COALESCE(ps_max.level, 0) as level,
+            CASE 
+                WHEN LENGTH(p.steam_id_64) = 17 AND p.steam_id_64 ~ '^[0-9]+$' THEN 'steam'
+                ELSE NULL
+            END as platform,
+            NOW() as updated
+        FROM steam_id_64 p
+        LEFT JOIN LATERAL (
+            SELECT name 
+            FROM player_names pn 
+            WHERE pn.playersteamid_id = p.id 
+            ORDER BY pn.last_seen DESC 
+            LIMIT 1
+        ) pn ON true
+        LEFT JOIN LATERAL (
+            SELECT MAX(level) as level
+            FROM player_stats ps 
+            WHERE ps.playersteamid_id = p.id 
+            AND ps.level > 0
+        ) ps_max ON true
+    """))
+
+
+def downgrade():
+    # Drop the player_profile table
+    op.drop_table('player_account')
+    op.drop_table('player_soldier')

alembic/versions/78098bd1bbb0_add_level_column_to_playerstats.py

@@ -0,0 +1,24 @@
+"""Add level column to PlayerStats
+
+Revision ID: 78098bd1bbb0
+Revises: f80b6dc2833a
+Create Date: 2025-08-12 12:37:30.321976
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '78098bd1bbb0'
+down_revision = 'f80b6dc2833a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('player_stats', sa.Column('level', sa.Integer, nullable=False, server_default='0'))
+
+
+def downgrade():
+    op.drop_column('player_stats', 'level')

alembic/versions/89a3502370a0_add_eos_id_column.py

@@ -0,0 +1,28 @@
+"""Add EOS ID column
+
+Revision ID: 89a3502370a0
+Revises: 0ac19ea4739e
+Create Date: 2025-11-20 12:57:44.985471
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '89a3502370a0'
+down_revision = '0ac19ea4739e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('player_soldier', sa.Column('eos_id', sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('player_soldier', 'eos_id')
+    # ### end Alembic commands ###

assets/images/icons/brands/helo-system.png

@@ -2004,27 +2004,109 @@ def disband_squad_by_name(self, team_name: str, squad_name: str, reason: str):
         team_name, squad_name = team_name.lower(), squad_name.lower()
 
         if team_name != "allies" and team_name != "axis":
-            raise HLLCommandFailedError("Invalid team_name argument. It must be either 'axis' or 'allies'.")
+            raise HLLCommandFailedError(
+                "Invalid team_name argument. It must be either 'axis' or 'allies'."
+            )
         if squad_name == "" or squad_name == "unassigned":
-            raise HLLCommandFailedError("Invalid squad_name argument. It cannot be an empty value or 'unassigned'.")
+            raise HLLCommandFailedError(
+                "Invalid squad_name argument. It cannot be an empty value or 'unassigned'."
+            )
 
         online_players = self.get_detailed_players()["players"]
 
         squad_players = list(
-                online_players[id]
-                for id in online_players
-                if online_players[id]["team"] == team_name
-                and online_players[id]["unit_name"] == squad_name
-            )
+            online_players[id]
+            for id in online_players
+            if online_players[id]["team"] == team_name
+            and online_players[id]["unit_name"] == squad_name
+        )
 
         if not squad_players:
-            raise HLLCommandFailedError(f"Squad {squad_name} was not found in team {team_name}. It might have been disbanded already.")
-        
+            raise HLLCommandFailedError(
+                f"Squad {squad_name} was not found in team {team_name}. It might have been disbanded already."
+            )
+
         for player in squad_players:
             super().remove_player_from_squad(player["player_id"], reason)
 
         return {
             "team_name": team_name,
             "squad_name": squad_name,
-            "msg": f"Successfully disbaned {squad_name} squad in team {team_name}"
+            "msg": f"Successfully disbanded {squad_name} squad in team {team_name}",
         }
+
+    def edit_player_soldier(
+        self,
+        player_id: str,
+        name: str | None = None,
+        level: int = 0,
+        platform: str | None = None,
+        clan_tag: str | None = None,
+        eos_id: str | None = None,
+    ):
+        """
+        Update NULL fields only in PlayerSoldier for the given player_id.
+        Does not overwrite any existing non-null values.
+        Returns the updated soldier as dict or None if not found.
+        """
+        from rcon.models import enter_session, PlayerSoldier
+
+        with enter_session() as sess:
+            soldier_db, changed = PlayerSoldier.update_missing_fields(
+                sess,
+                player_id,
+                name=name,
+                level=level,
+                platform=platform,
+                clan_tag=clan_tag,
+                eos_id=eos_id,
+            )
+            if not soldier_db:
+                return HLLCommandFailedError(
+                    f"Player {player_id} was not found. The soldier could not be updated."
+                )
+            if not changed:
+                return {
+                    "soldier": soldier_db.to_dict(),
+                    "msg": "Success!\nSome fields have not been saved as only null values are allowed to be modified.",
+                }
+            return {
+                "soldier": soldier_db.to_dict(),
+                "msg": "Successfully updated soldier details.",
+            }
+
+    def edit_player_account(
+        self,
+        player_id: str,
+        name: str | None = None,
+        discord_id: str | None = None,
+        is_member: bool = False,
+        country: str | None = None,
+        lang: str = "en",
+    ):
+        """
+        Update PlayerAccount fields for the given player_id.
+        All fields can be updated, including setting them to null.
+        Returns dict with account data and success message.
+        """
+        from rcon.models import enter_session, PlayerAccount
+
+        with enter_session() as sess:
+            account_db = PlayerAccount.update_account(
+                sess,
+                player_id,
+                name=name,
+                discord_id=discord_id,
+                is_member=is_member,
+                country=country,
+                lang=lang,
+            )
+            if not account_db:
+                return HLLCommandFailedError(
+                    f"Player {player_id} was not found. The account could not be updated."
+                )
+            
+            return {
+                "account": account_db.to_dict(),
+                "msg": "Successfully updated account details.",
+            }

assets/images/icons/brands/hllor.webp

@@ -8,7 +8,7 @@
 
 from rcon.connection import HLLCommandError, HLLConnection, Handle, Response
 from rcon.maps import LAYERS, MAPS, UNKNOWN_MAP_NAME, Environment, GameMode, LayerType
-from rcon.types import MapRotationResponse, MapSequenceResponse, ServerInfoType, SlotsType, VipId, GameStateType, AdminType
+from rcon.types import MapRotationResponse, MapSequenceResponse, PlayerInfoType, ServerInfoType, SlotsType, VipId, GameStateType, AdminType
 from rcon.utils import exception_in_chain
 
 logger = logging.getLogger(__name__)
@@ -310,15 +310,12 @@ def get_maps(self) -> list[str]:
         return parameters[0]["valueMember"].split(",")
 
     def get_player_ids(self) -> dict[str, str]:
-        # TODO: Updated function signatures
         return {x["name"]: x["iD"] for x in self.exchange("GetServerInformation", 2, {"Name": "players", "Value": ""}).content_dict["players"]}
 
-    def get_all_player_info(self) -> list[dict[str, Any]]:
-        # TODO: Updated function signatures
+    def get_all_player_info(self) -> list[PlayerInfoType]:
         return self.exchange("GetServerInformation", 2, {"Name": "players", "Value": ""}).content_dict["players"]
 
-    def get_player_info(self, player_id: str) -> dict[str, Any] | None:
-        # TODO: Updated function signatures
+    def get_player_info(self, player_id: str) -> PlayerInfoType | None:
         return self.exchange("GetServerInformation", 2, {"Name": "player", "Value": player_id}).content_dict
 
     def get_admin_ids(self) -> list[AdminType]:

assets/images/icons/brands/hllrecords.png

@@ -29,7 +29,7 @@
 )
 from rcon.maps import UNKNOWN_MAP_NAME, parse_layer
 from rcon.message_variables import format_message_string, populate_message_variables
-from rcon.models import PlayerID, enter_session, GameLayout
+from rcon.models import PlayerID, PlayerSoldier, enter_session, GameLayout
 from rcon.player_history import (
     _get_set_player,
     get_player,
@@ -519,6 +519,12 @@ def handle_on_connect(
         timestamp=int(struct_log["timestamp_ms"]) / 1000,
     )
 
+    try:
+        if (player := rcon.get_detailed_player_info(player_id)):
+            PlayerSoldier.update(player)
+    except Exception:
+        logger.exception("Unable to update soldier info for %s", player_id)
+
     blacklisted = ban_if_blacklisted(rcon, player_id, struct_log["player_name_1"])
     if blacklisted:
         # We don't need the player potentially blacklisted a second

rcon/api_commands.py

@@ -287,13 +287,16 @@ def record_player_stats(self, players: dict[str, GetDetailedPlayer]):
                     p_defense=0,
                     support=player["support"],
                     p_support=0,
+                    level=player["level"],
                 ),
             )
             for stat in ["combat", "offense", "defense", "support"]:
                 if player[stat] < p[stat]:
                     p["p_" + stat] = p["p_" + stat] + p[stat]
 
                 p[stat] = player[stat]
+                
+            p["level"] = player["level"]
             map_players[player_id] = p
         maps.update(0, m)