hockey-blast-common-lib 0.1.45__tar.gz → 0.1.46__tar.gz

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.46}/PKG-INFO

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

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.46}/hockey_blast_common_lib/aggregate_human_stats.py

@@ -440,17 +440,17 @@ def run_aggregate_human_stats():
         aggregate_human_stats(session, aggregation_type='org', aggregation_id=org_id, names_to_filter_out=not_human_names, human_id_filter=human_id_to_debug, aggregation_window='Daily')
         
         # Aggregate by level
-    # level_ids = session.query(Division.level_id).distinct().all()
-    # level_ids = [level_id[0] for level_id in level_ids]
-    # total_levels = len(level_ids)
-    # processed_levels = 0
-    # for level_id in level_ids:
-    #     if level_id is None:
-    #         continue
-    #     if human_id_to_debug is None:
-    #         print(f"\rProcessed {processed_levels}/{total_levels} levels ({(processed_levels/total_levels)*100:.2f}%)", end="")
-    #     processed_levels += 1
-    #     aggregate_human_stats(session, aggregation_type='level', aggregation_id=level_id, names_to_filter_out=not_human_names, human_id_filter=human_id_to_debug)
+    level_ids = session.query(Division.level_id).distinct().all()
+    level_ids = [level_id[0] for level_id in level_ids]
+    total_levels = len(level_ids)
+    processed_levels = 0
+    for level_id in level_ids:
+        if level_id is None:
+            continue
+        if human_id_to_debug is None:
+            print(f"\rProcessed {processed_levels}/{total_levels} levels ({(processed_levels/total_levels)*100:.2f}%)", end="")
+        processed_levels += 1
+        aggregate_human_stats(session, aggregation_type='level', aggregation_id=level_id, names_to_filter_out=not_human_names, human_id_filter=human_id_to_debug)
 
 if __name__ == "__main__":
     run_aggregate_human_stats()

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.46}/hockey_blast_common_lib/restore_sample_db.sh

@@ -9,15 +9,22 @@ DB_PORT=${DB_PORT:-"5432"}
 COMPRESSED_DUMP_FILE="hockey_blast_sample_backup.sql.gz"
 
 # Superuser credentials
-SUPERUSER="boss"
-SUPERUSER_PASSWORD=${DB_PASSWORD_BOSS:-"your_superuser_password"}
+SUPERUSER="your_superuser"
+SUPERUSER_PASSWORD="your_superuser_password"
 
 # Export PGPASSWORD to avoid password prompt
 export PGPASSWORD=$SUPERUSER_PASSWORD
 
-# Drop the existing database if it exists
-psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$DB_NAME' AND pid <> pg_backend_pid();"
-psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="DROP DATABASE IF EXISTS $DB_NAME"
+# Generate a unique timestamp
+TIMESTAMP=$(date +%Y%m%d%H%M%S)
+BACKUP_DB_NAME="${DB_NAME}_backup_${TIMESTAMP}"
+
+# Check if the database exists and rename it if it does
+DB_EXISTS=$(psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --tuples-only --command="SELECT 1 FROM pg_database WHERE datname = '$DB_NAME'")
+if [ "$DB_EXISTS" = "1" ]; then
+  psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$DB_NAME' AND pid <> pg_backend_pid();"
+  psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="ALTER DATABASE $DB_NAME RENAME TO $BACKUP_DB_NAME"
+fi
 
 # Create a new database
 psql --username=$SUPERUSER --host=$DB_HOST --port=$DB_PORT -d postgres --command="CREATE DATABASE $DB_NAME OWNER $SUPERUSER"

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.46}/hockey_blast_common_lib.egg-info/PKG-INFO

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

{hockey_blast_common_lib-0.1.45 → hockey_blast_common_lib-0.1.46}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='hockey-blast-common-lib',  # The name of your package
-    version='0.1.45',
+    version='0.1.46',
     description='Common library for shared functionality and DB models',
     author='Pavel Kletskov',
     author_email='kletskov@gmail.com',