stage 1
This commit is contained in:
alorig
131
CHANGELOG.md
131
CHANGELOG.md
@@ -22,6 +22,137 @@ Each entry follows this format:
|
||||
|
||||
---
|
||||
|
||||
## [1.0.0] - Stage 1 Backend Refactor - 2025-11-24
|
||||
|
||||
### 🔴 Breaking Changes - Models Refactored
|
||||
|
||||
#### Cluster Model - Simplified to Pure Topics
|
||||
- **REMOVED:** `context_type` field (topic/attribute/service_line choices)
|
||||
- **REMOVED:** `dimension_meta` JSONField
|
||||
- **REMOVED:** `context_type` database index
|
||||
- **RESULT:** Clusters are now pure topic clusters without dimension/role metadata
|
||||
- **Files:** `backend/igny8_core/business/planning/models.py`
|
||||
|
||||
#### Task Model - Content Type Architecture
|
||||
- **REMOVED:** `cluster_role` field (hub/supporting/attribute)
|
||||
- **REMOVED:** `entity_type` field (replaced with `content_type`)
|
||||
- **REMOVED:** `keywords` CharField (legacy comma-separated)
|
||||
- **REMOVED:** `keyword_objects` M2M (renamed to `keywords`)
|
||||
- **REMOVED:** `idea` ForeignKey to ContentIdeas
|
||||
- **REMOVED:** `taxonomy` ForeignKey to SiteBlueprintTaxonomy
|
||||
- **REMOVED:** STATUS CHOICES: `in_progress`, `failed`
|
||||
- **ADDED:** `content_type` CharField (required, indexed) - post, page, product, service, category, tag, etc.
|
||||
- **ADDED:** `content_structure` CharField (required, indexed) - article, listicle, guide, comparison, product_page, etc.
|
||||
- **ADDED:** `taxonomy_term` ForeignKey to ContentTaxonomy (nullable)
|
||||
- **CHANGED:** `cluster` ForeignKey now REQUIRED (blank=False)
|
||||
- **CHANGED:** `keywords` M2M to planner.Keywords
|
||||
- **CHANGED:** `status` choices: queued, completed only
|
||||
- **Files:** `backend/igny8_core/business/content/models.py`
|
||||
|
||||
#### Content Model - Simplified Content Management
|
||||
- **REMOVED:** `task` OneToOneField to Tasks
|
||||
- **REMOVED:** `cluster_role` CharField
|
||||
- **REMOVED:** `sync_status` CharField (native/imported/synced)
|
||||
- **REMOVED:** `entity_type` (replaced with `content_type`)
|
||||
- **REMOVED:** `content_format` (replaced with `content_structure`)
|
||||
- **REMOVED:** `word_count`, `metadata`, `meta_title`, `meta_description`, `primary_keyword`, `secondary_keywords`
|
||||
- **REMOVED:** `sync_metadata`, `internal_links`, `linker_version`, `optimizer_version`, `optimization_scores`
|
||||
- **REMOVED:** `external_type`, `json_blocks`, `structure_data`
|
||||
- **REMOVED:** `taxonomies` M2M through ContentTaxonomyRelation
|
||||
- **REMOVED:** `generated_at` field
|
||||
- **REMOVED:** `ContentTaxonomyRelation` through model
|
||||
- **ADDED:** `title` CharField (required, indexed)
|
||||
- **ADDED:** `content_html` TextField (renamed from html_content)
|
||||
- **ADDED:** `content_type` CharField (required, indexed)
|
||||
- **ADDED:** `content_structure` CharField (required, indexed)
|
||||
- **ADDED:** `taxonomy_terms` M2M to ContentTaxonomy (direct, no through model)
|
||||
- **CHANGED:** `cluster` ForeignKey now REQUIRED (blank=False)
|
||||
- **CHANGED:** `external_id` now indexed
|
||||
- **CHANGED:** `source` choices: igny8, wordpress only
|
||||
- **CHANGED:** `status` choices: draft, published only
|
||||
- **Files:** `backend/igny8_core/business/content/models.py`
|
||||
|
||||
#### ContentTaxonomy Model - WordPress + Cluster Taxonomies
|
||||
- **REMOVED:** `sync_status` CharField (native/imported/synced)
|
||||
- **REMOVED:** `description` TextField
|
||||
- **REMOVED:** `parent` ForeignKey (hierarchical support)
|
||||
- **REMOVED:** `count` IntegerField (WordPress count)
|
||||
- **REMOVED:** `metadata` JSONField
|
||||
- **REMOVED:** `clusters` M2M to planner.Clusters
|
||||
- **MODIFIED:** `taxonomy_type` CHOICES updated:
|
||||
- Renamed: `product_cat` → `product_category`
|
||||
- Renamed: `product_attr` → `product_attribute`
|
||||
- **NEW:** `cluster` - IGNY8-native cluster-mapped taxonomy
|
||||
- **CHANGED:** `external_taxonomy` now nullable (null for cluster taxonomies)
|
||||
- **CHANGED:** `external_id` now nullable (null for cluster taxonomies)
|
||||
- **Files:** `backend/igny8_core/business/content/models.py`
|
||||
|
||||
### Changed - Serializers Updated
|
||||
|
||||
#### ClusterSerializer
|
||||
- **REMOVED:** `context_type` field exposure
|
||||
- **REMOVED:** `context_type_display` computed field
|
||||
- **REMOVED:** `dimension_meta` field exposure
|
||||
- **REMOVED:** Feature flag checks for Stage 1 fields
|
||||
- **Files:** `backend/igny8_core/modules/planner/serializers.py`
|
||||
|
||||
### 📚 Documentation Updated
|
||||
|
||||
- ✅ Created `STAGE_1_REFACTOR_COMPLETE_SUMMARY.md` with complete implementation guide
|
||||
- ✅ Documented all model changes with before/after comparison
|
||||
- ✅ Provided migration commands and verification steps
|
||||
- ✅ Added Django admin verification checklist
|
||||
- ✅ Added API endpoint test examples
|
||||
- ✅ Added frontend verification checklist
|
||||
- ✅ Updated flow diagrams for Planner → Writer → ContentManager → WP Publish
|
||||
- ✅ Documented WordPress import flow
|
||||
|
||||
### ⚠️ Migration Required
|
||||
|
||||
**Run these commands to apply model changes:**
|
||||
|
||||
```powershell
|
||||
cd backend
|
||||
python manage.py makemigrations planner --name "stage1_remove_cluster_context_fields"
|
||||
python manage.py makemigrations writer --name "stage1_refactor_task_content_taxonomy"
|
||||
python manage.py migrate planner
|
||||
python manage.py migrate writer
|
||||
```
|
||||
|
||||
**⚠️ WARNING:** This is a DESTRUCTIVE migration. Backup your database before running.
|
||||
|
||||
### 🚧 Remaining Work (In Progress)
|
||||
|
||||
#### Serializers (Partial)
|
||||
- ⚠️ TasksSerializer needs update for new fields
|
||||
- ⚠️ ContentSerializer needs update for new fields
|
||||
- ⚠️ ContentTaxonomySerializer needs sync_status removed
|
||||
|
||||
#### API Endpoints (Not Started)
|
||||
- ⚠️ Task creation endpoint requires cluster + content_type + content_structure
|
||||
- ⚠️ Content creation endpoint requires new field structure
|
||||
- ⚠️ Publish endpoint needs status + external_id logic update
|
||||
- ⚠️ WordPress import endpoint needs source='wordpress' logic
|
||||
|
||||
#### Services (Not Started)
|
||||
- ⚠️ Content generation service needs update for new Content structure
|
||||
- ⚠️ WordPress publish service needs simplification (remove sync_status)
|
||||
- ⚠️ WordPress import service needs ContentTaxonomy auto-creation
|
||||
|
||||
#### Frontend (Stage 2)
|
||||
- ⚠️ React components need update for new API structure
|
||||
- ⚠️ Forms need content_type + content_structure fields
|
||||
- ⚠️ Remove cluster_role, sync_status UI elements
|
||||
|
||||
### 📖 References
|
||||
|
||||
- **Complete Summary:** `STAGE_1_REFACTOR_COMPLETE_SUMMARY.md`
|
||||
- **Master Reference:** `MASTER_REFERENCE.md` (needs update)
|
||||
- **Implementation Audit:** `IMPLEMENTATION_AUDIT_REPORT.md`
|
||||
- **Workflow Guide:** `planner-writer-workflow.md`
|
||||
|
||||
---
|
||||
|
||||
## [1.0.1] - 2025-11-24
|
||||
|
||||
### Changed
|
||||
|
||||
831
STAGE_1_EXECUTION_REPORT.md
Normal file
831
STAGE_1_EXECUTION_REPORT.md
Normal file
@@ -0,0 +1,831 @@
|
||||
# STAGE 1 BACKEND REFACTOR - EXECUTION REPORT
|
||||
|
||||
**Date:** November 24, 2025
|
||||
**Status:** ✅ **MODELS REFACTORED** | ⚠️ **SERIALIZERS PARTIAL** | ❌ **ENDPOINTS & SERVICES PENDING**
|
||||
**Execution Time:** ~2 hours
|
||||
**Files Modified:** 4 files
|
||||
**Files Created:** 2 documentation files
|
||||
|
||||
---
|
||||
|
||||
## 📊 EXECUTION SUMMARY
|
||||
|
||||
### ✅ COMPLETED WORK
|
||||
|
||||
#### Part A: Model Refactor (100% Complete)
|
||||
|
||||
**Files Modified:**
|
||||
1. ✅ `backend/igny8_core/business/planning/models.py` - Cluster model simplified
|
||||
2. ✅ `backend/igny8_core/business/content/models.py` - Task, Content, ContentTaxonomy refactored
|
||||
|
||||
**Models Changed:**
|
||||
- ✅ **Cluster** - Removed `context_type`, `dimension_meta` (2 fields removed)
|
||||
- ✅ **Task** - Removed 7 fields, added 3 fields, changed 2 fields
|
||||
- ✅ **Content** - Removed 25+ fields, added 5 fields, changed 4 fields, removed through model
|
||||
- ✅ **ContentTaxonomy** - Removed 6 fields, modified 2 fields, added 1 taxonomy type
|
||||
|
||||
---
|
||||
|
||||
#### Part B: Serializers Update (30% Complete)
|
||||
|
||||
**Files Modified:**
|
||||
1. ✅ `backend/igny8_core/modules/planner/serializers.py` - ClusterSerializer updated
|
||||
|
||||
**Serializers Changed:**
|
||||
- ✅ **ClusterSerializer** - Removed `context_type`, `dimension_meta` exposure
|
||||
|
||||
**Serializers Pending:**
|
||||
- ⚠️ **TasksSerializer** - Needs update for `content_type`, `content_structure`, `taxonomy_term`
|
||||
- ⚠️ **ContentSerializer** - Needs update for new field structure
|
||||
- ⚠️ **ContentTaxonomySerializer** - Needs `sync_status` removal
|
||||
|
||||
---
|
||||
|
||||
#### Part H: Documentation Update (100% Complete)
|
||||
|
||||
**Files Created:**
|
||||
1. ✅ `STAGE_1_REFACTOR_COMPLETE_SUMMARY.md` - Complete implementation guide
|
||||
2. ✅ `STAGE_1_EXECUTION_REPORT.md` - This file
|
||||
|
||||
**Files Modified:**
|
||||
1. ✅ `CHANGELOG.md` - Added Stage 1 refactor entry
|
||||
|
||||
**Documentation Includes:**
|
||||
- ✅ Before/after model comparison for all 4 models
|
||||
- ✅ Migration commands and verification steps
|
||||
- ✅ Django admin verification checklist
|
||||
- ✅ API endpoint test examples (curl commands)
|
||||
- ✅ Frontend verification checklist
|
||||
- ✅ Test suggestions for future configuration
|
||||
|
||||
---
|
||||
|
||||
## 📝 DETAILED CHANGES
|
||||
|
||||
### 1. Cluster Model Changes
|
||||
|
||||
**File:** `backend/igny8_core/business/planning/models.py`
|
||||
|
||||
**REMOVED:**
|
||||
```python
|
||||
# OLD (Before)
|
||||
context_type = models.CharField(
|
||||
max_length=50,
|
||||
choices=CONTEXT_TYPE_CHOICES,
|
||||
default='topic',
|
||||
help_text="Primary dimension for this cluster (topic, attribute, service line)"
|
||||
)
|
||||
dimension_meta = models.JSONField(
|
||||
default=dict,
|
||||
blank=True,
|
||||
help_text="Extended metadata (taxonomy hints, attribute suggestions, coverage targets)"
|
||||
)
|
||||
```
|
||||
|
||||
**NEW:**
|
||||
```python
|
||||
# NEW (After)
|
||||
# Cluster is now a pure topic cluster - no context_type or dimension_meta
|
||||
```
|
||||
|
||||
**Index Changes:**
|
||||
- Removed: `models.Index(fields=['context_type'])`
|
||||
|
||||
**Impact:**
|
||||
- ✅ Simplifies cluster model to pure semantic topics
|
||||
- ✅ Removes confusing multi-dimensional cluster types
|
||||
- ⚠️ Existing `context_type` and `dimension_meta` data will be lost in migration
|
||||
|
||||
---
|
||||
|
||||
### 2. Task Model Changes
|
||||
|
||||
**File:** `backend/igny8_core/business/content/models.py`
|
||||
|
||||
**REMOVED:**
|
||||
```python
|
||||
# OLD (Before)
|
||||
cluster_role = models.CharField(...) # hub, supporting, attribute
|
||||
entity_type = models.CharField(...) # post, page, product, service, taxonomy_term
|
||||
keywords = models.CharField(max_length=500, blank=True) # Comma-separated (legacy)
|
||||
keyword_objects = models.ManyToManyField(...) # Individual keywords
|
||||
idea = models.ForeignKey('planner.ContentIdeas', ...)
|
||||
taxonomy = models.ForeignKey('site_building.SiteBlueprintTaxonomy', ...)
|
||||
|
||||
# STATUS_CHOICES removed: 'in_progress', 'failed'
|
||||
```
|
||||
|
||||
**ADDED:**
|
||||
```python
|
||||
# NEW (After)
|
||||
content_type = models.CharField(
|
||||
max_length=100,
|
||||
db_index=True,
|
||||
help_text="Content type: post, page, product, service, category, tag, etc."
|
||||
)
|
||||
content_structure = models.CharField(
|
||||
max_length=100,
|
||||
db_index=True,
|
||||
help_text="Content structure/format: article, listicle, guide, comparison, product_page, etc."
|
||||
)
|
||||
taxonomy_term = models.ForeignKey(
|
||||
'ContentTaxonomy',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name='tasks',
|
||||
help_text="Optional taxonomy term assignment"
|
||||
)
|
||||
keywords = models.ManyToManyField( # Renamed from keyword_objects
|
||||
'planner.Keywords',
|
||||
blank=True,
|
||||
related_name='tasks'
|
||||
)
|
||||
```
|
||||
|
||||
**CHANGED:**
|
||||
```python
|
||||
# Cluster now required
|
||||
cluster = models.ForeignKey(
|
||||
'planner.Clusters',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=False, # Changed from blank=True
|
||||
required=True # Enforced
|
||||
)
|
||||
|
||||
# Status simplified
|
||||
STATUS_CHOICES = [
|
||||
('queued', 'Queued'),
|
||||
('completed', 'Completed'), # Only 2 states now
|
||||
]
|
||||
```
|
||||
|
||||
**Impact:**
|
||||
- ✅ Clear separation of content type vs. structure
|
||||
- ✅ Direct link to taxonomy terms
|
||||
- ✅ Simplified status workflow (queued → completed)
|
||||
- ⚠️ Existing `cluster_role`, `entity_type`, `idea`, `taxonomy` data will be lost
|
||||
|
||||
---
|
||||
|
||||
### 3. Content Model Changes
|
||||
|
||||
**File:** `backend/igny8_core/business/content/models.py`
|
||||
|
||||
**REMOVED (Major Fields):**
|
||||
```python
|
||||
# OLD (Before)
|
||||
task = models.OneToOneField(Tasks, ...)
|
||||
cluster_role = models.CharField(...)
|
||||
sync_status = models.CharField(...) # native, imported, synced
|
||||
entity_type = models.CharField(...)
|
||||
content_format = models.CharField(...)
|
||||
html_content = models.TextField(...) # Renamed to content_html
|
||||
word_count = models.IntegerField(...)
|
||||
metadata = models.JSONField(...)
|
||||
meta_title = models.CharField(...)
|
||||
meta_description = models.TextField(...)
|
||||
primary_keyword = models.CharField(...)
|
||||
secondary_keywords = models.JSONField(...)
|
||||
sync_metadata = models.JSONField(...)
|
||||
internal_links = models.JSONField(...)
|
||||
linker_version = models.IntegerField(...)
|
||||
optimizer_version = models.IntegerField(...)
|
||||
optimization_scores = models.JSONField(...)
|
||||
external_type = models.CharField(...)
|
||||
json_blocks = models.JSONField(...)
|
||||
structure_data = models.JSONField(...)
|
||||
taxonomies = models.ManyToManyField(..., through='ContentTaxonomyRelation') # Through model removed
|
||||
generated_at = models.DateTimeField(...) # Replaced with created_at
|
||||
```
|
||||
|
||||
**ADDED:**
|
||||
```python
|
||||
# NEW (After)
|
||||
title = models.CharField(max_length=255, db_index=True) # Required now
|
||||
content_html = models.TextField(help_text="Final HTML content")
|
||||
content_type = models.CharField(max_length=100, db_index=True)
|
||||
content_structure = models.CharField(max_length=100, db_index=True)
|
||||
taxonomy_terms = models.ManyToManyField(
|
||||
'ContentTaxonomy',
|
||||
blank=True,
|
||||
related_name='contents', # Direct M2M, no through model
|
||||
help_text="Associated taxonomy terms (categories, tags, attributes)"
|
||||
)
|
||||
```
|
||||
|
||||
**CHANGED:**
|
||||
```python
|
||||
# Cluster now required
|
||||
cluster = models.ForeignKey(
|
||||
'planner.Clusters',
|
||||
null=True,
|
||||
blank=False, # Required
|
||||
)
|
||||
|
||||
# Source simplified
|
||||
SOURCE_CHOICES = [
|
||||
('igny8', 'IGNY8 Generated'),
|
||||
('wordpress', 'WordPress Imported'), # Only 2 choices now
|
||||
]
|
||||
|
||||
# Status simplified
|
||||
STATUS_CHOICES = [
|
||||
('draft', 'Draft'),
|
||||
('published', 'Published'), # Only 2 states now
|
||||
]
|
||||
|
||||
# External ID indexed
|
||||
external_id = models.CharField(..., db_index=True) # Added index
|
||||
```
|
||||
|
||||
**REMOVED:**
|
||||
```python
|
||||
# Through model deleted
|
||||
class ContentTaxonomyRelation(models.Model): # DELETED
|
||||
...
|
||||
```
|
||||
|
||||
**Impact:**
|
||||
- ✅ Greatly simplified content model
|
||||
- ✅ Removed SEO/optimization fields (to be handled separately)
|
||||
- ✅ Direct M2M to taxonomies (no through model complexity)
|
||||
- ✅ Clear source tracking (igny8 vs wordpress)
|
||||
- ⚠️ Loss of detailed SEO metadata (can be re-added later if needed)
|
||||
- ⚠️ Loss of linker/optimizer tracking (refactor separately)
|
||||
|
||||
---
|
||||
|
||||
### 4. ContentTaxonomy Model Changes
|
||||
|
||||
**File:** `backend/igny8_core/business/content/models.py`
|
||||
|
||||
**REMOVED:**
|
||||
```python
|
||||
# OLD (Before)
|
||||
sync_status = models.CharField(...) # native, imported, synced
|
||||
description = models.TextField(...)
|
||||
parent = models.ForeignKey('self', ...) # Hierarchical support
|
||||
count = models.IntegerField(...) # WordPress count
|
||||
metadata = models.JSONField(...)
|
||||
clusters = models.ManyToManyField('planner.Clusters', ...)
|
||||
```
|
||||
|
||||
**MODIFIED:**
|
||||
```python
|
||||
# Taxonomy type choices updated
|
||||
TAXONOMY_TYPE_CHOICES = [
|
||||
('category', 'Category'),
|
||||
('tag', 'Tag'),
|
||||
('product_category', 'Product Category'), # Renamed from product_cat
|
||||
('product_attribute', 'Product Attribute'), # Renamed from product_attr
|
||||
('cluster', 'Cluster Taxonomy'), # NEW - IGNY8-native cluster taxonomies
|
||||
]
|
||||
|
||||
# External fields now nullable
|
||||
external_taxonomy = models.CharField(
|
||||
max_length=100,
|
||||
blank=True,
|
||||
null=True, # NEW - null for cluster taxonomies
|
||||
help_text="WordPress taxonomy slug (category, post_tag, product_cat, pa_*) - null for cluster taxonomies"
|
||||
)
|
||||
external_id = models.IntegerField(
|
||||
null=True,
|
||||
blank=True, # Already nullable, but clarified
|
||||
help_text="WordPress term_id - null for cluster taxonomies"
|
||||
)
|
||||
```
|
||||
|
||||
**Impact:**
|
||||
- ✅ Added support for IGNY8-native cluster taxonomies
|
||||
- ✅ Removed confusing sync_status (source is tracked on Content, not Taxonomy)
|
||||
- ✅ Simplified taxonomy model
|
||||
- ⚠️ Loss of hierarchical taxonomy support (can be re-added if needed)
|
||||
- ⚠️ Loss of cluster mapping (taxonomies are now simple terms)
|
||||
|
||||
---
|
||||
|
||||
## 🧪 TESTING & VERIFICATION GUIDE
|
||||
|
||||
### Part F: Test Suggestions for Future Configuration
|
||||
|
||||
#### 1. Django Model Tests
|
||||
|
||||
**File to create:** `backend/igny8_core/business/content/tests/test_models.py`
|
||||
|
||||
```python
|
||||
import pytest
|
||||
from django.core.exceptions import ValidationError
|
||||
from igny8_core.business.planning.models import Clusters
|
||||
from igny8_core.business.content.models import Tasks, Content, ContentTaxonomy
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestClusterModel:
|
||||
def test_cluster_creation_without_context_type(self):
|
||||
"""Verify Cluster can be created without context_type"""
|
||||
cluster = Clusters.objects.create(
|
||||
name="Test Cluster",
|
||||
description="Test description",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert cluster.id is not None
|
||||
assert not hasattr(cluster, 'context_type')
|
||||
|
||||
def test_cluster_is_pure_topic(self):
|
||||
"""Verify Cluster has no dimension_meta"""
|
||||
cluster = Clusters.objects.create(name="Topic Cluster", site=site, sector=sector)
|
||||
assert not hasattr(cluster, 'dimension_meta')
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestTaskModel:
|
||||
def test_task_requires_cluster(self):
|
||||
"""Verify Task requires cluster"""
|
||||
with pytest.raises(ValidationError):
|
||||
task = Tasks.objects.create(
|
||||
title="Test Task",
|
||||
cluster=None, # Should fail
|
||||
content_type="post",
|
||||
content_structure="article",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
|
||||
def test_task_requires_content_type_and_structure(self):
|
||||
"""Verify Task requires content_type and content_structure"""
|
||||
task = Tasks.objects.create(
|
||||
title="Test Task",
|
||||
cluster=cluster,
|
||||
content_type="post",
|
||||
content_structure="article",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert task.content_type == "post"
|
||||
assert task.content_structure == "article"
|
||||
|
||||
def test_task_status_only_queued_or_completed(self):
|
||||
"""Verify Task status is only queued or completed"""
|
||||
task = Tasks.objects.create(
|
||||
title="Test Task",
|
||||
cluster=cluster,
|
||||
content_type="post",
|
||||
content_structure="article",
|
||||
status="queued",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert task.status in ["queued", "completed"]
|
||||
|
||||
# Try invalid status
|
||||
task.status = "in_progress"
|
||||
with pytest.raises(ValidationError):
|
||||
task.full_clean()
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestContentModel:
|
||||
def test_content_creation_with_required_fields(self):
|
||||
"""Verify Content can be created with new required fields"""
|
||||
content = Content.objects.create(
|
||||
title="Test Content",
|
||||
cluster=cluster,
|
||||
content_type="post",
|
||||
content_structure="article",
|
||||
content_html="<p>Test content</p>",
|
||||
source="igny8",
|
||||
status="draft",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert content.id is not None
|
||||
assert content.status == "draft"
|
||||
|
||||
def test_content_wordpress_import(self):
|
||||
"""Verify Content can be created from WordPress import"""
|
||||
content = Content.objects.create(
|
||||
title="WP Imported Content",
|
||||
cluster=cluster,
|
||||
content_type="post",
|
||||
content_structure="article",
|
||||
content_html="<p>WordPress content</p>",
|
||||
source="wordpress",
|
||||
status="draft",
|
||||
external_id="123",
|
||||
external_url="https://example.com/post/123",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert content.source == "wordpress"
|
||||
assert content.external_id == "123"
|
||||
|
||||
def test_content_taxonomy_terms_m2m(self):
|
||||
"""Verify Content.taxonomy_terms direct M2M works"""
|
||||
content = Content.objects.create(
|
||||
title="Test Content",
|
||||
cluster=cluster,
|
||||
content_type="post",
|
||||
content_structure="article",
|
||||
content_html="<p>Test</p>",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
taxonomy = ContentTaxonomy.objects.create(
|
||||
name="Test Category",
|
||||
slug="test-category",
|
||||
taxonomy_type="category",
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
content.taxonomy_terms.add(taxonomy)
|
||||
assert content.taxonomy_terms.count() == 1
|
||||
|
||||
@pytest.mark.django_db
|
||||
class TestContentTaxonomyModel:
|
||||
def test_wordpress_taxonomy_creation(self):
|
||||
"""Verify ContentTaxonomy can store WordPress taxonomies"""
|
||||
taxonomy = ContentTaxonomy.objects.create(
|
||||
name="WordPress Category",
|
||||
slug="wp-category",
|
||||
taxonomy_type="category",
|
||||
external_taxonomy="category",
|
||||
external_id=123,
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert taxonomy.external_id == 123
|
||||
assert taxonomy.taxonomy_type == "category"
|
||||
|
||||
def test_cluster_taxonomy_creation(self):
|
||||
"""Verify ContentTaxonomy can create IGNY8-native cluster taxonomies"""
|
||||
taxonomy = ContentTaxonomy.objects.create(
|
||||
name="Cluster Taxonomy",
|
||||
slug="cluster-taxonomy",
|
||||
taxonomy_type="cluster",
|
||||
external_taxonomy=None,
|
||||
external_id=None,
|
||||
site=site,
|
||||
sector=sector
|
||||
)
|
||||
assert taxonomy.taxonomy_type == "cluster"
|
||||
assert taxonomy.external_id is None
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
#### 2. Django Admin Verification Steps
|
||||
|
||||
**After migrations are run, verify in Django Admin:**
|
||||
|
||||
```powershell
|
||||
python manage.py runserver
|
||||
# Navigate to http://localhost:8000/admin/
|
||||
```
|
||||
|
||||
**Checklist:**
|
||||
|
||||
##### Clusters (`/admin/planner/clusters/`)
|
||||
- [ ] Can create new cluster without `context_type` field
|
||||
- [ ] No `dimension_meta` field visible in form
|
||||
- [ ] All other fields present: name, description, status
|
||||
- [ ] Cluster list view shows correct columns
|
||||
|
||||
##### Tasks (`/admin/writer/tasks/`)
|
||||
- [ ] Can create new task with `content_type` dropdown
|
||||
- [ ] Can create new task with `content_structure` dropdown
|
||||
- [ ] Can select `taxonomy_term` from dropdown (optional)
|
||||
- [ ] `cluster` field is REQUIRED (cannot save without it)
|
||||
- [ ] NO `cluster_role` field visible
|
||||
- [ ] NO `entity_type` field visible
|
||||
- [ ] Status dropdown shows only: queued, completed
|
||||
- [ ] Keywords M2M widget works
|
||||
|
||||
##### Content (`/admin/writer/content/`)
|
||||
- [ ] Can create new content with `title` field (required)
|
||||
- [ ] Can create new content with `content_type` dropdown
|
||||
- [ ] Can create new content with `content_structure` dropdown
|
||||
- [ ] Can select `taxonomy_terms` M2M widget
|
||||
- [ ] `cluster` field is REQUIRED
|
||||
- [ ] Source dropdown shows only: igny8, wordpress
|
||||
- [ ] Status dropdown shows only: draft, published
|
||||
- [ ] NO `cluster_role` field visible
|
||||
- [ ] NO `sync_status` field visible
|
||||
- [ ] NO `task` field visible
|
||||
- [ ] External ID and URL fields work for WordPress content
|
||||
|
||||
##### ContentTaxonomy (`/admin/writer/contenttaxonomy/`)
|
||||
- [ ] Can create new taxonomy with `taxonomy_type` dropdown
|
||||
- [ ] Taxonomy type includes "Cluster Taxonomy" choice
|
||||
- [ ] NO `sync_status` field visible
|
||||
- [ ] `external_taxonomy` can be null
|
||||
- [ ] `external_id` can be null
|
||||
- [ ] Can create cluster taxonomy with null external fields
|
||||
|
||||
---
|
||||
|
||||
#### 3. API Endpoint Verification (After Serializer/View Updates)
|
||||
|
||||
**Test Task Creation:**
|
||||
|
||||
```powershell
|
||||
curl -X POST http://localhost:8000/api/v1/writer/tasks/ \
|
||||
-H "Authorization: Bearer YOUR_TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"title": "Test Task",
|
||||
"description": "Test description",
|
||||
"cluster_id": 1,
|
||||
"content_type": "post",
|
||||
"content_structure": "article",
|
||||
"status": "queued"
|
||||
}'
|
||||
```
|
||||
|
||||
**Expected Response:**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": {
|
||||
"id": 123,
|
||||
"title": "Test Task",
|
||||
"cluster_id": 1,
|
||||
"cluster_name": "Test Cluster",
|
||||
"content_type": "post",
|
||||
"content_structure": "article",
|
||||
"status": "queued",
|
||||
"created_at": "2025-11-24T10:00:00Z"
|
||||
},
|
||||
"message": "Task created successfully"
|
||||
}
|
||||
```
|
||||
|
||||
**Test Content Creation:**
|
||||
|
||||
```powershell
|
||||
curl -X POST http://localhost:8000/api/v1/writer/content/ \
|
||||
-H "Authorization: Bearer YOUR_TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"title": "Test Content",
|
||||
"cluster_id": 1,
|
||||
"content_type": "post",
|
||||
"content_structure": "article",
|
||||
"content_html": "<p>Test content HTML</p>",
|
||||
"source": "igny8",
|
||||
"status": "draft"
|
||||
}'
|
||||
```
|
||||
|
||||
**Expected Response:**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"data": {
|
||||
"id": 456,
|
||||
"title": "Test Content",
|
||||
"cluster_id": 1,
|
||||
"content_type": "post",
|
||||
"content_structure": "article",
|
||||
"content_html": "<p>Test content HTML</p>",
|
||||
"source": "igny8",
|
||||
"status": "draft",
|
||||
"external_id": null,
|
||||
"external_url": null,
|
||||
"created_at": "2025-11-24T10:00:00Z"
|
||||
},
|
||||
"message": "Content created successfully"
|
||||
}
|
||||
```
|
||||
|
||||
**Test WordPress Content Import:**
|
||||
|
||||
```powershell
|
||||
curl -X POST http://localhost:8000/api/v1/integration/wordpress/import/ \
|
||||
-H "Authorization: Bearer YOUR_TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"post_id": 123,
|
||||
"post_type": "post",
|
||||
"title": "WordPress Post Title",
|
||||
"content": "<p>WordPress content</p>",
|
||||
"permalink": "https://example.com/post/123",
|
||||
"taxonomies": [
|
||||
{"term_id": 1, "taxonomy": "category", "name": "News"},
|
||||
{"term_id": 5, "taxonomy": "post_tag", "name": "Technology"}
|
||||
]
|
||||
}'
|
||||
```
|
||||
|
||||
**Expected Behavior:**
|
||||
- Creates Content with `source='wordpress'`, `external_id='123'`, `external_url='https://example.com/post/123'`
|
||||
- Auto-creates/updates ContentTaxonomy entries for categories and tags
|
||||
- Links Content.taxonomy_terms to created taxonomies
|
||||
|
||||
---
|
||||
|
||||
#### 4. Frontend Verification Checklist (After Serializer Updates)
|
||||
|
||||
**Planner - Clusters Page (`/planner/clusters`)**
|
||||
- [ ] Cluster list shows clusters without context_type column
|
||||
- [ ] Cluster creation modal does NOT show context_type or dimension_meta fields
|
||||
- [ ] Cluster edit modal does NOT show context_type or dimension_meta fields
|
||||
- [ ] All clusters display correctly in table
|
||||
|
||||
**Writer - Tasks Page (`/writer/tasks`)**
|
||||
- [ ] Task creation modal shows:
|
||||
- [ ] `Content Type` dropdown (post, page, product, service, category, tag)
|
||||
- [ ] `Content Structure` dropdown (article, listicle, guide, comparison, product_page, etc.)
|
||||
- [ ] `Cluster` dropdown (REQUIRED, cannot submit without selection)
|
||||
- [ ] `Taxonomy Term` dropdown (OPTIONAL)
|
||||
- [ ] Task creation modal does NOT show:
|
||||
- [ ] `cluster_role` field
|
||||
- [ ] `entity_type` field
|
||||
- [ ] `idea` field
|
||||
- [ ] `taxonomy` field
|
||||
- [ ] Task list table shows:
|
||||
- [ ] `content_type` column
|
||||
- [ ] `content_structure` column
|
||||
- [ ] Status filter: queued, completed only
|
||||
- [ ] Task detail view shows new fields
|
||||
|
||||
**Writer - Content Page (`/writer/content`)**
|
||||
- [ ] Content list shows:
|
||||
- [ ] `Title` column
|
||||
- [ ] `Content Type` column
|
||||
- [ ] `Content Structure` column
|
||||
- [ ] `Source` column (igny8, wordpress)
|
||||
- [ ] `Status` column (draft, published)
|
||||
- [ ] Content list does NOT show:
|
||||
- [ ] `sync_status` column
|
||||
- [ ] `cluster_role` column
|
||||
- [ ] Content filters include:
|
||||
- [ ] `content_type` filter
|
||||
- [ ] `source` filter (igny8, wordpress)
|
||||
- [ ] `status` filter (draft, published)
|
||||
- [ ] Content detail view shows:
|
||||
- [ ] Taxonomy terms (M2M pills/chips)
|
||||
- [ ] External ID (if WordPress content)
|
||||
- [ ] External URL (if WordPress content)
|
||||
|
||||
**Content Manager (`/sites/:id/content`)**
|
||||
- [ ] Shows ALL content types (posts, pages, products, services)
|
||||
- [ ] Filters by `content_type`
|
||||
- [ ] Filters by `source` (igny8, wordpress)
|
||||
- [ ] Filters by `status` (draft, published)
|
||||
- [ ] Shows imported WordPress content with external_id badge
|
||||
|
||||
---
|
||||
|
||||
## 📋 MIGRATION FILES TO RUN
|
||||
|
||||
### Step 1: Generate Migrations
|
||||
|
||||
```powershell
|
||||
cd e:\Projects\All Personal Projects\Digital Projects (Ecom Stores & IT Services)\Development\GIT\igny8-app\igny8\backend
|
||||
|
||||
# Activate virtual environment
|
||||
.\.venv\Scripts\Activate.ps1
|
||||
|
||||
# Generate migrations for Cluster model
|
||||
python manage.py makemigrations planner --name "stage1_remove_cluster_context_fields"
|
||||
|
||||
# Generate migrations for Task, Content, ContentTaxonomy models
|
||||
python manage.py makemigrations writer --name "stage1_refactor_task_content_taxonomy"
|
||||
|
||||
# Review generated migrations
|
||||
python manage.py showmigrations planner writer
|
||||
```
|
||||
|
||||
### Step 2: Review Migrations
|
||||
|
||||
**Check generated migration files:**
|
||||
|
||||
1. `planner/migrations/XXXX_stage1_remove_cluster_context_fields.py`
|
||||
2. `writer/migrations/XXXX_stage1_refactor_task_content_taxonomy.py`
|
||||
|
||||
**Verify operations include:**
|
||||
- RemoveField for all deprecated fields
|
||||
- AddField for all new fields
|
||||
- AlterField for changed fields
|
||||
- RenameField for renamed fields
|
||||
- DeleteModel for ContentTaxonomyRelation
|
||||
- AlterIndexTogether for index changes
|
||||
|
||||
### Step 3: Backup Database
|
||||
|
||||
```powershell
|
||||
# Backup database
|
||||
python manage.py dumpdata > backup_$(Get-Date -Format 'yyyyMMdd_HHmmss').json
|
||||
|
||||
# OR for PostgreSQL
|
||||
pg_dump -U postgres -d igny8_db > backup_$(Get-Date -Format 'yyyyMMdd_HHmmss').sql
|
||||
```
|
||||
|
||||
### Step 4: Run Migrations
|
||||
|
||||
```powershell
|
||||
# Run migrations
|
||||
python manage.py migrate planner
|
||||
python manage.py migrate writer
|
||||
|
||||
# Verify migrations applied
|
||||
python manage.py showmigrations planner writer
|
||||
```
|
||||
|
||||
### Step 5: Verify Database Schema
|
||||
|
||||
```powershell
|
||||
# Check table structure
|
||||
python manage.py sqlmigrate planner XXXX
|
||||
python manage.py sqlmigrate writer XXXX
|
||||
|
||||
# OR connect to database and inspect
|
||||
python manage.py dbshell
|
||||
\d igny8_clusters;
|
||||
\d igny8_tasks;
|
||||
\d igny8_content;
|
||||
\d igny8_content_taxonomy_terms;
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 FINAL STATUS
|
||||
|
||||
### Summary of Changes
|
||||
|
||||
| Component | Status | Files Modified | Fields Removed | Fields Added | Fields Changed |
|
||||
|-----------|--------|----------------|----------------|--------------|----------------|
|
||||
| **Cluster Model** | ✅ Complete | 1 | 2 | 0 | 0 |
|
||||
| **Task Model** | ✅ Complete | 1 | 7 | 3 | 2 |
|
||||
| **Content Model** | ✅ Complete | 1 | 25+ | 5 | 4 |
|
||||
| **ContentTaxonomy** | ✅ Complete | 1 | 6 | 0 | 2 |
|
||||
| **ClusterSerializer** | ✅ Complete | 1 | 3 methods | 0 | 0 |
|
||||
| **Documentation** | ✅ Complete | 3 | N/A | N/A | N/A |
|
||||
| **Migrations** | ❌ Not Run | 0 | N/A | N/A | N/A |
|
||||
| **API Endpoints** | ❌ Pending | 0 | N/A | N/A | N/A |
|
||||
| **Services** | ❌ Pending | 0 | N/A | N/A | N/A |
|
||||
| **Frontend** | ❌ Pending | 0 | N/A | N/A | N/A |
|
||||
|
||||
---
|
||||
|
||||
## 🎯 NEXT STEPS
|
||||
|
||||
### Immediate (Required for Stage 1 Completion)
|
||||
|
||||
1. **Generate and Run Migrations**
|
||||
- Run `makemigrations` for planner and writer apps
|
||||
- Review generated migration files
|
||||
- Backup database
|
||||
- Run `migrate` commands
|
||||
- Verify in Django admin
|
||||
|
||||
2. **Update Remaining Serializers**
|
||||
- Update `TasksSerializer` in `writer/serializers.py`
|
||||
- Update `ContentSerializer` in `writer/serializers.py`
|
||||
- Update `ContentTaxonomySerializer` in `writer/serializers.py`
|
||||
|
||||
3. **Update API Endpoints**
|
||||
- Update Task ViewSet create/list/update methods
|
||||
- Update Content ViewSet create/list/update methods
|
||||
- Update Publish endpoint logic
|
||||
- Update WordPress import endpoint
|
||||
|
||||
4. **Update Internal Services**
|
||||
- Update ContentGenerationService
|
||||
- Update WordPress publish service
|
||||
- Update WordPress import service
|
||||
|
||||
### Stage 2 (Frontend Integration)
|
||||
|
||||
5. **Update React Components**
|
||||
- Update Task creation/edit forms
|
||||
- Update Content creation/edit forms
|
||||
- Remove deprecated field displays
|
||||
- Add new field filters and displays
|
||||
|
||||
6. **End-to-End Testing**
|
||||
- Test full Planner → Writer → ContentManager → WP Publish flow
|
||||
- Test WordPress import flow
|
||||
- Verify all UIs show correct data
|
||||
|
||||
---
|
||||
|
||||
## 📞 SUPPORT & REFERENCES
|
||||
|
||||
**Documentation:**
|
||||
- ✅ `STAGE_1_REFACTOR_COMPLETE_SUMMARY.md` - Complete implementation guide
|
||||
- ✅ `STAGE_1_EXECUTION_REPORT.md` - This file
|
||||
- ⚠️ `MASTER_REFERENCE.md` - Needs update with new model definitions
|
||||
- ✅ `CHANGELOG.md` - Updated with Stage 1 entry
|
||||
- 📖 `planner-writer-workflow.md` - Original workflow documentation
|
||||
- 📖 `IMPLEMENTATION_AUDIT_REPORT.md` - Implementation audit
|
||||
|
||||
**Test Files to Create:**
|
||||
- `backend/igny8_core/business/content/tests/test_models.py`
|
||||
- `backend/igny8_core/modules/writer/tests/test_serializers.py`
|
||||
- `backend/igny8_core/modules/writer/tests/test_views.py`
|
||||
|
||||
---
|
||||
|
||||
**End of Stage 1 Execution Report**
|
||||
**Status:** Models refactored, migrations pending, serializers/endpoints/services pending
|
||||
673
STAGE_1_REFACTOR_COMPLETE_SUMMARY.md
Normal file
673
STAGE_1_REFACTOR_COMPLETE_SUMMARY.md
Normal file
@@ -0,0 +1,673 @@
|
||||
# STAGE 1 BACKEND REFACTOR - COMPLETE SUMMARY
|
||||
|
||||
**Date:** November 24, 2025
|
||||
**Version:** Stage 1 - Model & Architecture Refactor
|
||||
**Status:** ✅ **MODELS REFACTORED** | ⚠️ **SERIALIZERS & ENDPOINTS NEED UPDATES**
|
||||
|
||||
---
|
||||
|
||||
## ✅ COMPLETED CHANGES
|
||||
|
||||
### Part A: Model Refactor (COMPLETED)
|
||||
|
||||
#### 1. **Cluster Model** (`backend/igny8_core/business/planning/models.py`)
|
||||
|
||||
**REMOVED FIELDS:**
|
||||
- ❌ `context_type` (CharField with choices)
|
||||
- ❌ `dimension_meta` (JSONField)
|
||||
- ❌ `context_type` index
|
||||
|
||||
**KEPT FIELDS:**
|
||||
- ✅ `id`
|
||||
- ✅ `site` (ForeignKey)
|
||||
- ✅ `sector` (ForeignKey)
|
||||
- ✅ `name` (CharField, unique)
|
||||
- ✅ `description` (TextField)
|
||||
- ✅ `keywords_count` (IntegerField)
|
||||
- ✅ `volume` (IntegerField)
|
||||
- ✅ `mapped_pages` (IntegerField)
|
||||
- ✅ `status` (CharField)
|
||||
- ✅ `created_at` (DateTimeField)
|
||||
- ✅ `updated_at` (DateTimeField)
|
||||
|
||||
**RESULT:** Cluster is now a pure topic cluster without dimension/role metadata.
|
||||
|
||||
---
|
||||
|
||||
#### 2. **Task Model** (`backend/igny8_core/business/content/models.py`)
|
||||
|
||||
**REMOVED FIELDS:**
|
||||
- ❌ `cluster_role` (CharField with choices: hub, supporting, attribute)
|
||||
- ❌ `sync_status` (not present in Task, but confirmed removal)
|
||||
- ❌ `entity_type` (replaced with `content_type`)
|
||||
- ❌ `keywords` (CharField legacy comma-separated)
|
||||
- ❌ `keyword_objects` (renamed to `keywords`)
|
||||
- ❌ `idea` (ForeignKey to ContentIdeas)
|
||||
- ❌ `taxonomy` (ForeignKey to SiteBlueprintTaxonomy)
|
||||
- ❌ STATUS CHOICES: `in_progress`, `failed` (now only `queued` and `completed`)
|
||||
|
||||
**ADDED FIELDS:**
|
||||
- ✅ `content_type` (CharField, required, indexed) - post, page, product, service, category, tag, etc.
|
||||
- ✅ `content_structure` (CharField, required, indexed) - article, listicle, guide, comparison, product_page, etc.
|
||||
- ✅ `taxonomy_term` (ForeignKey to ContentTaxonomy, nullable)
|
||||
- ✅ `cluster` (ForeignKey now REQUIRED via blank=False)
|
||||
- ✅ `keywords` (ManyToManyField to planner.Keywords, renamed from keyword_objects)
|
||||
|
||||
**KEPT FIELDS:**
|
||||
- ✅ `id`
|
||||
- ✅ `site`, `sector`, `account` (from SiteSectorBaseModel)
|
||||
- ✅ `title` (CharField)
|
||||
- ✅ `description` (TextField)
|
||||
- ✅ `cluster` (ForeignKey, now required)
|
||||
- ✅ `status` (CharField: queued, completed)
|
||||
- ✅ `created_at`, `updated_at`
|
||||
|
||||
**STATUS CHOICES:**
|
||||
- ✅ `queued` - Task awaiting content generation
|
||||
- ✅ `completed` - Task completed (content generated)
|
||||
|
||||
---
|
||||
|
||||
#### 3. **Content Model** (`backend/igny8_core/business/content/models.py`)
|
||||
|
||||
**REMOVED FIELDS:**
|
||||
- ❌ `task` (OneToOneField to Tasks)
|
||||
- ❌ `cluster_role` (CharField)
|
||||
- ❌ `sync_status` (CharField: native, imported, synced)
|
||||
- ❌ `entity_type` (replaced with `content_type`)
|
||||
- ❌ `content_format` (replaced with `content_structure`)
|
||||
- ❌ `html_content` (renamed to `content_html`)
|
||||
- ❌ `word_count`, `metadata`, `meta_title`, `meta_description`, `primary_keyword`, `secondary_keywords`
|
||||
- ❌ `sync_metadata`, `internal_links`, `linker_version`, `optimizer_version`, `optimization_scores`
|
||||
- ❌ `external_type`, `json_blocks`, `structure_data`
|
||||
- ❌ `taxonomies` M2M through ContentTaxonomyRelation (now direct M2M)
|
||||
- ❌ `generated_at` (replaced with `created_at`)
|
||||
|
||||
**ADDED FIELDS:**
|
||||
- ✅ `title` (CharField, required, indexed)
|
||||
- ✅ `content_html` (TextField)
|
||||
- ✅ `cluster` (ForeignKey, required via blank=False)
|
||||
- ✅ `content_type` (CharField, required, indexed)
|
||||
- ✅ `content_structure` (CharField, required, indexed)
|
||||
- ✅ `taxonomy_terms` (ManyToManyField to ContentTaxonomy, direct - NO through model)
|
||||
- ✅ `external_id` (CharField, indexed for WordPress post_id)
|
||||
- ✅ `external_url` (URLField)
|
||||
- ✅ `source` (CharField: igny8 or wordpress)
|
||||
- ✅ `status` (CharField: draft or published)
|
||||
|
||||
**KEPT FIELDS:**
|
||||
- ✅ `id`
|
||||
- ✅ `site`, `sector`, `account` (from SiteSectorBaseModel)
|
||||
- ✅ `created_at`, `updated_at`
|
||||
|
||||
**SOURCE CHOICES:**
|
||||
- ✅ `igny8` - Content generated by IGNY8 AI
|
||||
- ✅ `wordpress` - Content imported from WordPress
|
||||
|
||||
**STATUS CHOICES:**
|
||||
- ✅ `draft` - Content not yet published
|
||||
- ✅ `published` - Content published to WordPress/external platform
|
||||
|
||||
**REMOVED:**
|
||||
- ❌ `ContentTaxonomyRelation` through model (direct M2M now)
|
||||
|
||||
---
|
||||
|
||||
#### 4. **ContentTaxonomy Model** (`backend/igny8_core/business/content/models.py`)
|
||||
|
||||
**REMOVED FIELDS:**
|
||||
- ❌ `sync_status` (CharField: native, imported, synced)
|
||||
- ❌ `description` (TextField)
|
||||
- ❌ `parent` (ForeignKey for hierarchical taxonomies)
|
||||
- ❌ `count` (IntegerField from WordPress)
|
||||
- ❌ `metadata` (JSONField)
|
||||
- ❌ `clusters` (ManyToManyField to planner.Clusters)
|
||||
|
||||
**MODIFIED FIELDS:**
|
||||
- ✅ `taxonomy_type` CHOICES updated:
|
||||
- `category` → Category
|
||||
- `tag` → Tag
|
||||
- `product_category` → Product Category (renamed from product_cat)
|
||||
- `product_attribute` → Product Attribute (renamed from product_attr)
|
||||
- **NEW:** `cluster` → Cluster Taxonomy (IGNY8-native cluster-mapped taxonomy)
|
||||
|
||||
**ADDED FIELDS:**
|
||||
- ✅ `external_taxonomy` now nullable (null for cluster taxonomies)
|
||||
- ✅ `external_id` now nullable (null for cluster taxonomies)
|
||||
|
||||
**KEPT FIELDS:**
|
||||
- ✅ `id`
|
||||
- ✅ `site`, `sector`, `account`
|
||||
- ✅ `name` (CharField, indexed)
|
||||
- ✅ `slug` (SlugField, indexed)
|
||||
- ✅ `taxonomy_type` (CharField with new choices)
|
||||
- ✅ `external_taxonomy` (CharField, nullable)
|
||||
- ✅ `external_id` (IntegerField, nullable, indexed)
|
||||
- ✅ `created_at`, `updated_at`
|
||||
|
||||
**UNIQUE CONSTRAINTS:**
|
||||
- ✅ `['site', 'slug', 'taxonomy_type']`
|
||||
- ✅ `['site', 'external_id', 'external_taxonomy']`
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ REMAINING WORK
|
||||
|
||||
### Part B: Serializers (IN PROGRESS)
|
||||
|
||||
**FILES MODIFIED:**
|
||||
- ✅ `backend/igny8_core/modules/planner/serializers.py` - ClusterSerializer updated (removed context_type, dimension_meta)
|
||||
|
||||
**FILES NEEDING UPDATES:**
|
||||
- ⚠️ `backend/igny8_core/modules/writer/serializers.py`
|
||||
- Update `TasksSerializer` to expose `content_type`, `content_structure`, `taxonomy_term`
|
||||
- Remove `cluster_role`, `entity_type`, `taxonomy`, `idea`, `keywords` (CharField)
|
||||
- Update `ContentSerializer` to expose `content_type`, `content_structure`, `taxonomy_terms`, `source`, `status`
|
||||
- Remove `cluster_role`, `sync_status`, `entity_type`, `content_format`, `task`, all removed Content fields
|
||||
- Update `ContentTaxonomySerializer` to remove `sync_status`, add `cluster` taxonomy_type
|
||||
|
||||
---
|
||||
|
||||
### Part C: API Endpoints (NOT STARTED)
|
||||
|
||||
**FILES NEEDING UPDATES:**
|
||||
|
||||
#### 1. **Task Endpoints** (`backend/igny8_core/modules/writer/views.py`)
|
||||
- ⚠️ Update `TasksViewSet.create()` to require `cluster`, `content_type`, `content_structure`
|
||||
- ⚠️ Update `TasksViewSet.list()` to filter by `content_type`, `content_structure`
|
||||
- ⚠️ Remove `cluster_role`, `entity_type` from responses
|
||||
|
||||
#### 2. **Content Endpoints** (`backend/igny8_core/modules/writer/views.py`)
|
||||
- ⚠️ Update `ContentViewSet.create()` to accept `cluster`, `content_type`, `content_structure`, `taxonomy_terms`
|
||||
- ⚠️ Update `ContentViewSet.list()` to filter by `source`, `status`, `content_type`
|
||||
- ⚠️ Update `ContentViewSet.retrieve()` to expose `taxonomy_terms`, `external_id`, `external_url`
|
||||
- ⚠️ Remove `sync_status`, `cluster_role` from responses
|
||||
|
||||
#### 3. **Publish Endpoint** (`backend/igny8_core/modules/writer/views.py` or publishing module)
|
||||
- ⚠️ Update `/content/{id}/publish/` logic:
|
||||
1. Validate WP site credentials
|
||||
2. Format payload for WP REST API (title, content, post_type, taxonomy assignments)
|
||||
3. POST to WP API
|
||||
4. On success: save `external_id`, `external_url`, set `status='published'`
|
||||
5. Return updated Content entry
|
||||
|
||||
#### 4. **WordPress Import Endpoint** (`backend/igny8_core/modules/integration/` or similar)
|
||||
- ⚠️ Update WP import service:
|
||||
- Create Content with `external_id`, `external_url`, `source='wordpress'`, `status='draft'`
|
||||
- Map `content_type` from WP post_type
|
||||
- Auto-map `taxonomy_terms` from WP categories/tags
|
||||
- Upsert ContentTaxonomy by `external_id` + `external_taxonomy`
|
||||
- Handle cluster taxonomy mapping separately
|
||||
|
||||
---
|
||||
|
||||
### Part D: WordPress Plugin Contracts (VERIFICATION NEEDED)
|
||||
|
||||
**IGNY8 Backend expects from WP:**
|
||||
- ✅ `post_id` (maps to Content.external_id)
|
||||
- ✅ `post_type` (maps to Content.content_type)
|
||||
- ✅ `title` (maps to Content.title)
|
||||
- ✅ `content` (maps to Content.content_html)
|
||||
- ✅ `permalink` (maps to Content.external_url)
|
||||
- ✅ `taxonomy terms` (term_id + taxonomy slug) → ContentTaxonomy
|
||||
|
||||
**IGNY8 Backend sends to WP:**
|
||||
- ✅ `post_title` (from Content.title)
|
||||
- ✅ `post_content` (from Content.content_html)
|
||||
- ✅ `post_type` (from Content.content_type)
|
||||
- ✅ `taxonomy assignments` (by term_id from ContentTaxonomy.external_id)
|
||||
|
||||
**No deprecated fields sent:**
|
||||
- ❌ NO `cluster_role`
|
||||
- ❌ NO `sync_status`
|
||||
- ❌ NO `context_type`
|
||||
|
||||
---
|
||||
|
||||
### Part E: Internal Services (NOT STARTED)
|
||||
|
||||
**FILES NEEDING UPDATES:**
|
||||
|
||||
1. **Planner → Writer → ContentManager Flow**
|
||||
- ⚠️ Update `ContentGenerationService` to set `content_type`, `content_structure` on Content
|
||||
- ⚠️ Update Task creation from Ideas to use new field structure
|
||||
|
||||
2. **WordPress Publish Service**
|
||||
- ⚠️ Update publish logic to use `Content.status`, `Content.external_id`, `Content.external_url`
|
||||
- ⚠️ Remove `sync_status` logic
|
||||
|
||||
3. **WordPress Import Service**
|
||||
- ⚠️ Update import logic to create Content with `source='wordpress'`
|
||||
- ⚠️ Auto-create/update ContentTaxonomy entries
|
||||
|
||||
4. **Cluster Linking Service**
|
||||
- ⚠️ Update to use direct `Content.cluster` FK instead of `cluster_role`
|
||||
|
||||
5. **Taxonomy Linking Logic**
|
||||
- ⚠️ Update to use `Content.taxonomy_terms` M2M
|
||||
|
||||
**SERVICE FILES:**
|
||||
- `backend/igny8_core/business/content/services/content_generation_service.py`
|
||||
- `backend/igny8_core/business/publishing/services/` (if exists)
|
||||
- `backend/igny8_core/business/integration/services/wordpress_import_service.py` (if exists)
|
||||
|
||||
---
|
||||
|
||||
## 📋 MIGRATION PLAN
|
||||
|
||||
### Step 1: Create Migration Files
|
||||
|
||||
Run the following commands to generate Django migrations for all model changes:
|
||||
|
||||
```powershell
|
||||
cd e:\Projects\All Personal Projects\Digital Projects (Ecom Stores & IT Services)\Development\GIT\igny8-app\igny8\backend
|
||||
|
||||
# Activate virtual environment
|
||||
.\.venv\Scripts\Activate.ps1
|
||||
|
||||
# Generate migrations for planning models
|
||||
python manage.py makemigrations planner --name "stage1_remove_cluster_context_fields"
|
||||
|
||||
# Generate migrations for content models
|
||||
python manage.py makemigrations writer --name "stage1_refactor_task_content_taxonomy"
|
||||
|
||||
# Review generated migrations
|
||||
python manage.py showmigrations planner writer
|
||||
```
|
||||
|
||||
### Step 2: Review Generated Migrations
|
||||
|
||||
**Expected Migrations:**
|
||||
|
||||
#### `planner/migrations/XXXX_stage1_remove_cluster_context_fields.py`:
|
||||
```python
|
||||
operations = [
|
||||
migrations.RemoveField(model_name='clusters', name='context_type'),
|
||||
migrations.RemoveField(model_name='clusters', name='dimension_meta'),
|
||||
migrations.AlterIndexTogether(
|
||||
name='clusters',
|
||||
index_together={('name',), ('status',), ('site', 'sector')},
|
||||
),
|
||||
]
|
||||
```
|
||||
|
||||
#### `writer/migrations/XXXX_stage1_refactor_task_content_taxonomy.py`:
|
||||
```python
|
||||
operations = [
|
||||
# Task model changes
|
||||
migrations.RemoveField(model_name='tasks', name='cluster_role'),
|
||||
migrations.RemoveField(model_name='tasks', name='entity_type'),
|
||||
migrations.RemoveField(model_name='tasks', name='keywords'), # CharField
|
||||
migrations.RemoveField(model_name='tasks', name='idea'),
|
||||
migrations.RemoveField(model_name='tasks', name='taxonomy'),
|
||||
migrations.RenameField(model_name='tasks', old_name='keyword_objects', new_name='keywords'),
|
||||
migrations.AddField(model_name='tasks', name='content_type', field=models.CharField(...)),
|
||||
migrations.AddField(model_name='tasks', name='content_structure', field=models.CharField(...)),
|
||||
migrations.AddField(model_name='tasks', name='taxonomy_term', field=models.ForeignKey(...)),
|
||||
migrations.AlterField(model_name='tasks', name='status', field=models.CharField(choices=[...])),
|
||||
|
||||
# Content model changes
|
||||
migrations.RemoveField(model_name='content', name='task'),
|
||||
migrations.RemoveField(model_name='content', name='cluster_role'),
|
||||
migrations.RemoveField(model_name='content', name='sync_status'),
|
||||
migrations.RemoveField(model_name='content', name='entity_type'),
|
||||
migrations.RemoveField(model_name='content', name='content_format'),
|
||||
# ... remove many other fields
|
||||
migrations.RenameField(model_name='content', old_name='html_content', new_name='content_html'),
|
||||
migrations.AddField(model_name='content', name='title', field=models.CharField(...)),
|
||||
migrations.AddField(model_name='content', name='content_type', field=models.CharField(...)),
|
||||
migrations.AddField(model_name='content', name='content_structure', field=models.CharField(...)),
|
||||
migrations.AlterField(model_name='content', name='source', field=models.CharField(choices=[...])),
|
||||
migrations.AlterField(model_name='content', name='status', field=models.CharField(choices=[...])),
|
||||
migrations.RemoveField(model_name='content', name='taxonomies'), # Remove M2M through
|
||||
migrations.AddField(model_name='content', name='taxonomy_terms', field=models.ManyToManyField(...)),
|
||||
|
||||
# ContentTaxonomy model changes
|
||||
migrations.RemoveField(model_name='contenttaxonomy', name='sync_status'),
|
||||
migrations.RemoveField(model_name='contenttaxonomy', name='description'),
|
||||
migrations.RemoveField(model_name='contenttaxonomy', name='parent'),
|
||||
migrations.RemoveField(model_name='contenttaxonomy', name='count'),
|
||||
migrations.RemoveField(model_name='contenttaxonomy', name='metadata'),
|
||||
migrations.RemoveField(model_name='contenttaxonomy', name='clusters'),
|
||||
migrations.AlterField(model_name='contenttaxonomy', name='taxonomy_type', field=models.CharField(choices=[...])),
|
||||
migrations.AlterField(model_name='contenttaxonomy', name='external_taxonomy', field=models.CharField(null=True, ...)),
|
||||
|
||||
# Remove ContentTaxonomyRelation
|
||||
migrations.DeleteModel(name='ContentTaxonomyRelation'),
|
||||
]
|
||||
```
|
||||
|
||||
### Step 3: Run Migrations
|
||||
|
||||
**⚠️ WARNING: This is a DESTRUCTIVE migration. Existing data will be lost.**
|
||||
|
||||
```powershell
|
||||
# Backup database first
|
||||
python manage.py dumpdata > backup_$(Get-Date -Format 'yyyyMMdd_HHmmss').json
|
||||
|
||||
# Run migrations
|
||||
python manage.py migrate planner
|
||||
python manage.py migrate writer
|
||||
|
||||
# Verify migrations applied
|
||||
python manage.py showmigrations planner writer
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🧪 TESTING & VERIFICATION
|
||||
|
||||
### Django Admin Verification
|
||||
|
||||
```powershell
|
||||
python manage.py runserver
|
||||
# Navigate to http://localhost:8000/admin/
|
||||
```
|
||||
|
||||
**Check in Django Admin:**
|
||||
|
||||
1. **Clusters:**
|
||||
- ✅ NO `context_type` field visible
|
||||
- ✅ NO `dimension_meta` field visible
|
||||
- ✅ All other fields present
|
||||
|
||||
2. **Tasks:**
|
||||
- ✅ `content_type` field visible (CharField)
|
||||
- ✅ `content_structure` field visible (CharField)
|
||||
- ✅ `taxonomy_term` field visible (FK dropdown)
|
||||
- ✅ NO `cluster_role` field
|
||||
- ✅ NO `entity_type` field
|
||||
- ✅ Status choices: queued, completed only
|
||||
|
||||
3. **Content:**
|
||||
- ✅ `title` field visible
|
||||
- ✅ `content_type` field visible
|
||||
- ✅ `content_structure` field visible
|
||||
- ✅ `taxonomy_terms` M2M widget visible
|
||||
- ✅ `source` choices: igny8, wordpress
|
||||
- ✅ `status` choices: draft, published
|
||||
- ✅ NO `cluster_role` field
|
||||
- ✅ NO `sync_status` field
|
||||
|
||||
4. **ContentTaxonomy:**
|
||||
- ✅ `taxonomy_type` choices include `cluster`
|
||||
- ✅ NO `sync_status` field
|
||||
- ✅ `external_taxonomy` and `external_id` nullable
|
||||
|
||||
### API Endpoint Verification
|
||||
|
||||
**After serializers/views are updated:**
|
||||
|
||||
```powershell
|
||||
# Test Task creation
|
||||
curl -X POST http://localhost:8000/api/v1/writer/tasks/ \
|
||||
-H "Authorization: Bearer <token>" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"title": "Test Task",
|
||||
"cluster_id": 1,
|
||||
"content_type": "post",
|
||||
"content_structure": "article",
|
||||
"status": "queued"
|
||||
}'
|
||||
|
||||
# Test Content creation
|
||||
curl -X POST http://localhost:8000/api/v1/writer/content/ \
|
||||
-H "Authorization: Bearer <token>" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"title": "Test Content",
|
||||
"cluster_id": 1,
|
||||
"content_type": "post",
|
||||
"content_structure": "article",
|
||||
"content_html": "<p>Test content</p>",
|
||||
"source": "igny8",
|
||||
"status": "draft"
|
||||
}'
|
||||
|
||||
# Test ContentTaxonomy creation
|
||||
curl -X POST http://localhost:8000/api/v1/writer/taxonomies/ \
|
||||
-H "Authorization: Bearer <token>" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"name": "Test Category",
|
||||
"slug": "test-category",
|
||||
"taxonomy_type": "category",
|
||||
"external_taxonomy": "category",
|
||||
"external_id": 123
|
||||
}'
|
||||
```
|
||||
|
||||
### Frontend Verification (After Serializer Updates)
|
||||
|
||||
**Components to Test:**
|
||||
|
||||
1. **Planner - Clusters Page:**
|
||||
- ✅ NO context_type or dimension_meta visible in cluster cards
|
||||
- ✅ Cluster creation/edit works without those fields
|
||||
|
||||
2. **Writer - Tasks Page:**
|
||||
- ✅ Task creation form shows `content_type` and `content_structure` dropdowns
|
||||
- ✅ NO cluster_role or entity_type fields
|
||||
- ✅ Status filter shows only: queued, completed
|
||||
|
||||
3. **Writer - Content Page:**
|
||||
- ✅ Content list shows `content_type`, `content_structure`, `status`, `source`
|
||||
- ✅ NO sync_status column
|
||||
- ✅ NO cluster_role column
|
||||
|
||||
4. **Content Manager:**
|
||||
- ✅ All content types shown (posts, pages, products, services)
|
||||
- ✅ Filter by `content_type`
|
||||
- ✅ Filter by `source` (igny8, wordpress)
|
||||
- ✅ Filter by `status` (draft, published)
|
||||
|
||||
---
|
||||
|
||||
## 📝 MASTER REFERENCE DOCUMENTATION UPDATE
|
||||
|
||||
**File:** `e:\Projects\All Personal Projects\Digital Projects (Ecom Stores & IT Services)\Development\GIT\igny8-app\igny8\MASTER_REFERENCE.md`
|
||||
|
||||
### Updated Model Definitions
|
||||
|
||||
#### Cluster Model
|
||||
```python
|
||||
# Simplified - Pure Topic Cluster
|
||||
{
|
||||
"id": int,
|
||||
"site": FK(Site),
|
||||
"sector": FK(Sector),
|
||||
"name": str (unique),
|
||||
"description": str,
|
||||
"keywords_count": int,
|
||||
"volume": int,
|
||||
"mapped_pages": int,
|
||||
"status": str,
|
||||
"created_at": datetime,
|
||||
"updated_at": datetime
|
||||
}
|
||||
```
|
||||
|
||||
#### Task Model
|
||||
```python
|
||||
{
|
||||
"id": int,
|
||||
"site": FK(Site),
|
||||
"sector": FK(Sector),
|
||||
"title": str,
|
||||
"description": str,
|
||||
"cluster": FK(Cluster, required),
|
||||
"content_type": str (required), # post, page, product, service, category, tag
|
||||
"content_structure": str (required), # article, listicle, guide, comparison, product_page
|
||||
"taxonomy_term": FK(ContentTaxonomy, nullable),
|
||||
"keywords": M2M(Keywords),
|
||||
"status": str, # queued, completed
|
||||
"created_at": datetime,
|
||||
"updated_at": datetime
|
||||
}
|
||||
```
|
||||
|
||||
#### Content Model
|
||||
```python
|
||||
{
|
||||
"id": int,
|
||||
"site": FK(Site),
|
||||
"sector": FK(Sector),
|
||||
"title": str (required),
|
||||
"content_html": text,
|
||||
"cluster": FK(Cluster, required),
|
||||
"content_type": str (required),
|
||||
"content_structure": str (required),
|
||||
"taxonomy_terms": M2M(ContentTaxonomy),
|
||||
"external_id": str (nullable), # WordPress post_id
|
||||
"external_url": url (nullable),
|
||||
"source": str, # igny8, wordpress
|
||||
"status": str, # draft, published
|
||||
"created_at": datetime,
|
||||
"updated_at": datetime
|
||||
}
|
||||
```
|
||||
|
||||
#### ContentTaxonomy Model
|
||||
```python
|
||||
{
|
||||
"id": int,
|
||||
"site": FK(Site),
|
||||
"sector": FK(Sector),
|
||||
"name": str,
|
||||
"slug": str,
|
||||
"taxonomy_type": str, # category, tag, product_category, product_attribute, cluster
|
||||
"external_taxonomy": str (nullable), # WP taxonomy slug, null for cluster
|
||||
"external_id": int (nullable), # WP term_id, null for cluster
|
||||
"created_at": datetime,
|
||||
"updated_at": datetime
|
||||
}
|
||||
```
|
||||
|
||||
### Updated Flow Diagrams
|
||||
|
||||
#### Planner → Writer → ContentManager → WP Publish Flow
|
||||
|
||||
```
|
||||
Cluster → Task (content_type + content_structure) → Content (source=igny8, status=draft)
|
||||
↓
|
||||
Publish to WP
|
||||
↓
|
||||
Content (status=published, external_id, external_url)
|
||||
```
|
||||
|
||||
#### WP Import Flow
|
||||
|
||||
```
|
||||
WordPress Post/Page/Product → IGNY8 Import Service
|
||||
↓
|
||||
Create Content (source=wordpress, external_id, external_url, status=draft)
|
||||
↓
|
||||
Create/Update ContentTaxonomy (external_taxonomy, external_id)
|
||||
↓
|
||||
Link Content.taxonomy_terms
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📅 CHANGELOG UPDATE
|
||||
|
||||
**File:** `e:\Projects\All Personal Projects\Digital Projects (Ecom Stores & IT Services)\Development\GIT\igny8-app\igny8\CHANGELOG.md`
|
||||
|
||||
```markdown
|
||||
## [v1.0.0] - Stage 1 Backend Refactor - 2025-11-24
|
||||
|
||||
### 🔴 Breaking Changes
|
||||
|
||||
#### Models
|
||||
- **REMOVED:** `Cluster.context_type`, `Cluster.dimension_meta` - Clusters are now pure topics
|
||||
- **REMOVED:** `Task.cluster_role`, `Task.entity_type`, `Task.idea`, `Task.taxonomy`, `Task.keywords` (CharField)
|
||||
- **ADDED:** `Task.content_type` (required), `Task.content_structure` (required), `Task.taxonomy_term` (nullable)
|
||||
- **CHANGED:** `Task.status` choices reduced to `queued` and `completed` only
|
||||
- **REMOVED:** `Content.task`, `Content.cluster_role`, `Content.sync_status`, `Content.entity_type`, `Content.content_format`, and many legacy fields
|
||||
- **ADDED:** `Content.title` (required), `Content.content_type`, `Content.content_structure`, `Content.taxonomy_terms` (M2M)
|
||||
- **CHANGED:** `Content.status` choices reduced to `draft` and `published`
|
||||
- **CHANGED:** `Content.source` choices reduced to `igny8` and `wordpress`
|
||||
- **REMOVED:** `ContentTaxonomy.sync_status`, `ContentTaxonomy.description`, `ContentTaxonomy.parent`, `ContentTaxonomy.count`, `ContentTaxonomy.metadata`, `ContentTaxonomy.clusters`
|
||||
- **ADDED:** `ContentTaxonomy.taxonomy_type` choice: `cluster` for IGNY8-native cluster taxonomies
|
||||
- **REMOVED:** `ContentTaxonomyRelation` through model (direct M2M now)
|
||||
|
||||
#### APIs (After Serializer Updates)
|
||||
- **Task Create:** Now requires `cluster`, `content_type`, `content_structure`
|
||||
- **Content Create:** Now requires `cluster`, `content_type`, `content_structure`, `title`
|
||||
- **Content Publish:** Sets `status='published'`, `external_id`, `external_url`
|
||||
- **WordPress Import:** Creates Content with `source='wordpress'`, auto-maps taxonomies
|
||||
|
||||
#### Services
|
||||
- Content generation service updated to use `content_type` and `content_structure`
|
||||
- WordPress publish service simplified (no sync_status logic)
|
||||
- WordPress import service creates ContentTaxonomy entries automatically
|
||||
- Removed all references to `sync_status`, `cluster_role`, `context_type`
|
||||
|
||||
### 🐛 Bug Fixes
|
||||
- Fixed cluster_id requirement enforcement on Task creation
|
||||
- Removed ambiguous M2M through models causing tenant_id conflicts
|
||||
|
||||
### 📚 Documentation
|
||||
- Updated `MASTER_REFERENCE.md` with new model definitions
|
||||
- Updated flow diagrams for Planner → Writer → ContentManager → WP Publish
|
||||
- Added WP Import flow documentation
|
||||
- Updated JSON payload examples for Task/Content creation and WP sync
|
||||
|
||||
### 🧪 Testing
|
||||
- Added Django admin verification steps
|
||||
- Added API endpoint test examples
|
||||
- Added frontend verification checklist
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 NEXT STEPS (STAGE 2)
|
||||
|
||||
**After Stage 1 is complete:**
|
||||
|
||||
1. ✅ All models refactored
|
||||
2. ✅ Migrations created and run
|
||||
3. ✅ Serializers updated
|
||||
4. ✅ API endpoints updated
|
||||
5. ✅ Internal services updated
|
||||
6. ✅ WordPress plugin contracts verified
|
||||
7. ✅ Documentation updated
|
||||
8. ✅ Tests pass
|
||||
|
||||
**Then proceed to:**
|
||||
|
||||
### Stage 2: Frontend Integration
|
||||
- Update React components to use new API structure
|
||||
- Update forms to show `content_type`, `content_structure` fields
|
||||
- Remove `cluster_role`, `sync_status` UI elements
|
||||
- Update filters and views
|
||||
- Test end-to-end workflow
|
||||
|
||||
### Stage 3: WordPress Plugin Alignment (if needed)
|
||||
- Verify WP plugin sends correct payload
|
||||
- Ensure WP plugin handles new Content structure
|
||||
- Test bidirectional sync
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ CRITICAL NOTES
|
||||
|
||||
1. **This is a DESTRUCTIVE refactor** - existing data in removed fields will be lost
|
||||
2. **Backup database before running migrations**
|
||||
3. **Test in development environment first**
|
||||
4. **Update frontend AFTER backend serializers are updated**
|
||||
5. **WordPress plugin may need minor updates to handle new structure**
|
||||
|
||||
---
|
||||
|
||||
## 📞 SUPPORT
|
||||
|
||||
For issues or questions about this refactor:
|
||||
1. Review `MASTER_REFERENCE.md` for architecture details
|
||||
2. Check `IMPLEMENTATION_AUDIT_REPORT.md` for current state
|
||||
3. Review `planner-writer-workflow.md` for workflow details
|
||||
|
||||
---
|
||||
|
||||
**End of Stage 1 Refactor Summary**
|
||||
@@ -8,71 +8,45 @@ class Tasks(SiteSectorBaseModel):
|
||||
|
||||
STATUS_CHOICES = [
|
||||
('queued', 'Queued'),
|
||||
('in_progress', 'In Progress'),
|
||||
('completed', 'Completed'),
|
||||
('failed', 'Failed'),
|
||||
]
|
||||
|
||||
ENTITY_TYPE_CHOICES = [
|
||||
('post', 'Post'),
|
||||
('page', 'Page'),
|
||||
('product', 'Product'),
|
||||
('service', 'Service'),
|
||||
('taxonomy_term', 'Taxonomy Term'),
|
||||
]
|
||||
|
||||
CLUSTER_ROLE_CHOICES = [
|
||||
('hub', 'Hub'),
|
||||
('supporting', 'Supporting'),
|
||||
('attribute', 'Attribute'),
|
||||
]
|
||||
|
||||
title = models.CharField(max_length=255, db_index=True)
|
||||
description = models.TextField(blank=True, null=True)
|
||||
keywords = models.CharField(max_length=500, blank=True) # Comma-separated keywords (legacy)
|
||||
cluster = models.ForeignKey(
|
||||
'planner.Clusters',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=False,
|
||||
related_name='tasks',
|
||||
limit_choices_to={'sector': models.F('sector')},
|
||||
help_text="Parent cluster (required)"
|
||||
)
|
||||
content_type = models.CharField(
|
||||
max_length=100,
|
||||
db_index=True,
|
||||
help_text="Content type: post, page, product, service, category, tag, etc."
|
||||
)
|
||||
content_structure = models.CharField(
|
||||
max_length=100,
|
||||
db_index=True,
|
||||
help_text="Content structure/format: article, listicle, guide, comparison, product_page, etc."
|
||||
)
|
||||
taxonomy_term = models.ForeignKey(
|
||||
'ContentTaxonomy',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name='tasks',
|
||||
limit_choices_to={'sector': models.F('sector')}
|
||||
help_text="Optional taxonomy term assignment"
|
||||
)
|
||||
keyword_objects = models.ManyToManyField(
|
||||
keywords = models.ManyToManyField(
|
||||
'planner.Keywords',
|
||||
blank=True,
|
||||
related_name='tasks',
|
||||
help_text="Individual keywords linked to this task"
|
||||
)
|
||||
idea = models.ForeignKey(
|
||||
'planner.ContentIdeas',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name='tasks'
|
||||
help_text="Keywords linked to this task"
|
||||
)
|
||||
status = models.CharField(max_length=50, choices=STATUS_CHOICES, default='queued')
|
||||
entity_type = models.CharField(
|
||||
max_length=50,
|
||||
choices=ENTITY_TYPE_CHOICES,
|
||||
default='post',
|
||||
db_index=True,
|
||||
help_text="Type of content entity"
|
||||
)
|
||||
taxonomy = models.ForeignKey(
|
||||
'site_building.SiteBlueprintTaxonomy',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name='tasks',
|
||||
help_text="Taxonomy association when derived from blueprint planning"
|
||||
)
|
||||
cluster_role = models.CharField(
|
||||
max_length=50,
|
||||
choices=CLUSTER_ROLE_CHOICES,
|
||||
default='hub',
|
||||
help_text="Role within the cluster-driven sitemap"
|
||||
)
|
||||
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
@@ -87,8 +61,8 @@ class Tasks(SiteSectorBaseModel):
|
||||
models.Index(fields=['title']),
|
||||
models.Index(fields=['status']),
|
||||
models.Index(fields=['cluster']),
|
||||
models.Index(fields=['entity_type']),
|
||||
models.Index(fields=['cluster_role']),
|
||||
models.Index(fields=['content_type']),
|
||||
models.Index(fields=['content_structure']),
|
||||
models.Index(fields=['site', 'sector']),
|
||||
]
|
||||
|
||||
@@ -98,224 +72,106 @@ class Tasks(SiteSectorBaseModel):
|
||||
|
||||
class Content(SiteSectorBaseModel):
|
||||
"""
|
||||
Content model for storing final AI-generated article content.
|
||||
Separated from Task for content versioning and storage optimization.
|
||||
Content model for AI-generated or WordPress-imported content.
|
||||
Final architecture: simplified content management.
|
||||
"""
|
||||
task = models.OneToOneField(
|
||||
Tasks,
|
||||
on_delete=models.CASCADE,
|
||||
|
||||
# Core content fields
|
||||
title = models.CharField(max_length=255, db_index=True)
|
||||
content_html = models.TextField(help_text="Final HTML content")
|
||||
cluster = models.ForeignKey(
|
||||
'planner.Clusters',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name='content_record',
|
||||
help_text="The task this content belongs to"
|
||||
blank=False,
|
||||
related_name='contents',
|
||||
help_text="Parent cluster (required)"
|
||||
)
|
||||
content_type = models.CharField(
|
||||
max_length=100,
|
||||
db_index=True,
|
||||
help_text="Content type: post, page, product, service, category, tag, etc."
|
||||
)
|
||||
content_structure = models.CharField(
|
||||
max_length=100,
|
||||
db_index=True,
|
||||
help_text="Content structure/format: article, listicle, guide, comparison, product_page, etc."
|
||||
)
|
||||
html_content = models.TextField(help_text="Final AI-generated HTML content")
|
||||
word_count = models.IntegerField(default=0, validators=[MinValueValidator(0)])
|
||||
metadata = models.JSONField(default=dict, help_text="Additional metadata (SEO, structure, etc.)")
|
||||
title = models.CharField(max_length=255, blank=True, null=True)
|
||||
meta_title = models.CharField(max_length=255, blank=True, null=True)
|
||||
meta_description = models.TextField(blank=True, null=True)
|
||||
primary_keyword = models.CharField(max_length=255, blank=True, null=True)
|
||||
secondary_keywords = models.JSONField(default=list, blank=True, help_text="List of secondary keywords")
|
||||
|
||||
STATUS_CHOICES = [
|
||||
('draft', 'Draft'),
|
||||
('review', 'Review'),
|
||||
('publish', 'Publish'),
|
||||
]
|
||||
status = models.CharField(max_length=50, choices=STATUS_CHOICES, default='draft', help_text="Content workflow status (draft, review, publish)")
|
||||
generated_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
# Taxonomy relationships
|
||||
taxonomy_terms = models.ManyToManyField(
|
||||
'ContentTaxonomy',
|
||||
blank=True,
|
||||
related_name='contents',
|
||||
help_text="Associated taxonomy terms (categories, tags, attributes)"
|
||||
)
|
||||
|
||||
# Phase 4: Source tracking
|
||||
# External platform fields (WordPress integration)
|
||||
external_id = models.CharField(max_length=255, blank=True, null=True, db_index=True, help_text="WordPress/external platform post ID")
|
||||
external_url = models.URLField(blank=True, null=True, help_text="WordPress/external platform URL")
|
||||
|
||||
# Source tracking
|
||||
SOURCE_CHOICES = [
|
||||
('igny8', 'IGNY8 Generated'),
|
||||
('wordpress', 'WordPress Synced'),
|
||||
('shopify', 'Shopify Synced'),
|
||||
('custom', 'Custom API Synced'),
|
||||
('wordpress', 'WordPress Imported'),
|
||||
]
|
||||
source = models.CharField(
|
||||
max_length=50,
|
||||
choices=SOURCE_CHOICES,
|
||||
default='igny8',
|
||||
db_index=True,
|
||||
help_text="Source of the content"
|
||||
help_text="Content source"
|
||||
)
|
||||
|
||||
SYNC_STATUS_CHOICES = [
|
||||
('native', 'Native IGNY8 Content'),
|
||||
('imported', 'Imported from External'),
|
||||
('synced', 'Synced from External'),
|
||||
# Status tracking
|
||||
STATUS_CHOICES = [
|
||||
('draft', 'Draft'),
|
||||
('published', 'Published'),
|
||||
]
|
||||
sync_status = models.CharField(
|
||||
status = models.CharField(
|
||||
max_length=50,
|
||||
choices=SYNC_STATUS_CHOICES,
|
||||
default='native',
|
||||
choices=STATUS_CHOICES,
|
||||
default='draft',
|
||||
db_index=True,
|
||||
help_text="Sync status of the content"
|
||||
help_text="Content status"
|
||||
)
|
||||
|
||||
# External reference fields
|
||||
external_id = models.CharField(max_length=255, blank=True, null=True, help_text="External platform ID")
|
||||
external_url = models.URLField(blank=True, null=True, help_text="External platform URL")
|
||||
sync_metadata = models.JSONField(default=dict, blank=True, help_text="Platform-specific sync metadata")
|
||||
|
||||
# Phase 4: Linking fields
|
||||
internal_links = models.JSONField(default=list, blank=True, help_text="Internal links added by linker")
|
||||
linker_version = models.IntegerField(default=0, help_text="Version of linker processing")
|
||||
|
||||
# Phase 4: Optimization fields
|
||||
optimizer_version = models.IntegerField(default=0, help_text="Version of optimizer processing")
|
||||
optimization_scores = models.JSONField(default=dict, blank=True, help_text="Optimization scores (SEO, readability, engagement)")
|
||||
|
||||
# Phase 8: Universal Content Types
|
||||
ENTITY_TYPE_CHOICES = [
|
||||
('post', 'Blog Post'),
|
||||
('page', 'Page'),
|
||||
('product', 'Product'),
|
||||
('service', 'Service Page'),
|
||||
('taxonomy_term', 'Taxonomy Term Page'),
|
||||
# Legacy choices for backward compatibility
|
||||
('blog_post', 'Blog Post (Legacy)'),
|
||||
('article', 'Article (Legacy)'),
|
||||
('taxonomy', 'Taxonomy Page (Legacy)'),
|
||||
]
|
||||
entity_type = models.CharField(
|
||||
max_length=50,
|
||||
choices=ENTITY_TYPE_CHOICES,
|
||||
default='post',
|
||||
db_index=True,
|
||||
help_text="Type of content entity"
|
||||
)
|
||||
|
||||
# Phase 9: Content format (for posts)
|
||||
CONTENT_FORMAT_CHOICES = [
|
||||
('article', 'Article'),
|
||||
('listicle', 'Listicle'),
|
||||
('guide', 'How-To Guide'),
|
||||
('comparison', 'Comparison'),
|
||||
('review', 'Review'),
|
||||
('roundup', 'Roundup'),
|
||||
]
|
||||
content_format = models.CharField(
|
||||
max_length=50,
|
||||
choices=CONTENT_FORMAT_CHOICES,
|
||||
blank=True,
|
||||
null=True,
|
||||
db_index=True,
|
||||
help_text="Content format (only for entity_type=post)"
|
||||
)
|
||||
|
||||
# Phase 9: Cluster role
|
||||
CLUSTER_ROLE_CHOICES = [
|
||||
('hub', 'Hub Page'),
|
||||
('supporting', 'Supporting Content'),
|
||||
('attribute', 'Attribute Page'),
|
||||
]
|
||||
cluster_role = models.CharField(
|
||||
max_length=50,
|
||||
choices=CLUSTER_ROLE_CHOICES,
|
||||
default='supporting',
|
||||
blank=True,
|
||||
null=True,
|
||||
db_index=True,
|
||||
help_text="Role within cluster strategy"
|
||||
)
|
||||
|
||||
# Phase 9: WordPress post type
|
||||
external_type = models.CharField(
|
||||
max_length=100,
|
||||
blank=True,
|
||||
help_text="WordPress post type (post, page, product, service)"
|
||||
)
|
||||
|
||||
# Phase 8: Structured content blocks
|
||||
json_blocks = models.JSONField(
|
||||
default=list,
|
||||
blank=True,
|
||||
help_text="Structured content blocks (for products, services, taxonomies)"
|
||||
)
|
||||
|
||||
# Phase 8: Content structure data
|
||||
structure_data = models.JSONField(
|
||||
default=dict,
|
||||
blank=True,
|
||||
help_text="Content structure data (metadata, schema, etc.)"
|
||||
)
|
||||
|
||||
# Phase 9: Taxonomy relationships
|
||||
taxonomies = models.ManyToManyField(
|
||||
'ContentTaxonomy',
|
||||
blank=True,
|
||||
related_name='contents',
|
||||
through='ContentTaxonomyRelation',
|
||||
help_text="Associated taxonomy terms (categories, tags, attributes)"
|
||||
)
|
||||
|
||||
# Phase 9: Direct cluster relationship
|
||||
cluster = models.ForeignKey(
|
||||
'planner.Clusters',
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name='contents',
|
||||
help_text="Primary semantic cluster"
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
app_label = 'writer'
|
||||
db_table = 'igny8_content'
|
||||
ordering = ['-generated_at']
|
||||
ordering = ['-created_at']
|
||||
verbose_name = 'Content'
|
||||
verbose_name_plural = 'Contents'
|
||||
indexes = [
|
||||
models.Index(fields=['task']),
|
||||
models.Index(fields=['generated_at']),
|
||||
models.Index(fields=['source']),
|
||||
models.Index(fields=['sync_status']),
|
||||
models.Index(fields=['source', 'sync_status']),
|
||||
models.Index(fields=['entity_type']),
|
||||
models.Index(fields=['content_format']),
|
||||
models.Index(fields=['cluster_role']),
|
||||
models.Index(fields=['title']),
|
||||
models.Index(fields=['cluster']),
|
||||
models.Index(fields=['external_type']),
|
||||
models.Index(fields=['site', 'entity_type']),
|
||||
models.Index(fields=['content_type']),
|
||||
models.Index(fields=['content_structure']),
|
||||
models.Index(fields=['source']),
|
||||
models.Index(fields=['status']),
|
||||
models.Index(fields=['external_id']),
|
||||
models.Index(fields=['site', 'sector']),
|
||||
]
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
"""Automatically set account, site, and sector from task"""
|
||||
if self.task_id: # Check task_id instead of accessing task to avoid RelatedObjectDoesNotExist
|
||||
try:
|
||||
self.account = self.task.account
|
||||
self.site = self.task.site
|
||||
self.sector = self.task.sector
|
||||
except self.task.RelatedObjectDoesNotExist:
|
||||
pass # Task doesn't exist, skip
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
def __str__(self):
|
||||
return f"Content for {self.task.title}"
|
||||
return self.title or f"Content {self.id}"
|
||||
|
||||
|
||||
class ContentTaxonomy(SiteSectorBaseModel):
|
||||
"""
|
||||
Universal taxonomy model for categories, tags, and product attributes.
|
||||
Syncs with WordPress taxonomies and stores terms.
|
||||
Universal taxonomy model for WordPress and IGNY8 cluster-based taxonomies.
|
||||
Supports categories, tags, product attributes, and cluster mappings.
|
||||
"""
|
||||
|
||||
TAXONOMY_TYPE_CHOICES = [
|
||||
('category', 'Category'),
|
||||
('tag', 'Tag'),
|
||||
('product_cat', 'Product Category'),
|
||||
('product_tag', 'Product Tag'),
|
||||
('product_attr', 'Product Attribute'),
|
||||
('service_cat', 'Service Category'),
|
||||
]
|
||||
|
||||
SYNC_STATUS_CHOICES = [
|
||||
('native', 'Native IGNY8'),
|
||||
('imported', 'Imported from External'),
|
||||
('synced', 'Synced with External'),
|
||||
('product_category', 'Product Category'),
|
||||
('product_attribute', 'Product Attribute'),
|
||||
('cluster', 'Cluster Taxonomy'),
|
||||
]
|
||||
|
||||
name = models.CharField(max_length=255, db_index=True, help_text="Term name")
|
||||
@@ -326,46 +182,19 @@ class ContentTaxonomy(SiteSectorBaseModel):
|
||||
db_index=True,
|
||||
help_text="Type of taxonomy"
|
||||
)
|
||||
description = models.TextField(blank=True, help_text="Term description")
|
||||
parent = models.ForeignKey(
|
||||
'self',
|
||||
null=True,
|
||||
blank=True,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='children',
|
||||
help_text="Parent term for hierarchical taxonomies"
|
||||
)
|
||||
|
||||
# WordPress/WooCommerce sync fields
|
||||
# WordPress/external platform sync fields
|
||||
external_taxonomy = models.CharField(
|
||||
max_length=100,
|
||||
blank=True,
|
||||
null=True,
|
||||
help_text="WordPress taxonomy slug (category, post_tag, product_cat, pa_*) - null for cluster taxonomies"
|
||||
)
|
||||
external_id = models.IntegerField(
|
||||
null=True,
|
||||
blank=True,
|
||||
db_index=True,
|
||||
help_text="WordPress term ID"
|
||||
)
|
||||
external_taxonomy = models.CharField(
|
||||
max_length=100,
|
||||
blank=True,
|
||||
help_text="WP taxonomy name (category, post_tag, product_cat, pa_color)"
|
||||
)
|
||||
sync_status = models.CharField(
|
||||
max_length=50,
|
||||
choices=SYNC_STATUS_CHOICES,
|
||||
default='native',
|
||||
db_index=True,
|
||||
help_text="Sync status with external system"
|
||||
)
|
||||
|
||||
# WordPress metadata
|
||||
count = models.IntegerField(default=0, help_text="Post/product count from WordPress")
|
||||
metadata = models.JSONField(default=dict, blank=True, help_text="Additional metadata")
|
||||
|
||||
# Cluster mapping
|
||||
clusters = models.ManyToManyField(
|
||||
'planner.Clusters',
|
||||
blank=True,
|
||||
related_name='taxonomy_terms',
|
||||
help_text="Semantic clusters this term maps to"
|
||||
help_text="WordPress term_id - null for cluster taxonomies"
|
||||
)
|
||||
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
@@ -384,7 +213,6 @@ class ContentTaxonomy(SiteSectorBaseModel):
|
||||
models.Index(fields=['name']),
|
||||
models.Index(fields=['slug']),
|
||||
models.Index(fields=['taxonomy_type']),
|
||||
models.Index(fields=['sync_status']),
|
||||
models.Index(fields=['external_id', 'external_taxonomy']),
|
||||
models.Index(fields=['site', 'taxonomy_type']),
|
||||
models.Index(fields=['site', 'sector']),
|
||||
@@ -394,37 +222,6 @@ class ContentTaxonomy(SiteSectorBaseModel):
|
||||
return f"{self.name} ({self.get_taxonomy_type_display()})"
|
||||
|
||||
|
||||
class ContentTaxonomyRelation(models.Model):
|
||||
"""
|
||||
Through model for Content-Taxonomy M2M relationship.
|
||||
Simplified without SiteSectorBaseModel to avoid tenant_id issues.
|
||||
"""
|
||||
content = models.ForeignKey(
|
||||
Content,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='taxonomy_relations'
|
||||
)
|
||||
taxonomy = models.ForeignKey(
|
||||
ContentTaxonomy,
|
||||
on_delete=models.CASCADE,
|
||||
related_name='content_relations'
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
app_label = 'writer'
|
||||
db_table = 'igny8_content_taxonomy_relations'
|
||||
unique_together = [['content', 'taxonomy']]
|
||||
indexes = [
|
||||
models.Index(fields=['content']),
|
||||
models.Index(fields=['taxonomy']),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.content} → {self.taxonomy}"
|
||||
|
||||
|
||||
class Images(SiteSectorBaseModel):
|
||||
"""Images model for content-related images (featured, desktop, mobile, in-article)"""
|
||||
|
||||
|
||||
@@ -3,13 +3,7 @@ from igny8_core.auth.models import SiteSectorBaseModel, SeedKeyword
|
||||
|
||||
|
||||
class Clusters(SiteSectorBaseModel):
|
||||
"""Clusters model for keyword grouping"""
|
||||
|
||||
CONTEXT_TYPE_CHOICES = [
|
||||
('topic', 'Topic Cluster'),
|
||||
('attribute', 'Attribute Cluster'),
|
||||
('service_line', 'Service Line'),
|
||||
]
|
||||
"""Clusters model for keyword grouping - pure topic clusters"""
|
||||
|
||||
name = models.CharField(max_length=255, unique=True, db_index=True)
|
||||
description = models.TextField(blank=True, null=True)
|
||||
@@ -17,17 +11,6 @@ class Clusters(SiteSectorBaseModel):
|
||||
volume = models.IntegerField(default=0)
|
||||
mapped_pages = models.IntegerField(default=0)
|
||||
status = models.CharField(max_length=50, default='active')
|
||||
context_type = models.CharField(
|
||||
max_length=50,
|
||||
choices=CONTEXT_TYPE_CHOICES,
|
||||
default='topic',
|
||||
help_text="Primary dimension for this cluster (topic, attribute, service line)"
|
||||
)
|
||||
dimension_meta = models.JSONField(
|
||||
default=dict,
|
||||
blank=True,
|
||||
help_text="Extended metadata (taxonomy hints, attribute suggestions, coverage targets)"
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
@@ -41,7 +24,6 @@ class Clusters(SiteSectorBaseModel):
|
||||
models.Index(fields=['name']),
|
||||
models.Index(fields=['status']),
|
||||
models.Index(fields=['site', 'sector']),
|
||||
models.Index(fields=['context_type']),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
|
||||
@@ -117,7 +117,7 @@ class KeywordSerializer(serializers.ModelSerializer):
|
||||
|
||||
|
||||
class ClusterSerializer(serializers.ModelSerializer):
|
||||
"""Serializer for Clusters model"""
|
||||
"""Serializer for Clusters model - pure topic clusters"""
|
||||
sector_name = serializers.SerializerMethodField()
|
||||
site_id = serializers.IntegerField(write_only=True, required=False)
|
||||
sector_id = serializers.IntegerField(write_only=True, required=False)
|
||||
@@ -141,14 +141,6 @@ class ClusterSerializer(serializers.ModelSerializer):
|
||||
]
|
||||
read_only_fields = ['id', 'created_at', 'updated_at', 'account_id', 'keywords_count', 'volume', 'mapped_pages']
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
# Only include Stage 1 fields when feature flag is enabled
|
||||
if getattr(settings, 'USE_SITE_BUILDER_REFACTOR', False):
|
||||
self.fields['context_type'] = serializers.CharField(read_only=True)
|
||||
self.fields['context_type_display'] = serializers.SerializerMethodField()
|
||||
self.fields['dimension_meta'] = serializers.JSONField(read_only=True)
|
||||
|
||||
def get_sector_name(self, obj):
|
||||
"""Get sector name from Sector model"""
|
||||
if obj.sector_id:
|
||||
@@ -159,12 +151,6 @@ class ClusterSerializer(serializers.ModelSerializer):
|
||||
except Sector.DoesNotExist:
|
||||
return None
|
||||
return None
|
||||
|
||||
def get_context_type_display(self, obj):
|
||||
"""Get context type display name (only when feature flag enabled)"""
|
||||
if hasattr(obj, 'get_context_type_display'):
|
||||
return obj.get_context_type_display()
|
||||
return None
|
||||
|
||||
def validate_name(self, value):
|
||||
"""Ensure cluster name is unique within account"""
|
||||
|
||||
Reference in New Issue
Block a user