Start typing to see the preview...
'}) - + # Parse frontmatter and extract body from frontmatter_utils import parse_frontmatter metadata, body = parse_frontmatter(content) - + # Render markdown to HTML try: import markdown @@ -2947,13 +2947,13 @@ def render_markdown(): except ImportError: # Fallback if markdown not installed html = f'{body}'
-
+
return jsonify({'html': html})
-
+
except Exception as e:
logger.error(f"Error rendering markdown: {str(e)}")
return jsonify({'html': 'Error rendering markdown
'}) if __name__ == '__main__': port = int(os.environ.get('PORT', 5000)) - app.run(debug=True, host='0.0.0.0', port=port) \ No newline at end of file + app.run(debug=True, host='0.0.0.0', port=port) diff --git a/startup_postgres.sh b/startup_postgres.sh index 8361e09..8710681 100755 --- a/startup_postgres.sh +++ b/startup_postgres.sh @@ -73,6 +73,16 @@ if [ -f "migrations_old/run_postgres_migrations.py" ]; then echo "Found old migration system. Consider removing after confirming Flask-Migrate is working." fi +# Start cron service for scheduled tasks +echo "" +echo "=== Starting Cron Service ===" +service cron start +if [ $? -eq 0 ]; then + echo "✅ Cron service started for scheduled cleanup tasks" +else + echo "⚠️ Failed to start cron service, cleanup tasks won't run automatically" +fi + # Start the Flask application with gunicorn echo "" echo "=== Starting Application ===" diff --git a/utils/repository.py b/utils/repository.py index fa95378..3eac7e3 100644 --- a/utils/repository.py +++ b/utils/repository.py @@ -8,72 +8,72 @@ from models import db class BaseRepository: """Base repository with common database operations""" - + def __init__(self, model): self.model = model - + def get_by_id(self, id): """Get entity by ID""" return self.model.query.get(id) - + def get_by_company(self, company_id=None): """Get all entities for a company""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + if company_id is None: return [] - + return self.model.query.filter_by(company_id=company_id).all() - + def get_by_company_ordered(self, company_id=None, order_by=None): """Get all entities for a company with ordering""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + if company_id is None: return [] - + query = self.model.query.filter_by(company_id=company_id) - + if order_by is not None: query = query.order_by(order_by) - + return query.all() - + def exists_by_name_in_company(self, name, company_id=None, exclude_id=None): """Check if entity with name exists in company""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + query = self.model.query.filter_by(name=name, company_id=company_id) - + if exclude_id is not None: query = query.filter(self.model.id != exclude_id) - + return query.first() is not None - + def create(self, **kwargs): """Create new entity""" entity = self.model(**kwargs) db.session.add(entity) return entity - + def update(self, entity, **kwargs): """Update entity with given attributes""" for key, value in kwargs.items(): if hasattr(entity, key): setattr(entity, key, value) return entity - + def delete(self, entity): """Delete entity""" db.session.delete(entity) - + def save(self): """Commit changes to database""" db.session.commit() - + def rollback(self): """Rollback database changes""" db.session.rollback() @@ -81,42 +81,42 @@ class BaseRepository: class CompanyScopedRepository(BaseRepository): """Repository for entities scoped to a company""" - + def get_by_id_and_company(self, id, company_id=None): """Get entity by ID, ensuring it belongs to the company""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + if company_id is None: return None - + return self.model.query.filter_by(id=id, company_id=company_id).first() - + def get_active_by_company(self, company_id=None): """Get active entities for a company""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + if company_id is None: return [] - + # Assumes model has is_active field if hasattr(self.model, 'is_active'): return self.model.query.filter_by( - company_id=company_id, + company_id=company_id, is_active=True ).all() - + return self.get_by_company(company_id) - + def count_by_company(self, company_id=None): """Count entities for a company""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + if company_id is None: return 0 - + return self.model.query.filter_by(company_id=company_id).count() @@ -124,18 +124,18 @@ class CompanyScopedRepository(BaseRepository): class UserRepository(CompanyScopedRepository): """Repository for User operations""" - + def __init__(self): from models import User super().__init__(User) - + def get_by_username_and_company(self, username, company_id): """Get user by username within a company""" return self.model.query.filter_by( - username=username, + username=username, company_id=company_id ).first() - + def get_by_email(self, email): """Get user by email (globally unique)""" return self.model.query.filter_by(email=email).first() @@ -143,19 +143,19 @@ class UserRepository(CompanyScopedRepository): class TeamRepository(CompanyScopedRepository): """Repository for Team operations""" - + def __init__(self): from models import Team super().__init__(Team) - + def get_with_member_count(self, company_id=None): """Get teams with member count""" if company_id is None and hasattr(g, 'user') and g.user: company_id = g.user.company_id - + if company_id is None: return [] - + # This would need a more complex query with joins teams = self.get_by_company(company_id) for team in teams: @@ -165,27 +165,27 @@ class TeamRepository(CompanyScopedRepository): class ProjectRepository(CompanyScopedRepository): """Repository for Project operations""" - + def __init__(self): from models import Project super().__init__(Project) - + def get_by_code_and_company(self, code, company_id): """Get project by code within a company""" return self.model.query.filter_by( - code=code, + code=code, company_id=company_id ).first() - + def get_accessible_by_user(self, user): """Get projects accessible by a user""" if not user: return [] - + # Admin/Supervisor can see all company projects if user.role.value in ['Administrator', 'Supervisor', 'System Administrator']: return self.get_by_company(user.company_id) - + # Team members see team projects + unassigned projects from models import Project return Project.query.filter( @@ -194,4 +194,4 @@ class ProjectRepository(CompanyScopedRepository): Project.team_id == user.team_id, Project.team_id.is_(None) ) - ).all() \ No newline at end of file + ).all()