hockey-blast-common-lib 0.1.26__py3-none-any.whl → 0.1.28__py3-none-any.whl

hockey_blast_common_lib/models.py

@@ -15,10 +15,12 @@ class Comment(db.Model):
 class Division(db.Model):
     __tablename__ = 'divisions'
     id = db.Column(db.Integer, primary_key=True)
-    league_number = db.Column(db.Integer)
-    season_number = db.Column(db.Integer)
-    level = db.Column(db.String(100))  # UNIQUE LEVEL NAME
-    skill_id = db.Column(db.Integer, db.ForeignKey('skills.id'))  # SKILL LEVEL
+    league_number = db.Column(db.Integer) # TODO: Deprecate usage and remove (get this info through Season->League)
+    season_number = db.Column(db.Integer) # TODO: Deprecate usage and remove (get this info from Season by season_id)
+    season_id = db.Column(db.Integer, db.ForeignKey('seasons.id'))
+    level = db.Column(db.String(100))
+    skill_value = db.Column(db.Float)
+    skill_propagation_sequence = db.Column(db.Integer, nullable=True, default=-1)
     org_id = db.Column(db.Integer, db.ForeignKey('organizations.id'), nullable=False)
     __table_args__ = (
         db.UniqueConstraint('org_id', 'league_number', 'season_number', 'level', name='_org_league_season_level_uc'),
@@ -159,6 +161,7 @@ class Skill(db.Model):
     skill_value = db.Column(db.Float)  # A number from 0 (NHL) to 100 (pedestrian)
     level_name = db.Column(db.String(100), unique=True)
     level_alternative_name = db.Column(db.String(100))
+    is_seed = db.Column(db.Boolean, nullable=True, default=False)  # New field
     __table_args__ = (
         db.UniqueConstraint('org_id', 'level_name', name='_org_level_name_uc'),
     )
@@ -294,7 +297,8 @@ class Season(db.Model):
     season_name = db.Column(db.String(100))
     start_date = db.Column(db.Date)
     end_date = db.Column(db.Date)
-    league_number = db.Column(db.Integer)
+    league_number = db.Column(db.Integer)  # TODO: Deprecate usage and remove (get this info from League by league_id)
+    league_id = db.Column(db.Integer, db.ForeignKey('leagues.id'))
     org_id = db.Column(db.Integer, db.ForeignKey('organizations.id'), nullable=False)
     __table_args__ = (
         db.UniqueConstraint('org_id', 'league_number', 'season_number', name='_org_league_season_uc'),

hockey_blast_common_lib/skills_in_divisions.py

@@ -0,0 +1,183 @@
+import sys
+import os
+from collections import defaultdict
+
+# Add the project root directory to the Python path
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from hockey_blast_common_lib.models import Game, Division, Skill, Season, League
+from hockey_blast_common_lib.db_connection import create_session
+
+def analyze_levels(org):
+    session = create_session(org)
+
+    # Query to get games and their divisions for season_number 33 and 35 with league_number 1
+    games_season_33 = session.query(Game.home_team_id, Game.visitor_team_id, Division.level).join(Division, Game.division_id == Division.id).filter(Division.season_number == 33, Division.league_number == 1).all()
+    games_season_35 = session.query(Game.home_team_id, Game.visitor_team_id, Division.level).join(Division, Game.division_id == Division.id).filter(Division.season_number == 35, Division.league_number == 1).all()
+
+    # Dictionary to store levels for each team by season
+    team_levels_season_33 = defaultdict(set)
+    team_levels_season_35 = defaultdict(set)
+
+    # Populate the dictionaries
+    for home_team_id, visitor_team_id, level in games_season_33:
+        team_levels_season_33[home_team_id].add(level)
+        team_levels_season_33[visitor_team_id].add(level)
+
+    for home_team_id, visitor_team_id, level in games_season_35:
+        team_levels_season_35[home_team_id].add(level)
+        team_levels_season_35[visitor_team_id].add(level)
+
+    # Dictionary to store level name connections
+    level_connections = defaultdict(lambda: defaultdict(int))
+
+    # Analyze the level name connections
+    for team_id in team_levels_season_33:
+        if team_id in team_levels_season_35:
+            for old_level in team_levels_season_33[team_id]:
+                for new_level in team_levels_season_35[team_id]:
+                    level_connections[new_level][old_level] += 1
+
+    # Output the results
+    for new_level in sorted(level_connections.keys()):
+        connections = level_connections[new_level]
+        connections_list = sorted(connections.items(), key=lambda x: x[0])
+        connections_str = ", ".join([f"{old_level}: {count}" for old_level, count in connections_list])
+        print(f"{new_level}: {connections_str}")
+
+    session.close()
+
+def reset_skill_values_in_divisions():
+    session = create_session("boss")
+
+    # Fetch all records from the Division table
+    divisions = session.query(Division).all()
+
+    for division in divisions:
+        # Look up the Skill table using the level from Division
+        div_level = division.level
+
+        # Query to find the matching Skill
+        skill = session.query(Skill).filter(Skill.org_id == division.org_id, Skill.level_name == div_level).one_or_none()
+
+        if not skill:
+            # If no match found, check each alternative name individually
+            skills = session.query(Skill).filter(Skill.org_id == division.org_id).all()
+            for s in skills:
+                alternative_names = s.level_alternative_name.split(',')
+                if div_level in alternative_names:
+                    skill = s
+                    break
+
+        if skill:
+            # Assign the skill_value and set skill_propagation_sequence to 0
+            division.skill_value = skill.skill_value
+            division.skill_propagation_sequence = 0
+            print(f"Assigned Skill {skill.skill_value} for Division with name {division.level}")
+        else:
+            # Assign -1 to skill_value and skill_propagation_sequence
+            division.skill_value = -1
+            division.skill_propagation_sequence = -1
+            print(f"No matching Skill found for Division with name {division.level}, assigned default values")
+
+        # Commit the changes to the Division
+        session.commit()
+
+    print("Skill values and propagation sequences have been populated into the Division table.")
+
+def fill_seed_skills():
+    session = create_session("boss")
+
+    # List of Skill objects based on the provided comments
+    skills = [
+        Skill(is_seed=True, org_id=1, skill_value=10.0, level_name='Adult Division 1', level_alternative_name='Senior A'),
+        Skill(is_seed=True, org_id=1, skill_value=20.0, level_name='Adult Division 2', level_alternative_name='Senior B'),
+        Skill(is_seed=True, org_id=1, skill_value=30.0, level_name='Adult Division 3A', level_alternative_name='Senior BB'),
+        Skill(is_seed=True, org_id=1, skill_value=35.0, level_name='Adult Division 3B', level_alternative_name='Senior C'),
+        Skill(is_seed=True, org_id=1, skill_value=40.0, level_name='Adult Division 4A', level_alternative_name='Senior CC'),
+        Skill(is_seed=True, org_id=1, skill_value=45.0, level_name='Adult Division 4B', level_alternative_name='Senior CCC,Senior CCCC'),
+        Skill(is_seed=True, org_id=1, skill_value=50.0, level_name='Adult Division 5A', level_alternative_name='Senior D,Senior DD'),
+        Skill(is_seed=True, org_id=1, skill_value=55.0, level_name='Adult Division 5B', level_alternative_name='Senior DDD'),
+        Skill(is_seed=True, org_id=1, skill_value=60.0, level_name='Adult Division 6A', level_alternative_name='Senior DDDD'),
+        Skill(is_seed=True, org_id=1, skill_value=65.0, level_name='Adult Division 6B', level_alternative_name='Senior DDDDD'),
+        Skill(is_seed=True, org_id=1, skill_value=70.0, level_name='Adult Division 7A', level_alternative_name='Senior E'),
+        Skill(is_seed=True, org_id=1, skill_value=75.0, level_name='Adult Division 7B', level_alternative_name='Senior EE'),
+        Skill(is_seed=True, org_id=1, skill_value=80.0, level_name='Adult Division 8', level_alternative_name='Senior EEE'),
+        Skill(is_seed=True, org_id=1, skill_value=80.0, level_name='Adult Division 8A', level_alternative_name='Senior EEE'),
+        Skill(is_seed=True, org_id=1, skill_value=85.0, level_name='Adult Division 8B', level_alternative_name='Senior EEEE'),
+        Skill(is_seed=True, org_id=1, skill_value=90.0, level_name='Adult Division 9', level_alternative_name='Senior EEEEE')
+    ]
+
+    for skill in skills:
+        session.add(skill)
+        session.commit()
+
+    print("Seed skills have been populated into the database.")
+
+def get_fake_skill(session):
+    # Create a special fake Skill with org_id == -1 and skill_value == -1
+    fake_skill = session.query(Skill).filter_by(org_id=1, level_name='Fake Skill').first()
+    if not fake_skill:
+        fake_skill = Skill(
+            org_id=1,
+            skill_value=-1,
+            level_name='Fake Skill',
+            level_alternative_name='',
+            is_seed=False
+        )
+        session.add(fake_skill)
+        session.commit()
+        print("Created special fake Skill record.")
+    return fake_skill
+
+def assign_fake_skill_to_divisions(session, fake_skill):
+    # Assign the special fake Skill to every existing Division
+    divisions = session.query(Division).all()
+    for division in divisions:
+        division.skill_id = fake_skill.id
+    session.commit()
+    print("Assigned special fake Skill to all Division records.")
+
+def delete_all_skills():
+    session = create_session("boss")
+    fake_skill = get_fake_skill(session)
+    assign_fake_skill_to_divisions(session, fake_skill)
+    # Delete all Skill records except the fake skill
+    session.query(Skill).filter(Skill.id != fake_skill.id).delete(synchronize_session=False)
+    session.commit()
+    print("All Skill records except the fake skill have been deleted.")
+
+def populate_season_ids():
+    session = create_session("boss")
+    divisions = session.query(Division).all()
+    for division in divisions:
+        # Find the Season record that matches the season_number
+        season = session.query(Season).filter_by(season_number=division.season_number, org_id=division.org_id, league_number=division.league_number).first()
+        if season:
+            division.season_id = season.id
+            print(f"Assigned season_id {season.id} for Division with season_number {division.season_number}")
+        else:
+            print(f"Season not found for Division with season_number {division.season_number}")
+    session.commit()
+    print("Season IDs have been populated into the Division table.")
+
+def populate_league_ids():
+    session = create_session("boss")
+    seasons = session.query(Season).all()
+    for season in seasons:
+        # Find the League record that matches the league_number and org_id
+        league = session.query(League).filter_by(league_number=season.league_number, org_id=season.org_id).first()
+        if league:
+            season.league_id = league.id
+            print(f"Assigned league_id {league.id} for Season with league_number {season.league_number}")
+        else:
+            print(f"League not found for Season with league_number {season.league_number}")
+    session.commit()
+    print("League IDs have been populated into the Season table.")
+
+if __name__ == "__main__":
+    # delete_all_skills()
+    # fill_seed_skills()
+    reset_skill_values_in_divisions()
+    #populate_season_ids()  # Call the function to populate season_ids
+    #populate_league_ids()  # Call the new function to populate league_ids

hockey_blast_common_lib/wsgi.py

@@ -11,7 +11,7 @@ from hockey_blast_common_lib.stats_models import db
 from hockey_blast_common_lib.db_connection import get_db_params
 
 app = Flask(__name__)
-db_params = get_db_params("bosshockey-blast-radonly")
+db_params = get_db_params("boss")
 db_url = f"postgresql://{db_params['user']}:{db_params['password']}@{db_params['host']}:{db_params['port']}/{db_params['dbname']}"
 app.config['SQLALCHEMY_DATABASE_URI'] = db_url
 

{hockey_blast_common_lib-0.1.26.dist-info → hockey_blast_common_lib-0.1.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hockey-blast-common-lib
-Version: 0.1.26
+Version: 0.1.28
 Summary: Common library for shared functionality and DB models
 Author: Pavel Kletskov
 Author-email: kletskov@gmail.com

{hockey_blast_common_lib-0.1.26.dist-info → hockey_blast_common_lib-0.1.28.dist-info}/RECORD

@@ -5,14 +5,15 @@ hockey_blast_common_lib/aggregate_referee_stats.py,sha256=A0PTyEbPUjqfXxlJCDOVio
 hockey_blast_common_lib/aggregate_skater_stats.py,sha256=37fhgej9trukr8cGaK7DT1HoxBcp95qwsypYCCziqqc,15563
 hockey_blast_common_lib/db_connection.py,sha256=HvPxDvOj7j5H85RfslGvHVNevfg7mKCd0syJ6NX21mU,1890
 hockey_blast_common_lib/dump_sample_db.sh,sha256=MHPA-Ciod7wsvAlMbRtXFiyajgnEqU1xR59sJQ9UWR0,738
-hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=UBbPuU8WzHmxIQScT1uXIbTpjWkkt3gu-FS2LNjBx2A,1033691
-hockey_blast_common_lib/models.py,sha256=GqQIGpanmFub97BoYCuaqDov2MxM4LMesUTxZ2edpvw,15393
+hockey_blast_common_lib/hockey_blast_sample_backup.sql.gz,sha256=DcRvR7oyP2gbVU7fYUP8-Z9R79kl0jWt4zgFyNECstk,1033685
+hockey_blast_common_lib/models.py,sha256=H8d58xZqD6bUiWrdhu8xeeDXYUuWyyKNyzWLVm5IerE,15852
 hockey_blast_common_lib/options.py,sha256=-LtEX8duw5Pl3CSpjFlLM5FPvrZuTAxTfSlDPa7H6mQ,761
 hockey_blast_common_lib/restore_sample_db.sh,sha256=u2zKazC6vNMULkpYzI64nlneCWaGUtDHPBAU-gWgRbw,1861
+hockey_blast_common_lib/skills_in_divisions.py,sha256=lOVww6ff7LBANmcgFlv1Eh-fvPPq0E9noG8tSfUuIZc,9140
 hockey_blast_common_lib/stats_models.py,sha256=PI-mL1jmjCHLAvaATxSsjHEn05g9L_reA_YpsITPWjQ,21047
 hockey_blast_common_lib/utils.py,sha256=odDJWCK0BgbResXeoUzxbVChjaxcXr168ZxbrAw3L_8,3752
-hockey_blast_common_lib/wsgi.py,sha256=wl1gf3KtaGSnYbCF5Z2xWwRXNSTQp43HoyhCAKJibI4,750
-hockey_blast_common_lib-0.1.26.dist-info/METADATA,sha256=pk2DS7PIU7DyABn3LxU5enJmHSghN_4OyGn8RN-l8e8,318
-hockey_blast_common_lib-0.1.26.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hockey_blast_common_lib-0.1.26.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
-hockey_blast_common_lib-0.1.26.dist-info/RECORD,,
+hockey_blast_common_lib/wsgi.py,sha256=7LGUzioigviJp-EUhSEaQcd4jBae0mxbkyBscQfZhlc,730
+hockey_blast_common_lib-0.1.28.dist-info/METADATA,sha256=09IAnWyeWgm3Uy9FQSRU99XOSbbFXC9nV22Z3eHeAX8,318
+hockey_blast_common_lib-0.1.28.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+hockey_blast_common_lib-0.1.28.dist-info/top_level.txt,sha256=wIR4LIkE40npoA2QlOdfCYlgFeGbsHR8Z6r0h46Vtgc,24
+hockey_blast_common_lib-0.1.28.dist-info/RECORD,,