Squashed commit of the following:
commit 1eeea9f83ad9230a5c1f7a75662770eaab0df837 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 21:15:41 2025 +0200 Disable resuming of old time entries. commit 3e3ec2f01cb7943622b819a19179388078ae1315 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 20:59:19 2025 +0200 Refactor db migrations. commit 15a51a569da36c6b7c9e01ab17b6fdbdee6ad994 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 19:58:04 2025 +0200 Apply new style for Time Tracking view. commit 77e5278b303e060d2b03853b06277f8aa567ae68 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 18:06:04 2025 +0200 Allow direct registrations as a Company. commit 188a8772757cbef374243d3a5f29e4440ddecabe Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 18:04:45 2025 +0200 Add email invitation feature. commit d9ebaa02aa01b518960a20dccdd5a327d82f30c6 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 17:12:32 2025 +0200 Apply common style for Company, User, Team management pages. commit 81149caf4d8fc6317e2ab1b4f022b32fc5aa6d22 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 16:44:32 2025 +0200 Move export functions to own module. commit 1a26e19338e73f8849c671471dd15cc3c1b1fe82 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 15:51:15 2025 +0200 Split up models.py. commit 61f1ccd10f721b0ff4dc1eccf30c7a1ee13f204d Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 12:05:28 2025 +0200 Move utility function into own modules. commit 84b341ed35e2c5387819a8b9f9d41eca900ae79f Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 11:44:24 2025 +0200 Refactor auth functions use. commit 923e311e3da5b26d85845c2832b73b7b17c48adb Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 11:35:52 2025 +0200 Refactor route nameing and fix bugs along the way. commit f0a5c4419c340e62a2615c60b2a9de28204d2995 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 10:34:33 2025 +0200 Fix URL endpoints in announcement template. commit b74d74542a1c8dc350749e4788a9464d067a88b5 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 09:25:53 2025 +0200 Move announcements to own module. commit 9563a28021ac46c82c04fe4649b394dbf96f92c7 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 09:16:30 2025 +0200 Combine Company view and edit templates. commit 6687c373e681d54e4deab6b2582fed5cea9aadf6 Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 08:17:42 2025 +0200 Move Users, Company and System Administration to own modules. commit 8b7894a2e3eb84bb059f546648b6b9536fea724e Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 07:40:57 2025 +0200 Move Teams and Projects to own modules. commit d11bf059d99839ecf1f5d7020b8c8c8a2454c00b Author: Jens Luedicke <jens@luedicke.me> Date: Mon Jul 7 07:09:33 2025 +0200 Move Tasks and Sprints to own modules.
This commit is contained in:
227
migrations/old_migrations/14_fix_removed_fields.py
Executable file
227
migrations/old_migrations/14_fix_removed_fields.py
Executable file
@@ -0,0 +1,227 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Fix references to removed fields throughout the codebase
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
# Fields that were removed from various models
|
||||
REMOVED_FIELDS = {
|
||||
'created_by_id': {
|
||||
'models': ['Task', 'Project', 'Sprint', 'Announcement', 'CompanyWorkConfig'],
|
||||
'replacement': 'None', # or could track via audit log
|
||||
'comment': 'Field removed - consider using audit log for creator tracking'
|
||||
},
|
||||
'region_name': {
|
||||
'models': ['CompanyWorkConfig'],
|
||||
'replacement': 'work_region.value',
|
||||
'comment': 'Use work_region enum value instead'
|
||||
},
|
||||
'additional_break_minutes': {
|
||||
'models': ['CompanyWorkConfig'],
|
||||
'replacement': 'None',
|
||||
'comment': 'Field removed - simplified break configuration'
|
||||
},
|
||||
'additional_break_threshold_hours': {
|
||||
'models': ['CompanyWorkConfig'],
|
||||
'replacement': 'None',
|
||||
'comment': 'Field removed - simplified break configuration'
|
||||
}
|
||||
}
|
||||
|
||||
def update_python_files():
|
||||
"""Update Python files to handle removed fields"""
|
||||
python_files = []
|
||||
|
||||
# Get all Python files
|
||||
for root, dirs, files in os.walk('.'):
|
||||
# Skip virtual environments and cache
|
||||
if 'venv' in root or '__pycache__' in root or '.git' in root:
|
||||
continue
|
||||
for file in files:
|
||||
if file.endswith('.py'):
|
||||
python_files.append(os.path.join(root, file))
|
||||
|
||||
for filepath in python_files:
|
||||
# Skip migration scripts
|
||||
if 'migrations/' in filepath:
|
||||
continue
|
||||
|
||||
with open(filepath, 'r') as f:
|
||||
content = f.read()
|
||||
|
||||
original_content = content
|
||||
modified = False
|
||||
|
||||
for field, info in REMOVED_FIELDS.items():
|
||||
if field not in content:
|
||||
continue
|
||||
|
||||
print(f"Processing {filepath} for {field}...")
|
||||
|
||||
# Handle different patterns
|
||||
if field == 'created_by_id':
|
||||
# Comment out lines that assign created_by_id
|
||||
content = re.sub(
|
||||
rf'^(\s*)([^#\n]*created_by_id\s*=\s*[^,\n]+,?)(.*)$',
|
||||
rf'\1# REMOVED: \2 # {info["comment"]}\3',
|
||||
content,
|
||||
flags=re.MULTILINE
|
||||
)
|
||||
|
||||
# Remove from query filters
|
||||
content = re.sub(
|
||||
rf'\.filter_by\(created_by_id=[^)]+\)',
|
||||
'.filter_by() # REMOVED: created_by_id filter',
|
||||
content
|
||||
)
|
||||
|
||||
# Remove from dictionary accesses
|
||||
content = re.sub(
|
||||
rf"['\"]created_by_id['\"]\s*:\s*[^,}}]+[,}}]",
|
||||
'# "created_by_id" removed from model',
|
||||
content
|
||||
)
|
||||
|
||||
elif field == 'region_name':
|
||||
# Replace with work_region.value
|
||||
content = re.sub(
|
||||
rf'\.region_name\b',
|
||||
'.work_region.value',
|
||||
content
|
||||
)
|
||||
content = re.sub(
|
||||
rf"\['region_name'\]",
|
||||
"['work_region'].value",
|
||||
content
|
||||
)
|
||||
|
||||
elif field in ['additional_break_minutes', 'additional_break_threshold_hours']:
|
||||
# Comment out references
|
||||
content = re.sub(
|
||||
rf'^(\s*)([^#\n]*{field}[^#\n]*)$',
|
||||
rf'\1# REMOVED: \2 # {info["comment"]}',
|
||||
content,
|
||||
flags=re.MULTILINE
|
||||
)
|
||||
|
||||
if content != original_content:
|
||||
modified = True
|
||||
|
||||
if modified:
|
||||
with open(filepath, 'w') as f:
|
||||
f.write(content)
|
||||
print(f" ✓ Updated {filepath}")
|
||||
|
||||
def update_template_files():
|
||||
"""Update template files to handle removed fields"""
|
||||
template_files = []
|
||||
|
||||
if os.path.exists('templates'):
|
||||
template_files = [str(p) for p in Path('templates').glob('*.html')]
|
||||
|
||||
for filepath in template_files:
|
||||
with open(filepath, 'r') as f:
|
||||
content = f.read()
|
||||
|
||||
original_content = content
|
||||
modified = False
|
||||
|
||||
for field, info in REMOVED_FIELDS.items():
|
||||
if field not in content:
|
||||
continue
|
||||
|
||||
print(f"Processing {filepath} for {field}...")
|
||||
|
||||
if field == 'created_by_id':
|
||||
# Remove or comment out created_by references in templates
|
||||
# Match {{...created_by_id...}} patterns
|
||||
pattern = r'\{\{[^}]*\.created_by_id[^}]*\}\}'
|
||||
content = re.sub(
|
||||
pattern,
|
||||
'<!-- REMOVED: created_by_id no longer available -->',
|
||||
content
|
||||
)
|
||||
|
||||
elif field == 'region_name':
|
||||
# Replace with work_region.value
|
||||
# Match {{...region_name...}} and replace region_name with work_region.value
|
||||
pattern = r'(\{\{[^}]*\.)region_name([^}]*\}\})'
|
||||
content = re.sub(
|
||||
pattern,
|
||||
r'\1work_region.value\2',
|
||||
content
|
||||
)
|
||||
|
||||
elif field in ['additional_break_minutes', 'additional_break_threshold_hours']:
|
||||
# Remove entire form groups for these fields
|
||||
pattern = r'<div[^>]*>(?:[^<]|<(?!/div))*' + re.escape(field) + r'.*?</div>\s*'
|
||||
content = re.sub(
|
||||
pattern,
|
||||
f'<!-- REMOVED: {field} no longer in model -->\n',
|
||||
content,
|
||||
flags=re.DOTALL
|
||||
)
|
||||
|
||||
if content != original_content:
|
||||
modified = True
|
||||
|
||||
if modified:
|
||||
with open(filepath, 'w') as f:
|
||||
f.write(content)
|
||||
print(f" ✓ Updated {filepath}")
|
||||
|
||||
def create_audit_log_migration():
|
||||
"""Create a migration to add audit fields if needed"""
|
||||
migration_content = '''#!/usr/bin/env python3
|
||||
"""
|
||||
Add audit log fields to replace removed created_by_id
|
||||
"""
|
||||
|
||||
# This is a template for adding audit logging if needed
|
||||
# to replace the removed created_by_id functionality
|
||||
|
||||
def add_audit_fields():
|
||||
"""
|
||||
Consider adding these fields to models that lost created_by_id:
|
||||
- created_by_username (store username instead of ID)
|
||||
- created_at (if not already present)
|
||||
- updated_by_username
|
||||
- updated_at
|
||||
|
||||
Or implement a separate audit log table
|
||||
"""
|
||||
pass
|
||||
|
||||
if __name__ == "__main__":
|
||||
print("Consider implementing audit logging to track who created/modified records")
|
||||
'''
|
||||
|
||||
with open('migrations/05_add_audit_fields_template.py', 'w') as f:
|
||||
f.write(migration_content)
|
||||
print("\n✓ Created template for audit field migration")
|
||||
|
||||
def main():
|
||||
print("=== Fixing References to Removed Fields ===\n")
|
||||
|
||||
print("1. Updating Python files...")
|
||||
update_python_files()
|
||||
|
||||
print("\n2. Updating template files...")
|
||||
update_template_files()
|
||||
|
||||
print("\n3. Creating audit field migration template...")
|
||||
create_audit_log_migration()
|
||||
|
||||
print("\n✅ Removed fields migration complete!")
|
||||
print("\nFields handled:")
|
||||
for field, info in REMOVED_FIELDS.items():
|
||||
print(f" - {field}: {info['comment']}")
|
||||
|
||||
print("\n⚠️ Important: Review commented-out code and decide on appropriate replacements")
|
||||
print(" Consider implementing audit logging for creator tracking")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user