متن
', +); +``` + +### 2. ارسال ایمیل خوش‌آمدگویی + +```dart +await emailService.sendWelcomeEmail( + 'user@example.com', + 'نام کاربر', +); +``` + +### 3. ارسال ایمیل بازیابی رمز عبور + +```dart +await emailService.sendPasswordResetEmail( + 'user@example.com', + 'https://example.com/reset?token=abc123', +); +``` + +### 4. ارسال ایمیل اطلاع‌رسانی + +```dart +await emailService.sendNotificationEmail( + 'user@example.com', + 'عنوان اطلاع‌رسانی', + 'پیام اطلاع‌رسانی', +); +``` + +## مدیریت تنظیمات + +### 1. دسترسی به صفحه تنظیمات + +1. وارد بخش "تنظیمات سیستم" شوید +2. روی "تنظیمات ایمیل" کلیک کنید + +### 2. افزودن پیکربندی جدید + +1. فرم را پر کنید: + - **نام پیکربندی**: نام منحصر به فرد + - **میزبان SMTP**: آدرس سرور SMTP + - **پورت SMTP**: پورت سرور (معمولاً 587 یا 465) + - **نام کاربری**: نام کاربری SMTP + - **رمز عبور**: رمز عبور SMTP + - **ایمیل فرستنده**: آدرس ایمیل فرستنده + - **نام فرستنده**: نام نمایشی فرستنده + - **TLS/SSL**: نوع رمزگذاری + +2. روی "ذخیره پیکربندی" کلیک کنید + +### 3. تست اتصال + +1. پیکربندی مورد نظر را انتخاب کنید +2. روی "تست اتصال" کلیک کنید +3. وضعیت اتصال نمایش داده می‌شود + +### 4. ارسال ایمیل تست + +1. پیکربندی مورد نظر را انتخاب کنید +2. روی "ارسال ایمیل تست" کلیک کنید +3. ایمیل تست به آدرس "ایمیل فرستنده" ارسال می‌شود + +## API Endpoints + +### مدیریت پیکربندی‌ها + +- `GET /api/v1/admin/email/configs` - دریافت لیست پیکربندی‌ها +- `GET /api/v1/admin/email/configs/{id}` - دریافت پیکربندی خاص +- `POST /api/v1/admin/email/configs` - ایجاد پیکربندی جدید +- `PUT /api/v1/admin/email/configs/{id}` - بروزرسانی پیکربندی +- `DELETE /api/v1/admin/email/configs/{id}` - حذف پیکربندی + +### تست و ارسال + +- `POST /api/v1/admin/email/configs/{id}/test` - تست اتصال +- `POST /api/v1/admin/email/configs/{id}/activate` - فعال‌سازی پیکربندی +- `POST /api/v1/admin/email/send` - ارسال ایمیل + +## امنیت + +- رمزهای عبور SMTP در دیتابیس ذخیره می‌شوند (باید رمزگذاری شوند) +- تمام endpoint ها نیاز به احراز هویت دارند +- تست اتصال قبل از فعال‌سازی انجام می‌شود + +## چندزبانه + +### فارسی +- تمام متن‌ها به فارسی ترجمه شده‌اند +- پشتیبانی از RTL +- فرمت تاریخ شمسی + +### انگلیسی +- پشتیبانی کامل از انگلیسی +- فرمت تاریخ میلادی + +## عیب‌یابی + +### مشکلات رایج + +1. **خطا در اتصال SMTP** + - بررسی صحت آدرس میزبان و پورت + - بررسی نام کاربری و رمز عبور + - بررسی تنظیمات TLS/SSL + +2. **ایمیل ارسال نمی‌شود** + - بررسی پیکربندی فعال + - تست اتصال + - بررسی لاگ‌های سرور + +3. **خطا در رابط کاربری** + - بررسی اتصال به API + - بررسی مجوزهای کاربر + - بررسی ترجمه‌ها + +### لاگ‌ها + +- لاگ‌های ارسال ایمیل در console نمایش داده می‌شوند +- خطاهای SMTP در response API نمایش داده می‌شوند + +## توسعه آینده + +### ویژگی‌های پیشنهادی + +- [ ] سیستم قالب‌های ایمیل +- [ ] صف ارسال ایمیل +- [ ] آمار ارسال +- [ ] لاگ‌گیری کامل +- [ ] رمزگذاری رمزهای عبور +- [ ] پشتیبانی از چندین ارائه‌دهنده SMTP +- [ ] تست خودکار اتصال + +### بهبودهای فنی + +- [ ] Cache کردن پیکربندی‌ها +- [ ] Connection pooling +- [ ] Retry mechanism +- [ ] Rate limiting +- [ ] Monitoring و alerting + +## پشتیبانی + +برای گزارش مشکلات یا درخواست ویژگی‌های جدید، لطفاً با تیم توسعه تماس بگیرید. + +--- + +**نسخه**: 1.0.0 +**تاریخ**: 2025-01-17 +**نویسنده**: تیم توسعه حسابیکس diff --git a/hesabixAPI/adapters/api/v1/admin/email_config.py b/hesabixAPI/adapters/api/v1/admin/email_config.py new file mode 100644 index 0000000..fe79901 --- /dev/null +++ b/hesabixAPI/adapters/api/v1/admin/email_config.py @@ -0,0 +1,349 @@ +from fastapi import APIRouter, Depends, HTTPException, Request +from sqlalchemy.orm import Session +from typing import List + +from adapters.db.session import get_db +from adapters.db.models.email_config import EmailConfig +from adapters.db.repositories.email_config_repository import EmailConfigRepository +from adapters.api.v1.schema_models.email import ( + EmailConfigCreate, + EmailConfigUpdate, + EmailConfigResponse, + SendEmailRequest, + TestConnectionRequest +) +from adapters.api.v1.schemas import SuccessResponse +from app.core.responses import success_response, format_datetime_fields +from app.core.permissions import require_app_permission +from app.core.auth_dependency import get_current_user, AuthContext +from app.core.i18n import gettext, negotiate_locale + +router = APIRouter(prefix="/admin/email", tags=["Email Configuration"]) + + +@router.get("/configs", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def get_email_configs( + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Get all email configurations""" + try: + email_repo = EmailConfigRepository(db) + configs = email_repo.get_all_configs() + + config_responses = [ + EmailConfigResponse.model_validate(config) for config in configs + ] + + # Format datetime fields based on calendar type + formatted_data = format_datetime_fields(config_responses, request) + + return success_response( + data=formatted_data, + request=request + ) + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.get("/configs/{config_id}", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def get_email_config( + config_id: int, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Get specific email configuration""" + try: + email_repo = EmailConfigRepository(db) + config = email_repo.get_by_id(config_id) + + if not config: + locale = negotiate_locale(request.headers.get("Accept-Language")) + raise HTTPException(status_code=404, detail=gettext("Email configuration not found", locale)) + + config_response = EmailConfigResponse.model_validate(config) + + # Format datetime fields based on calendar type + formatted_data = format_datetime_fields(config_response.model_dump(), request) + + return success_response( + data=formatted_data, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.post("/configs", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def create_email_config( + request_data: EmailConfigCreate, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Create new email configuration""" + try: + email_repo = EmailConfigRepository(db) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + # Check if name already exists + existing_config = email_repo.get_by_name(request_data.name) + if existing_config: + raise HTTPException(status_code=400, detail=gettext("Configuration name already exists", locale)) + + # Create new config + config = EmailConfig(**request_data.model_dump()) + email_repo.db.add(config) + email_repo.db.commit() + email_repo.db.refresh(config) + + # If this is the first config, set it as default + if not email_repo.get_default_config(): + email_repo.set_default_config(config.id) + + config_response = EmailConfigResponse.model_validate(config) + + # Format datetime fields based on calendar type + formatted_data = format_datetime_fields(config_response.model_dump(), request) + + return success_response( + data=formatted_data, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.put("/configs/{config_id}", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def update_email_config( + config_id: int, + request_data: EmailConfigUpdate, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Update email configuration""" + try: + email_repo = EmailConfigRepository(db) + config = email_repo.get_by_id(config_id) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + if not config: + raise HTTPException(status_code=404, detail=gettext("Email configuration not found", locale)) + + # Check name uniqueness if name is being updated + if request_data.name and request_data.name != config.name: + existing_config = email_repo.get_by_name(request_data.name) + if existing_config: + raise HTTPException(status_code=400, detail=gettext("Configuration name already exists", locale)) + + # Update config + update_data = request_data.model_dump(exclude_unset=True) + + # Prevent changing is_default through update - use set-default endpoint instead + if 'is_default' in update_data: + del update_data['is_default'] + + for field, value in update_data.items(): + setattr(config, field, value) + + email_repo.update(config) + + config_response = EmailConfigResponse.model_validate(config) + + # Format datetime fields based on calendar type + formatted_data = format_datetime_fields(config_response.model_dump(), request) + + return success_response( + data=formatted_data, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.delete("/configs/{config_id}", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def delete_email_config( + config_id: int, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Delete email configuration""" + try: + email_repo = EmailConfigRepository(db) + config = email_repo.get_by_id(config_id) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + if not config: + raise HTTPException(status_code=404, detail=gettext("Email configuration not found", locale)) + + # Prevent deletion of default config + if config.is_default: + raise HTTPException(status_code=400, detail=gettext("Cannot delete default configuration", locale)) + + email_repo.delete(config) + + return success_response( + data=None, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.post("/configs/{config_id}/test", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def test_email_config( + config_id: int, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Test email configuration connection""" + try: + email_repo = EmailConfigRepository(db) + config = email_repo.get_by_id(config_id) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + if not config: + raise HTTPException(status_code=404, detail=gettext("Email configuration not found", locale)) + + is_connected = email_repo.test_connection(config) + + return success_response( + data={"connected": is_connected}, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.post("/configs/{config_id}/activate", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def activate_email_config( + config_id: int, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Activate email configuration""" + try: + email_repo = EmailConfigRepository(db) + config = email_repo.get_by_id(config_id) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + if not config: + raise HTTPException(status_code=404, detail=gettext("Email configuration not found", locale)) + + success = email_repo.set_active_config(config_id) + + if not success: + raise HTTPException(status_code=500, detail=gettext("Failed to activate configuration", locale)) + + return success_response( + data=None, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.post("/configs/{config_id}/set-default", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def set_default_email_config( + config_id: int, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Set email configuration as default""" + try: + email_repo = EmailConfigRepository(db) + config = email_repo.get_by_id(config_id) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + if not config: + raise HTTPException(status_code=404, detail=gettext("Email configuration not found", locale)) + + success = email_repo.set_default_config(config_id) + + if not success: + raise HTTPException(status_code=500, detail=gettext("Failed to set default configuration", locale)) + + return success_response( + data=None, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +@router.post("/send", response_model=SuccessResponse) +@require_app_permission("superadmin") +async def send_email( + request_data: SendEmailRequest, + request: Request, + db: Session = Depends(get_db), + ctx: AuthContext = Depends(get_current_user) +): + """Send email using configured SMTP""" + try: + from app.services.email_service import EmailService + + email_service = EmailService(db) + success = email_service.send_email( + to=request_data.to, + subject=request_data.subject, + body=request_data.body, + html_body=request_data.html_body, + config_id=request_data.config_id + ) + + # Get locale from request + locale = negotiate_locale(request.headers.get("Accept-Language")) + + if not success: + raise HTTPException(status_code=500, detail=gettext("Failed to send email", locale)) + + return success_response( + data={"sent": True}, + request=request + ) + except HTTPException: + raise + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) diff --git a/hesabixAPI/adapters/api/v1/admin/file_storage.py b/hesabixAPI/adapters/api/v1/admin/file_storage.py index 462df1e..906242c 100644 --- a/hesabixAPI/adapters/api/v1/admin/file_storage.py +++ b/hesabixAPI/adapters/api/v1/admin/file_storage.py @@ -6,14 +6,14 @@ from sqlalchemy import and_ from adapters.db.session import get_db from app.core.auth_dependency import get_current_user, AuthContext -from app.core.permissions import require_permission +from app.core.permissions import require_app_permission from app.core.responses import success_response from app.core.responses import ApiError from app.core.i18n import locale_dependency from app.services.file_storage_service import FileStorageService from adapters.db.repositories.file_storage_repository import StorageConfigRepository, FileStorageRepository from adapters.db.models.user import User -from adapters.db.models.file_storage import StorageConfig +from adapters.db.models.file_storage import StorageConfig, FileStorage from adapters.api.v1.schema_models.file_storage import ( StorageConfigCreateRequest, StorageConfigUpdateRequest, @@ -30,6 +30,7 @@ router = APIRouter(prefix="/admin/files", tags=["Admin File Management"]) @router.get("/", response_model=dict) +@require_app_permission("superadmin") async def list_all_files( request: Request, page: int = Query(1, ge=1), @@ -43,15 +44,6 @@ async def list_all_files( ): """لیست تمام فایل‌ها با فیلتر""" try: - # Check permission - if not current_user.has_app_permission("admin.file.view"): - raise ApiError( - code="FORBIDDEN", - message=translator.t("FORBIDDEN", "دسترسی غیرمجاز"), - http_status=403, - translator=translator - ) - file_repo = FileStorageRepository(db) # محاسبه offset برای pagination @@ -130,6 +122,7 @@ async def list_all_files( @router.get("/unverified", response_model=dict) +@require_app_permission("superadmin") async def get_unverified_files( request: Request, db: Session = Depends(get_db), @@ -167,6 +160,7 @@ async def get_unverified_files( @router.post("/cleanup-temporary", response_model=dict) +@require_app_permission("superadmin") async def cleanup_temporary_files( request: Request, db: Session = Depends(get_db), @@ -194,6 +188,7 @@ async def cleanup_temporary_files( @router.delete("/{file_id}", response_model=dict) +@require_app_permission("superadmin") async def force_delete_file( file_id: UUID, request: Request, @@ -228,6 +223,7 @@ async def force_delete_file( @router.put("/{file_id}/restore", response_model=dict) +@require_app_permission("superadmin") async def restore_file( file_id: UUID, request: Request, @@ -262,6 +258,7 @@ async def restore_file( @router.get("/statistics", response_model=dict) +@require_app_permission("superadmin") async def get_file_statistics( request: Request, db: Session = Depends(get_db), @@ -285,6 +282,7 @@ async def get_file_statistics( # Storage Configuration Management @router.get("/storage-configs/", response_model=dict) +@require_app_permission("superadmin") async def get_storage_configs( request: Request, db: Session = Depends(get_db), @@ -293,15 +291,6 @@ async def get_storage_configs( ): """لیست تنظیمات ذخیره‌سازی""" try: - # Check permission - if not current_user.has_app_permission("admin.storage.view"): - raise ApiError( - code="FORBIDDEN", - message=translator.t("FORBIDDEN", "دسترسی غیرمجاز"), - http_status=403, - translator=translator - ) - config_repo = StorageConfigRepository(db) configs = config_repo.get_all_configs() @@ -331,6 +320,7 @@ async def get_storage_configs( @router.post("/storage-configs/", response_model=dict) +@require_app_permission("superadmin") async def create_storage_config( request: Request, config_request: StorageConfigCreateRequest, @@ -367,6 +357,7 @@ async def create_storage_config( @router.put("/storage-configs/{config_id}", response_model=dict) +@require_app_permission("superadmin") async def update_storage_config( config_id: UUID, request: Request, @@ -392,6 +383,7 @@ async def update_storage_config( @router.put("/storage-configs/{config_id}/set-default", response_model=dict) +@require_app_permission("superadmin") async def set_default_storage_config( config_id: UUID, request: Request, @@ -426,6 +418,7 @@ async def set_default_storage_config( @router.delete("/storage-configs/{config_id}", response_model=dict) +@require_app_permission("superadmin") async def delete_storage_config( config_id: str, request: Request, @@ -435,15 +428,6 @@ async def delete_storage_config( ): """حذف تنظیمات ذخیره‌سازی""" try: - # Check permission - if not current_user.has_app_permission("admin.storage.delete"): - raise ApiError( - code="FORBIDDEN", - message=translator.t("FORBIDDEN", "دسترسی غیرمجاز"), - http_status=403, - translator=translator - ) - config_repo = StorageConfigRepository(db) # بررسی وجود فایل‌ها قبل از حذف @@ -480,6 +464,7 @@ async def delete_storage_config( @router.post("/storage-configs/{config_id}/test", response_model=dict) +@require_app_permission("superadmin") async def test_storage_config( config_id: str, request: Request, diff --git a/hesabixAPI/adapters/api/v1/business_dashboard.py b/hesabixAPI/adapters/api/v1/business_dashboard.py new file mode 100644 index 0000000..ebd0ed9 --- /dev/null +++ b/hesabixAPI/adapters/api/v1/business_dashboard.py @@ -0,0 +1,194 @@ +# Removed __future__ annotations to fix OpenAPI schema generation + +from fastapi import APIRouter, Depends, Request, HTTPException +from sqlalchemy.orm import Session + +from adapters.db.session import get_db +from adapters.api.v1.schemas import SuccessResponse +from app.core.responses import success_response, format_datetime_fields +from app.core.auth_dependency import get_current_user, AuthContext +from app.core.permissions import require_business_access +from app.services.business_dashboard_service import ( + get_business_dashboard_data, get_business_members, get_business_statistics +) + +router = APIRouter(prefix="/business", tags=["business-dashboard"]) + + +@router.post("/{business_id}/dashboard", + summary="دریافت داشبورد کسب و کار", + description="دریافت اطلاعات کلی و آمار کسب و کار", + response_model=SuccessResponse, + responses={ + 200: { + "description": "داشبورد کسب و کار با موفقیت دریافت شد", + "content": { + "application/json": { + "example": { + "success": True, + "message": "داشبورد کسب و کار دریافت شد", + "data": { + "business_info": { + "id": 1, + "name": "شرکت نمونه", + "business_type": "شرکت", + "business_field": "تولیدی", + "owner_id": 1, + "created_at": "1403/01/01 00:00:00", + "member_count": 5 + }, + "statistics": { + "total_sales": 1000000.0, + "total_purchases": 500000.0, + "active_members": 5, + "recent_transactions": 25 + }, + "recent_activities": [ + { + "id": 1, + "title": "فروش جدید", + "description": "فروش محصول A به مبلغ 100,000 تومان", + "icon": "sell", + "time_ago": "2 ساعت پیش" + } + ] + } + } + } + } + }, + 401: { + "description": "کاربر احراز هویت نشده است" + }, + 403: { + "description": "دسترسی غیرمجاز به کسب و کار" + }, + 404: { + "description": "کسب و کار یافت نشد" + } + } +) +@require_business_access("business_id") +def get_business_dashboard( + request: Request, + business_id: int, + ctx: AuthContext = Depends(get_current_user), + db: Session = Depends(get_db) +) -> dict: + """دریافت داشبورد کسب و کار""" + dashboard_data = get_business_dashboard_data(db, business_id, ctx) + formatted_data = format_datetime_fields(dashboard_data, request) + return success_response(formatted_data, request) + + +@router.post("/{business_id}/members", + summary="لیست اعضای کسب و کار", + description="دریافت لیست اعضای کسب و کار", + response_model=SuccessResponse, + responses={ + 200: { + "description": "لیست اعضا با موفقیت دریافت شد", + "content": { + "application/json": { + "example": { + "success": True, + "message": "لیست اعضا دریافت شد", + "data": { + "items": [ + { + "id": 1, + "user_id": 2, + "first_name": "احمد", + "last_name": "احمدی", + "email": "ahmad@example.com", + "role": "مدیر فروش", + "permissions": { + "sales": {"write": True, "delete": True}, + "reports": {"export": True} + }, + "joined_at": "1403/01/01 00:00:00" + } + ], + "pagination": { + "total": 1, + "page": 1, + "per_page": 10, + "total_pages": 1, + "has_next": False, + "has_prev": False + } + } + } + } + } + }, + 401: { + "description": "کاربر احراز هویت نشده است" + }, + 403: { + "description": "دسترسی غیرمجاز به کسب و کار" + } + } +) +@require_business_access("business_id") +def get_business_members( + request: Request, + business_id: int, + ctx: AuthContext = Depends(get_current_user), + db: Session = Depends(get_db) +) -> dict: + """لیست اعضای کسب و کار""" + members_data = get_business_members(db, business_id, ctx) + formatted_data = format_datetime_fields(members_data, request) + return success_response(formatted_data, request) + + +@router.post("/{business_id}/statistics", + summary="آمار کسب و کار", + description="دریافت آمار تفصیلی کسب و کار", + response_model=SuccessResponse, + responses={ + 200: { + "description": "آمار با موفقیت دریافت شد", + "content": { + "application/json": { + "example": { + "success": True, + "message": "آمار دریافت شد", + "data": { + "sales_by_month": [ + {"month": "1403/01", "amount": 500000}, + {"month": "1403/02", "amount": 750000} + ], + "top_products": [ + {"name": "محصول A", "sales_count": 100, "revenue": 500000} + ], + "member_activity": { + "active_today": 3, + "active_this_week": 5, + "total_members": 8 + } + } + } + } + } + }, + 401: { + "description": "کاربر احراز هویت نشده است" + }, + 403: { + "description": "دسترسی غیرمجاز به کسب و کار" + } + } +) +@require_business_access("business_id") +def get_business_statistics( + request: Request, + business_id: int, + ctx: AuthContext = Depends(get_current_user), + db: Session = Depends(get_db) +) -> dict: + """آمار کسب و کار""" + stats_data = get_business_statistics(db, business_id, ctx) + formatted_data = format_datetime_fields(stats_data, request) + return success_response(formatted_data, request) diff --git a/hesabixAPI/adapters/api/v1/businesses.py b/hesabixAPI/adapters/api/v1/businesses.py index d6c3f23..d186a15 100644 --- a/hesabixAPI/adapters/api/v1/businesses.py +++ b/hesabixAPI/adapters/api/v1/businesses.py @@ -6,8 +6,7 @@ from sqlalchemy.orm import Session from adapters.db.session import get_db from adapters.api.v1.schemas import ( BusinessCreateRequest, BusinessUpdateRequest, BusinessResponse, - BusinessListResponse, BusinessSummaryResponse, SuccessResponse, - QueryInfo + BusinessListResponse, BusinessSummaryResponse, SuccessResponse ) from app.core.responses import success_response, format_datetime_fields from app.core.auth_dependency import get_current_user, AuthContext @@ -63,10 +62,10 @@ def create_new_business( owner_id = ctx.get_user_id() business = create_business(db, business_data, owner_id) formatted_data = format_datetime_fields(business, request) - return success_response(formatted_data, request, "کسب و کار با موفقیت ایجاد شد") + return success_response(formatted_data, request) -@router.get("", +@router.post("/list", summary="لیست کسب و کارهای کاربر", description="دریافت لیست کسب و کارهای کاربر جاری با قابلیت فیلتر و جستجو", response_model=SuccessResponse, @@ -86,7 +85,7 @@ def create_new_business( "business_type": "شرکت", "business_field": "تولیدی", "owner_id": 1, - "created_at": "2024-01-01T00:00:00Z" + "created_at": "1403/01/01 00:00:00" } ], "pagination": { @@ -109,19 +108,54 @@ def create_new_business( ) def list_user_businesses( request: Request, - query_info: QueryInfo, ctx: AuthContext = Depends(get_current_user), - db: Session = Depends(get_db) + db: Session = Depends(get_db), + take: int = 10, + skip: int = 0, + sort_by: str = "created_at", + sort_desc: bool = True, + search: str = None ) -> dict: """لیست کسب و کارهای کاربر""" owner_id = ctx.get_user_id() - query_dict = query_info.dict() + query_dict = { + "take": take, + "skip": skip, + "sort_by": sort_by, + "sort_desc": sort_desc, + "search": search + } businesses = get_businesses_by_owner(db, owner_id, query_dict) formatted_data = format_datetime_fields(businesses, request) - return success_response(formatted_data, request, "لیست کسب و کارها دریافت شد") + + # اگر formatted_data یک dict با کلید items است، آن را استخراج کنیم + if isinstance(formatted_data, dict) and 'items' in formatted_data: + items = formatted_data['items'] + else: + items = formatted_data + + # برای حالا total را برابر با تعداد items قرار می‌دهیم + # در آینده می‌توان total را از service دریافت کرد + total = len(items) + page = (skip // take) + 1 + total_pages = (total + take - 1) // take + + response_data = { + "items": items, + "pagination": { + "total": total, + "page": page, + "per_page": take, + "total_pages": total_pages, + "has_next": page < total_pages, + "has_prev": page > 1, + }, + "query_info": query_dict + } + return success_response(response_data, request) -@router.get("/{business_id}", +@router.post("/{business_id}/details", summary="جزئیات کسب و کار", description="دریافت جزئیات یک کسب و کار خاص", response_model=SuccessResponse, @@ -141,7 +175,7 @@ def list_user_businesses( "owner_id": 1, "address": "تهران، خیابان ولیعصر", "phone": "02112345678", - "created_at": "2024-01-01T00:00:00Z" + "created_at": "1403/01/01 00:00:00" } } } @@ -169,7 +203,7 @@ def get_business( raise HTTPException(status_code=404, detail="کسب و کار یافت نشد") formatted_data = format_datetime_fields(business, request) - return success_response(formatted_data, request, "جزئیات کسب و کار دریافت شد") + return success_response(formatted_data, request) @router.put("/{business_id}", @@ -266,7 +300,7 @@ def delete_business_info( return success_response({"ok": True}, request, "کسب و کار با موفقیت حذف شد") -@router.get("/summary/stats", +@router.post("/stats", summary="آمار کسب و کارها", description="دریافت آمار کلی کسب و کارهای کاربر", response_model=SuccessResponse, @@ -307,4 +341,4 @@ def get_business_stats( """آمار کسب و کارها""" owner_id = ctx.get_user_id() stats = get_business_summary(db, owner_id) - return success_response(stats, request, "آمار کسب و کارها دریافت شد") + return success_response(stats, request) diff --git a/hesabixAPI/adapters/api/v1/schema_models/email.py b/hesabixAPI/adapters/api/v1/schema_models/email.py new file mode 100644 index 0000000..633f6e7 --- /dev/null +++ b/hesabixAPI/adapters/api/v1/schema_models/email.py @@ -0,0 +1,59 @@ +from pydantic import BaseModel, EmailStr, Field +from typing import Optional +from datetime import datetime + + +class EmailConfigBase(BaseModel): + name: str = Field(..., min_length=1, max_length=100, description="Configuration name") + smtp_host: str = Field(..., min_length=1, max_length=255, description="SMTP host") + smtp_port: int = Field(..., ge=1, le=65535, description="SMTP port") + smtp_username: str = Field(..., min_length=1, max_length=255, description="SMTP username") + smtp_password: str = Field(..., min_length=1, max_length=255, description="SMTP password") + use_tls: bool = Field(default=True, description="Use TLS encryption") + use_ssl: bool = Field(default=False, description="Use SSL encryption") + from_email: EmailStr = Field(..., description="From email address") + from_name: str = Field(..., min_length=1, max_length=100, description="From name") + is_active: bool = Field(default=True, description="Is this configuration active") + is_default: bool = Field(default=False, description="Is this the default configuration") + + +class EmailConfigCreate(EmailConfigBase): + pass + + +class EmailConfigUpdate(BaseModel): + name: Optional[str] = Field(None, min_length=1, max_length=100) + smtp_host: Optional[str] = Field(None, min_length=1, max_length=255) + smtp_port: Optional[int] = Field(None, ge=1, le=65535) + smtp_username: Optional[str] = Field(None, min_length=1, max_length=255) + smtp_password: Optional[str] = Field(None, min_length=1, max_length=255) + use_tls: Optional[bool] = None + use_ssl: Optional[bool] = None + from_email: Optional[EmailStr] = None + from_name: Optional[str] = Field(None, min_length=1, max_length=100) + is_active: Optional[bool] = None + is_default: Optional[bool] = None + + +class EmailConfigResponse(EmailConfigBase): + id: int + created_at: datetime + updated_at: datetime + + class Config: + from_attributes = True + + +class SendEmailRequest(BaseModel): + to: EmailStr = Field(..., description="Recipient email address") + subject: str = Field(..., min_length=1, max_length=255, description="Email subject") + body: str = Field(..., min_length=1, description="Email body (plain text)") + html_body: Optional[str] = Field(None, description="Email body (HTML)") + config_id: Optional[int] = Field(None, description="Specific config ID to use") + + +class TestConnectionRequest(BaseModel): + config_id: int = Field(..., description="Configuration ID to test") + + +# These response models are no longer needed as we use SuccessResponse from schemas.py diff --git a/hesabixAPI/adapters/db/models/__init__.py b/hesabixAPI/adapters/db/models/__init__.py index bbb2d13..7e44cb1 100644 --- a/hesabixAPI/adapters/db/models/__init__.py +++ b/hesabixAPI/adapters/db/models/__init__.py @@ -12,6 +12,9 @@ from .business_permission import BusinessPermission # noqa: F401 from .support import * # noqa: F401, F403 # Import file storage models -from .file_storage import * # noqa: F401, F403 +from .file_storage import * + +# Import email config models +from .email_config import EmailConfig # noqa: F401, F403 diff --git a/hesabixAPI/adapters/db/models/email_config.py b/hesabixAPI/adapters/db/models/email_config.py new file mode 100644 index 0000000..17aa98f --- /dev/null +++ b/hesabixAPI/adapters/db/models/email_config.py @@ -0,0 +1,27 @@ +from __future__ import annotations + +from datetime import datetime + +from sqlalchemy import String, DateTime, Boolean, Integer, Text +from sqlalchemy.orm import Mapped, mapped_column + +from adapters.db.session import Base + + +class EmailConfig(Base): + __tablename__ = "email_configs" + + id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True) + name: Mapped[str] = mapped_column(String(100), nullable=False, index=True) + smtp_host: Mapped[str] = mapped_column(String(255), nullable=False) + smtp_port: Mapped[int] = mapped_column(Integer, nullable=False) + smtp_username: Mapped[str] = mapped_column(String(255), nullable=False) + smtp_password: Mapped[str] = mapped_column(String(255), nullable=False) # Should be encrypted + use_tls: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False) + use_ssl: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False) + from_email: Mapped[str] = mapped_column(String(255), nullable=False) + from_name: Mapped[str] = mapped_column(String(100), nullable=False) + is_active: Mapped[bool] = mapped_column(Boolean, default=True, nullable=False) + is_default: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False) + created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False) + updated_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False) diff --git a/hesabixAPI/adapters/db/repositories/base_repo.py b/hesabixAPI/adapters/db/repositories/base_repo.py index 2b6109f..ffb52b6 100644 --- a/hesabixAPI/adapters/db/repositories/base_repo.py +++ b/hesabixAPI/adapters/db/repositories/base_repo.py @@ -53,3 +53,12 @@ class BaseRepository(Generic[T]): stmt = stmt.where(column == value) return self.db.execute(stmt).scalars().first() is not None + + def delete(self, obj: T) -> None: + """حذف رکورد از دیتابیس""" + self.db.delete(obj) + self.db.commit() + + def update(self, obj: T) -> None: + """بروزرسانی رکورد در دیتابیس""" + self.db.commit() \ No newline at end of file diff --git a/hesabixAPI/adapters/db/repositories/email_config_repository.py b/hesabixAPI/adapters/db/repositories/email_config_repository.py new file mode 100644 index 0000000..834c467 --- /dev/null +++ b/hesabixAPI/adapters/db/repositories/email_config_repository.py @@ -0,0 +1,85 @@ +from typing import Optional, List +from sqlalchemy.orm import Session +from sqlalchemy import and_ + +from adapters.db.models.email_config import EmailConfig +from adapters.db.repositories.base_repo import BaseRepository + + +class EmailConfigRepository(BaseRepository[EmailConfig]): + def __init__(self, db: Session): + super().__init__(db, EmailConfig) + + def get_active_config(self) -> Optional[EmailConfig]: + """Get the currently active email configuration""" + return self.db.query(self.model_class).filter(self.model_class.is_active == True).first() + + def get_default_config(self) -> Optional[EmailConfig]: + """Get the default email configuration""" + return self.db.query(self.model_class).filter(self.model_class.is_default == True).first() + + def set_default_config(self, config_id: int) -> bool: + """Set a configuration as default (removes default from others)""" + try: + # First check if the config exists + config = self.get_by_id(config_id) + if not config: + return False + + # Remove default from all configs + self.db.query(self.model_class).update({self.model_class.is_default: False}) + + # Set the specified config as default + config.is_default = True + self.db.commit() + return True + except Exception as e: + self.db.rollback() + print(f"Error in set_default_config: {e}") # Debug log + return False + + def get_by_name(self, name: str) -> Optional[EmailConfig]: + """Get email configuration by name""" + return self.db.query(self.model_class).filter(self.model_class.name == name).first() + + def get_all_configs(self) -> List[EmailConfig]: + """Get all email configurations""" + return self.db.query(self.model_class).order_by(self.model_class.created_at.desc()).all() + + def set_active_config(self, config_id: int) -> bool: + """Set a specific configuration as active and deactivate others""" + try: + # Deactivate all configs + self.db.query(self.model_class).update({self.model_class.is_active: False}) + + # Activate the specified config + config = self.get_by_id(config_id) + if config: + config.is_active = True + self.db.commit() + return True + return False + except Exception: + self.db.rollback() + return False + + def test_connection(self, config: EmailConfig) -> bool: + """Test SMTP connection for a configuration""" + try: + import smtplib + from email.mime.text import MIMEText + + # Create SMTP connection + if config.use_ssl: + server = smtplib.SMTP_SSL(config.smtp_host, config.smtp_port) + else: + server = smtplib.SMTP(config.smtp_host, config.smtp_port) + if config.use_tls: + server.starttls() + + # Login + server.login(config.smtp_username, config.smtp_password) + server.quit() + return True + except Exception: + return False diff --git a/hesabixAPI/app/core/auth_dependency.py b/hesabixAPI/app/core/auth_dependency.py index cd91eda..37c205f 100644 --- a/hesabixAPI/app/core/auth_dependency.py +++ b/hesabixAPI/app/core/auth_dependency.py @@ -249,14 +249,16 @@ class AuthContext: def get_current_user( request: Request, - authorization: Optional[str] = Header(default=None), db: Session = Depends(get_db) ) -> AuthContext: """دریافت اطلاعات کامل کاربر کنونی و تنظیمات از درخواست""" - if not authorization or not authorization.startswith("ApiKey "): + # Get authorization from request headers + auth_header = request.headers.get("Authorization") + + if not auth_header or not auth_header.startswith("ApiKey "): raise ApiError("UNAUTHORIZED", "Missing or invalid API key", http_status=401) - api_key = authorization[len("ApiKey ") :].strip() + api_key = auth_header[len("ApiKey ") :].strip() key_hash = hash_api_key(api_key) repo = ApiKeyRepository(db) obj = repo.get_by_hash(key_hash) diff --git a/hesabixAPI/app/core/i18n.py b/hesabixAPI/app/core/i18n.py index 54d59ce..574ca12 100644 --- a/hesabixAPI/app/core/i18n.py +++ b/hesabixAPI/app/core/i18n.py @@ -51,3 +51,9 @@ def get_translator(locale: str = "fa") -> Translator: return Translator(locale) +def gettext(key: str, locale: str = "fa") -> str: + """Get translation for a key using gettext""" + translator = get_translator(locale) + return translator.t(key) + + diff --git a/hesabixAPI/app/core/permissions.py b/hesabixAPI/app/core/permissions.py index 1750002..f00d098 100644 --- a/hesabixAPI/app/core/permissions.py +++ b/hesabixAPI/app/core/permissions.py @@ -74,7 +74,23 @@ def require_business_access(business_id_param: str = "business_id"): def decorator(func: Callable) -> Callable: @wraps(func) def wrapper(*args, **kwargs) -> Any: - ctx = get_current_user() + # Find request in args or kwargs + request = None + for arg in args: + if hasattr(arg, 'headers'): # Check if it's a Request object + request = arg + break + + if not request and 'request' in kwargs: + request = kwargs['request'] + + if not request: + raise ApiError("INTERNAL_ERROR", "Request not found", http_status=500) + + # Get database session + from adapters.db.session import get_db + db = next(get_db()) + ctx = get_current_user(request, db) business_id = kwargs.get(business_id_param) if business_id and not ctx.can_access_business(business_id): raise ApiError("FORBIDDEN", f"No access to business {business_id}", http_status=403) diff --git a/hesabixAPI/app/main.py b/hesabixAPI/app/main.py index 9b8cb32..83315ca 100644 --- a/hesabixAPI/app/main.py +++ b/hesabixAPI/app/main.py @@ -7,12 +7,14 @@ from adapters.api.v1.health import router as health_router from adapters.api.v1.auth import router as auth_router from adapters.api.v1.users import router as users_router from adapters.api.v1.businesses import router as businesses_router +from adapters.api.v1.business_dashboard import router as business_dashboard_router from adapters.api.v1.support.tickets import router as support_tickets_router from adapters.api.v1.support.operator import router as support_operator_router from adapters.api.v1.support.categories import router as support_categories_router from adapters.api.v1.support.priorities import router as support_priorities_router from adapters.api.v1.support.statuses import router as support_statuses_router from adapters.api.v1.admin.file_storage import router as admin_file_storage_router +from adapters.api.v1.admin.email_config import router as admin_email_config_router from app.core.i18n import negotiate_locale, Translator from app.core.error_handlers import register_error_handlers from app.core.smart_normalizer import smart_normalize_json, SmartNormalizerConfig @@ -268,6 +270,7 @@ def create_app() -> FastAPI: application.include_router(auth_router, prefix=settings.api_v1_prefix) application.include_router(users_router, prefix=settings.api_v1_prefix) application.include_router(businesses_router, prefix=settings.api_v1_prefix) + application.include_router(business_dashboard_router, prefix=settings.api_v1_prefix) # Support endpoints application.include_router(support_tickets_router, prefix=f"{settings.api_v1_prefix}/support") @@ -278,6 +281,7 @@ def create_app() -> FastAPI: # Admin endpoints application.include_router(admin_file_storage_router, prefix=settings.api_v1_prefix) + application.include_router(admin_email_config_router, prefix=settings.api_v1_prefix) register_error_handlers(application) diff --git a/hesabixAPI/app/services/business_dashboard_service.py b/hesabixAPI/app/services/business_dashboard_service.py new file mode 100644 index 0000000..dd720a6 --- /dev/null +++ b/hesabixAPI/app/services/business_dashboard_service.py @@ -0,0 +1,194 @@ +from __future__ import annotations + +from typing import List, Optional, Dict, Any +from sqlalchemy.orm import Session +from sqlalchemy import select, and_, func +from datetime import datetime, timedelta + +from adapters.db.repositories.business_repo import BusinessRepository +from adapters.db.repositories.business_permission_repo import BusinessPermissionRepository +from adapters.db.repositories.user_repo import UserRepository +from adapters.db.models.business import Business +from adapters.db.models.business_permission import BusinessPermission +from adapters.db.models.user import User +from app.core.auth_dependency import AuthContext + + +def get_business_dashboard_data(db: Session, business_id: int, ctx: AuthContext) -> Dict[str, Any]: + """دریافت داده‌های داشبورد کسب و کار""" + business_repo = BusinessRepository(db) + business = business_repo.get_by_id(business_id) + + if not business: + raise ValueError("کسب و کار یافت نشد") + + # بررسی دسترسی کاربر + if not ctx.can_access_business(business_id): + raise ValueError("دسترسی غیرمجاز") + + # دریافت اطلاعات کسب و کار + business_info = _get_business_info(business, db) + + # دریافت آمار + statistics = _get_business_statistics(business_id, db) + + # دریافت فعالیت‌های اخیر + recent_activities = _get_recent_activities(business_id, db) + + return { + "business_info": business_info, + "statistics": statistics, + "recent_activities": recent_activities + } + + +def get_business_members(db: Session, business_id: int, ctx: AuthContext) -> Dict[str, Any]: + """دریافت لیست اعضای کسب و کار""" + if not ctx.can_access_business(business_id): + raise ValueError("دسترسی غیرمجاز") + + permission_repo = BusinessPermissionRepository(db) + user_repo = UserRepository(db) + + # دریافت دسترسی‌های کسب و کار + permissions = permission_repo.get_business_users(business_id) + + members = [] + for permission in permissions: + user = user_repo.get_by_id(permission.user_id) + if user: + members.append({ + "id": permission.id, + "user_id": user.id, + "first_name": user.first_name, + "last_name": user.last_name, + "email": user.email, + "mobile": user.mobile, + "role": _get_user_role(permission.business_permissions), + "permissions": permission.business_permissions or {}, + "joined_at": permission.created_at.isoformat() + }) + + return { + "items": members, + "pagination": { + "total": len(members), + "page": 1, + "per_page": len(members), + "total_pages": 1, + "has_next": False, + "has_prev": False + } + } + + +def get_business_statistics(db: Session, business_id: int, ctx: AuthContext) -> Dict[str, Any]: + """دریافت آمار تفصیلی کسب و کار""" + if not ctx.can_access_business(business_id): + raise ValueError("دسترسی غیرمجاز") + + # آمار فروش ماهانه (نمونه) + sales_by_month = [ + {"month": "2024-01", "amount": 500000}, + {"month": "2024-02", "amount": 750000}, + {"month": "2024-03", "amount": 600000} + ] + + # پرفروش‌ترین محصولات (نمونه) + top_products = [ + {"name": "محصول A", "sales_count": 100, "revenue": 500000}, + {"name": "محصول B", "sales_count": 80, "revenue": 400000}, + {"name": "محصول C", "sales_count": 60, "revenue": 300000} + ] + + # آمار فعالیت اعضا + permission_repo = BusinessPermissionRepository(db) + members = permission_repo.get_business_users(business_id) + + member_activity = { + "active_today": len([m for m in members if m.created_at.date() == datetime.now().date()]), + "active_this_week": len([m for m in members if m.created_at >= datetime.now() - timedelta(days=7)]), + "total_members": len(members) + } + + return { + "sales_by_month": sales_by_month, + "top_products": top_products, + "member_activity": member_activity + } + + +def _get_business_info(business: Business, db: Session) -> Dict[str, Any]: + """دریافت اطلاعات کسب و کار""" + permission_repo = BusinessPermissionRepository(db) + member_count = len(permission_repo.get_business_users(business.id)) + + return { + "id": business.id, + "name": business.name, + "business_type": business.business_type.value, + "business_field": business.business_field.value, + "owner_id": business.owner_id, + "address": business.address, + "phone": business.phone, + "mobile": business.mobile, + "created_at": business.created_at.isoformat(), + "member_count": member_count + } + + +def _get_business_statistics(business_id: int, db: Session) -> Dict[str, Any]: + """دریافت آمار کلی کسب و کار""" + # در اینجا می‌توانید آمار واقعی را از جداول مربوطه دریافت کنید + # فعلاً داده‌های نمونه برمی‌گردانیم + return { + "total_sales": 1000000.0, + "total_purchases": 500000.0, + "active_members": 5, + "recent_transactions": 25 + } + + +def _get_recent_activities(business_id: int, db: Session) -> List[Dict[str, Any]]: + """دریافت فعالیت‌های اخیر""" + # در اینجا می‌توانید فعالیت‌های واقعی را از جداول مربوطه دریافت کنید + # فعلاً داده‌های نمونه برمی‌گردانیم + return [ + { + "id": 1, + "title": "فروش جدید", + "description": "فروش محصول A به مبلغ 100,000 تومان", + "icon": "sell", + "time_ago": "2 ساعت پیش" + }, + { + "id": 2, + "title": "عضو جدید", + "description": "احمد احمدی به تیم اضافه شد", + "icon": "person_add", + "time_ago": "5 ساعت پیش" + }, + { + "id": 3, + "title": "گزارش ماهانه", + "description": "گزارش فروش ماه ژانویه تولید شد", + "icon": "assessment", + "time_ago": "1 روز پیش" + } + ] + + +def _get_user_role(permissions: Optional[Dict[str, Any]]) -> str: + """تعیین نقش کاربر بر اساس دسترسی‌ها""" + if not permissions: + return "عضو" + + # بررسی دسترسی‌های مختلف برای تعیین نقش + if permissions.get("settings", {}).get("manage_users"): + return "مدیر" + elif permissions.get("sales", {}).get("write"): + return "مدیر فروش" + elif permissions.get("accounting", {}).get("write"): + return "حسابدار" + else: + return "عضو" diff --git a/hesabixAPI/app/services/business_service.py b/hesabixAPI/app/services/business_service.py index 75a11f3..e70d2d3 100644 --- a/hesabixAPI/app/services/business_service.py +++ b/hesabixAPI/app/services/business_service.py @@ -181,6 +181,6 @@ def _business_to_dict(business: Business) -> Dict[str, Any]: "province": business.province, "city": business.city, "postal_code": business.postal_code, - "created_at": business.created_at.isoformat(), - "updated_at": business.updated_at.isoformat() + "created_at": business.created_at, # datetime object بماند + "updated_at": business.updated_at # datetime object بماند } diff --git a/hesabixAPI/app/services/email_service.py b/hesabixAPI/app/services/email_service.py new file mode 100644 index 0000000..f1a2399 --- /dev/null +++ b/hesabixAPI/app/services/email_service.py @@ -0,0 +1,143 @@ +import smtplib +from email.mime.text import MIMEText +from email.mime.multipart import MIMEMultipart +from typing import Optional, List +from sqlalchemy.orm import Session + +from adapters.db.models.email_config import EmailConfig +from adapters.db.repositories.email_config_repository import EmailConfigRepository + + +class EmailService: + def __init__(self, db: Session): + self.db = db + self.email_repo = EmailConfigRepository(db) + + def send_email( + self, + to: str, + subject: str, + body: str, + html_body: Optional[str] = None, + config_id: Optional[int] = None + ) -> bool: + """ + Send email using SMTP configuration + + Args: + to: Recipient email address + subject: Email subject + body: Plain text body + html_body: HTML body (optional) + config_id: Specific config ID to use (optional) + + Returns: + bool: True if email sent successfully, False otherwise + """ + try: + # Get email configuration - prioritize default config + if config_id: + config = self.email_repo.get_by_id(config_id) + else: + # First try to get default config + config = self.email_repo.get_default_config() + if not config: + # Fallback to active config + config = self.email_repo.get_active_config() + + if not config: + return False + + # Create message + msg = MIMEMultipart('alternative') + msg['From'] = f"{config.from_name} <{config.from_email}>" + msg['To'] = to + msg['Subject'] = subject + + # Add plain text part + text_part = MIMEText(body, 'plain', 'utf-8') + msg.attach(text_part) + + # Add HTML part if provided + if html_body: + html_part = MIMEText(html_body, 'html', 'utf-8') + msg.attach(html_part) + + # Send email + return self._send_smtp_email(config, msg) + + except Exception as e: + print(f"Error sending email: {e}") + return False + + def send_template_email( + self, + template_name: str, + to: str, + context: dict, + config_id: Optional[int] = None + ) -> bool: + """ + Send email using a template (placeholder for future template system) + + Args: + template_name: Name of the template + to: Recipient email address + context: Template context variables + config_id: Specific config ID to use (optional) + + Returns: + bool: True if email sent successfully, False otherwise + """ + # For now, just use basic template substitution + # This can be extended with a proper template engine later + subject = context.get('subject', 'Email from Hesabix') + body = context.get('body', '') + html_body = context.get('html_body') + + return self.send_email(to, subject, body, html_body, config_id) + + def test_connection(self, config_id: int) -> bool: + """ + Test SMTP connection for a specific configuration + + Args: + config_id: Configuration ID to test + + Returns: + bool: True if connection successful, False otherwise + """ + config = self.email_repo.get_by_id(config_id) + if not config: + return False + + return self.email_repo.test_connection(config) + + def get_active_config(self) -> Optional[EmailConfig]: + """Get the currently active email configuration""" + return self.email_repo.get_active_config() + + def get_all_configs(self) -> List[EmailConfig]: + """Get all email configurations""" + return self.email_repo.get_all_configs() + + def _send_smtp_email(self, config: EmailConfig, msg: MIMEMultipart) -> bool: + """Internal method to send email via SMTP""" + try: + # Create SMTP connection + if config.use_ssl: + server = smtplib.SMTP_SSL(config.smtp_host, config.smtp_port) + else: + server = smtplib.SMTP(config.smtp_host, config.smtp_port) + if config.use_tls: + server.starttls() + + # Login and send + server.login(config.smtp_username, config.smtp_password) + server.send_message(msg) + server.quit() + + return True + except Exception as e: + print(f"SMTP error: {e}") + return False diff --git a/hesabixAPI/hesabix_api.egg-info/SOURCES.txt b/hesabixAPI/hesabix_api.egg-info/SOURCES.txt index f9b73d8..9f623f1 100644 --- a/hesabixAPI/hesabix_api.egg-info/SOURCES.txt +++ b/hesabixAPI/hesabix_api.egg-info/SOURCES.txt @@ -8,8 +8,10 @@ adapters/api/v1/businesses.py adapters/api/v1/health.py adapters/api/v1/schemas.py adapters/api/v1/users.py +adapters/api/v1/admin/email_config.py adapters/api/v1/admin/file_storage.py adapters/api/v1/schema_models/__init__.py +adapters/api/v1/schema_models/email.py adapters/api/v1/schema_models/file_storage.py adapters/api/v1/support/__init__.py adapters/api/v1/support/categories.py @@ -25,6 +27,7 @@ adapters/db/models/api_key.py adapters/db/models/business.py adapters/db/models/business_permission.py adapters/db/models/captcha.py +adapters/db/models/email_config.py adapters/db/models/file_storage.py adapters/db/models/password_reset.py adapters/db/models/user.py @@ -38,6 +41,7 @@ adapters/db/repositories/api_key_repo.py adapters/db/repositories/base_repo.py adapters/db/repositories/business_permission_repo.py adapters/db/repositories/business_repo.py +adapters/db/repositories/email_config_repository.py adapters/db/repositories/file_storage_repository.py adapters/db/repositories/password_reset_repo.py adapters/db/repositories/user_repo.py @@ -66,6 +70,7 @@ app/services/api_key_service.py app/services/auth_service.py app/services/business_service.py app/services/captcha_service.py +app/services/email_service.py app/services/file_storage_service.py app/services/query_service.py app/services/pdf/__init__.py @@ -84,6 +89,8 @@ migrations/versions/20250117_000004_add_business_contact_fields.py migrations/versions/20250117_000005_add_business_geographic_fields.py migrations/versions/20250117_000006_add_app_permissions_to_users.py migrations/versions/20250117_000007_create_business_permissions_table.py +migrations/versions/20250117_000008_add_email_config_table.py +migrations/versions/20250117_000009_add_is_default_to_email_config.py migrations/versions/20250915_000001_init_auth_tables.py migrations/versions/20250916_000002_add_referral_fields.py migrations/versions/5553f8745c6e_add_support_tables.py diff --git a/hesabixAPI/locales/en/LC_MESSAGES/messages.mo b/hesabixAPI/locales/en/LC_MESSAGES/messages.mo index 4beb188..be05735 100644 Binary files a/hesabixAPI/locales/en/LC_MESSAGES/messages.mo and b/hesabixAPI/locales/en/LC_MESSAGES/messages.mo differ diff --git a/hesabixAPI/locales/en/LC_MESSAGES/messages.po b/hesabixAPI/locales/en/LC_MESSAGES/messages.po index 7760e9c..db10484 100644 --- a/hesabixAPI/locales/en/LC_MESSAGES/messages.po +++ b/hesabixAPI/locales/en/LC_MESSAGES/messages.po @@ -33,6 +33,47 @@ msgstr "Field is required" msgid "INVALID_EMAIL" msgstr "Invalid email address" +# Email Configuration +msgid "Email configurations retrieved successfully" +msgstr "Email configurations retrieved successfully" + +msgid "Email configuration retrieved successfully" +msgstr "Email configuration retrieved successfully" + +msgid "Email configuration created successfully" +msgstr "Email configuration created successfully" + +msgid "Email configuration updated successfully" +msgstr "Email configuration updated successfully" + +msgid "Email configuration deleted successfully" +msgstr "Email configuration deleted successfully" + +msgid "Email configuration not found" +msgstr "Email configuration not found" + +msgid "Configuration name already exists" +msgstr "Configuration name already exists" + +msgid "Connection test completed" +msgstr "Connection test completed" + +msgid "Email configuration activated successfully" +msgstr "Email configuration activated successfully" + +msgid "Failed to activate configuration" +msgstr "Failed to activate configuration" + +msgid "Email sent successfully" +msgstr "Email sent successfully" +msgid "Cannot delete default configuration" +msgstr "Cannot delete default configuration" +msgid "Failed to set default configuration" +msgstr "Failed to set default configuration" + +msgid "Failed to send email" +msgstr "Failed to send email" + # Auth msgid "INVALID_CAPTCHA" msgstr "Invalid captcha code." diff --git a/hesabixAPI/locales/fa/LC_MESSAGES/messages.mo b/hesabixAPI/locales/fa/LC_MESSAGES/messages.mo index bad1332..6e1b411 100644 Binary files a/hesabixAPI/locales/fa/LC_MESSAGES/messages.mo and b/hesabixAPI/locales/fa/LC_MESSAGES/messages.mo differ diff --git a/hesabixAPI/locales/fa/LC_MESSAGES/messages.po b/hesabixAPI/locales/fa/LC_MESSAGES/messages.po index f47a8b4..ec270ea 100644 --- a/hesabixAPI/locales/fa/LC_MESSAGES/messages.po +++ b/hesabixAPI/locales/fa/LC_MESSAGES/messages.po @@ -33,6 +33,47 @@ msgstr "فیلد الزامی است" msgid "INVALID_EMAIL" msgstr "ایمیل نامعتبر است" +# Email Configuration +msgid "Email configurations retrieved successfully" +msgstr "پیکربندی‌های ایمیل با موفقیت دریافت شد" + +msgid "Email configuration retrieved successfully" +msgstr "پیکربندی ایمیل با موفقیت دریافت شد" + +msgid "Email configuration created successfully" +msgstr "پیکربندی ایمیل با موفقیت ایجاد شد" + +msgid "Email configuration updated successfully" +msgstr "پیکربندی ایمیل با موفقیت بروزرسانی شد" + +msgid "Email configuration deleted successfully" +msgstr "پیکربندی ایمیل با موفقیت حذف شد" + +msgid "Email configuration not found" +msgstr "پیکربندی ایمیل یافت نشد" + +msgid "Configuration name already exists" +msgstr "نام پیکربندی قبلاً استفاده شده است" + +msgid "Connection test completed" +msgstr "تست اتصال تکمیل شد" + +msgid "Email configuration activated successfully" +msgstr "پیکربندی ایمیل با موفقیت فعال شد" + +msgid "Failed to activate configuration" +msgstr "فعال‌سازی پیکربندی ناموفق بود" + +msgid "Email sent successfully" +msgstr "ایمیل با موفقیت ارسال شد" +msgid "Cannot delete default configuration" +msgstr "نمی‌توان پیکربندی پیشفرض را حذف کرد" +msgid "Failed to set default configuration" +msgstr "تنظیم پیکربندی پیشفرض ناموفق بود" + +msgid "Failed to send email" +msgstr "ارسال ایمیل ناموفق بود" + # Auth msgid "INVALID_CAPTCHA" msgstr "کد امنیتی نامعتبر است." diff --git a/hesabixAPI/migrations/versions/20250117_000008_add_email_config_table.py b/hesabixAPI/migrations/versions/20250117_000008_add_email_config_table.py new file mode 100644 index 0000000..e04e8a8 --- /dev/null +++ b/hesabixAPI/migrations/versions/20250117_000008_add_email_config_table.py @@ -0,0 +1,45 @@ +"""add_email_config_table + +Revision ID: 20250117_000008 +Revises: 5553f8745c6e +Create Date: 2025-01-17 12:00:00.000000 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '20250117_000008' +down_revision = '5553f8745c6e' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('email_configs', + sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), + sa.Column('name', sa.String(length=100), nullable=False), + sa.Column('smtp_host', sa.String(length=255), nullable=False), + sa.Column('smtp_port', sa.Integer(), nullable=False), + sa.Column('smtp_username', sa.String(length=255), nullable=False), + sa.Column('smtp_password', sa.String(length=255), nullable=False), + sa.Column('use_tls', sa.Boolean(), nullable=False), + sa.Column('use_ssl', sa.Boolean(), nullable=False), + sa.Column('from_email', sa.String(length=255), nullable=False), + sa.Column('from_name', sa.String(length=100), nullable=False), + sa.Column('is_active', sa.Boolean(), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=False), + sa.Column('updated_at', sa.DateTime(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + op.create_index(op.f('ix_email_configs_name'), 'email_configs', ['name'], unique=False) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_email_configs_name'), table_name='email_configs') + op.drop_table('email_configs') + # ### end Alembic commands ### diff --git a/hesabixAPI/migrations/versions/20250117_000009_add_is_default_to_email_config.py b/hesabixAPI/migrations/versions/20250117_000009_add_is_default_to_email_config.py new file mode 100644 index 0000000..c604f48 --- /dev/null +++ b/hesabixAPI/migrations/versions/20250117_000009_add_is_default_to_email_config.py @@ -0,0 +1,26 @@ +"""add is_default to email_config + +Revision ID: 20250117_000009 +Revises: 20250117_000008 +Create Date: 2025-01-17 12:00:00.000000 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '20250117_000009' +down_revision = '20250117_000008' +branch_labels = None +depends_on = None + + +def upgrade(): + # Add is_default column to email_configs table + op.add_column('email_configs', sa.Column('is_default', sa.Boolean(), nullable=False, server_default='0')) + + +def downgrade(): + # Remove is_default column from email_configs table + op.drop_column('email_configs', 'is_default') diff --git a/hesabixUI/hesabix_ui/lib/core/referral_store.dart b/hesabixUI/hesabix_ui/lib/core/referral_store.dart index 1aff516..5050e91 100644 --- a/hesabixUI/hesabix_ui/lib/core/referral_store.dart +++ b/hesabixUI/hesabix_ui/lib/core/referral_store.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/foundation.dart'; import 'package:shared_preferences/shared_preferences.dart'; class ReferralStore { diff --git a/hesabixUI/hesabix_ui/lib/core/splash_controller.dart b/hesabixUI/hesabix_ui/lib/core/splash_controller.dart new file mode 100644 index 0000000..55d7b8f --- /dev/null +++ b/hesabixUI/hesabix_ui/lib/core/splash_controller.dart @@ -0,0 +1,76 @@ +import 'dart:async'; +import 'package:flutter/material.dart'; + +class SplashController extends ChangeNotifier { + static const Duration _minimumSplashDuration = Duration(seconds: 2); + + bool _isLoading = true; + DateTime? _startTime; + Timer? _minimumDurationTimer; + Completerسلام $userName،
+به حسابیکس خوش آمدید! امیدواریم تجربه خوبی داشته باشید.
+با احترام
تیم حسابیکس
برای بازیابی رمز عبور روی لینک زیر کلیک کنید:
+ +این لینک تا 1 ساعت معتبر است.
+ ''', + )); + } + + /// Send notification email + Future$message
+ ''', + )); + } + + /// Send custom email + Future