fixing issues of integration with wordpress plugin
This commit is contained in:
@@ -217,6 +217,7 @@ class IntegrationService:
|
||||
dict: Connection test result with detailed health status
|
||||
"""
|
||||
import requests
|
||||
from django.utils import timezone
|
||||
|
||||
config = integration.config_json
|
||||
|
||||
@@ -324,13 +325,6 @@ class IntegrationService:
|
||||
health_checks['plugin_has_api_key']
|
||||
)
|
||||
|
||||
# Save site_url to config if successful and not already set
|
||||
if is_healthy and not config.get('site_url'):
|
||||
config['site_url'] = site_url
|
||||
integration.config_json = config
|
||||
integration.save(update_fields=['config_json'])
|
||||
logger.info(f"[IntegrationService] Saved site_url to integration {integration.id} config: {site_url}")
|
||||
|
||||
# Build response message
|
||||
if is_healthy:
|
||||
message = "✅ WordPress integration is connected and authenticated via API key"
|
||||
@@ -347,6 +341,28 @@ class IntegrationService:
|
||||
else:
|
||||
message = "❌ WordPress connection failed"
|
||||
|
||||
# Update integration status based on connection test result
|
||||
if is_healthy:
|
||||
integration.sync_status = 'success'
|
||||
integration.sync_error = None
|
||||
integration.last_sync_at = timezone.now()
|
||||
logger.info(f"[IntegrationService] Connection test passed, set sync_status to 'success' for integration {integration.id}")
|
||||
else:
|
||||
integration.sync_status = 'failed'
|
||||
integration.sync_error = message
|
||||
logger.warning(f"[IntegrationService] Connection test failed, set sync_status to 'failed' for integration {integration.id}")
|
||||
|
||||
# Save site_url to config if successful and not already set
|
||||
if is_healthy and not config.get('site_url'):
|
||||
config['site_url'] = site_url
|
||||
integration.config_json = config
|
||||
|
||||
# Save all changes to integration
|
||||
integration.save()
|
||||
|
||||
if is_healthy and not config.get('site_url'):
|
||||
logger.info(f"[IntegrationService] Saved site_url to integration {integration.id} config: {site_url}")
|
||||
|
||||
return {
|
||||
'success': is_healthy,
|
||||
'fully_functional': is_healthy,
|
||||
|
||||
@@ -127,33 +127,22 @@ class PublisherService:
|
||||
# Get destination config
|
||||
destination_config = {}
|
||||
|
||||
# If content has site, try to get integration config
|
||||
# Get WordPress config directly from Site model (no SiteIntegration needed)
|
||||
if hasattr(content, 'site') and content.site:
|
||||
from igny8_core.business.integration.models import SiteIntegration
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🔍 Looking for integration: site={content.site.name}, platform={destination}")
|
||||
integration = SiteIntegration.objects.filter(
|
||||
site=content.site,
|
||||
platform=destination,
|
||||
is_active=True
|
||||
).first()
|
||||
site = content.site
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🔍 Getting config from site: {site.name}")
|
||||
|
||||
if integration:
|
||||
logger.info(f"[PublisherService._publish_to_destination] ✅ Integration found: id={integration.id}")
|
||||
# Merge config_json (site_url, etc.)
|
||||
destination_config.update(integration.config_json or {})
|
||||
|
||||
# API key is stored in Site.wp_api_key (SINGLE source of truth)
|
||||
if integration.site.wp_api_key:
|
||||
destination_config['api_key'] = integration.site.wp_api_key
|
||||
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🔑 Config merged: has_api_key={bool(destination_config.get('api_key'))}, has_site_url={bool(destination_config.get('site_url'))}")
|
||||
|
||||
# Ensure site_url is set (from config or from site model)
|
||||
if not destination_config.get('site_url'):
|
||||
destination_config['site_url'] = content.site.url
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🌐 Using site.url: {content.site.url}")
|
||||
# API key is stored in Site.wp_api_key (SINGLE source of truth)
|
||||
if site.wp_api_key:
|
||||
destination_config['api_key'] = site.wp_api_key
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🔑 API key found on site")
|
||||
else:
|
||||
logger.warning(f"[PublisherService._publish_to_destination] ⚠️ No integration found for site={content.site.name}, platform={destination}")
|
||||
logger.error(f"[PublisherService._publish_to_destination] ❌ No API key found on site {site.name}")
|
||||
raise ValueError(f"WordPress API key not configured for site {site.name}. Please generate an API key in Site Settings.")
|
||||
|
||||
# Use Site.domain as site_url
|
||||
destination_config['site_url'] = site.domain or site.url
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🌐 Using site URL: {destination_config['site_url']}")
|
||||
|
||||
# Publish via adapter
|
||||
logger.info(f"[PublisherService._publish_to_destination] 🚀 Calling adapter.publish() with config keys: {list(destination_config.keys())}")
|
||||
|
||||
Reference in New Issue
Block a user