constec 0.5.3__tar.gz → 0.7.0__tar.gz

{constec-0.5.3 → constec-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: constec
-Version: 0.5.3
+Version: 0.7.0
 Summary: Base library for the Constec ecosystem - shared utilities, models, and namespace foundation
 License: MIT
 Project-URL: Homepage, https://github.com/TpmyCT/constec-python

constec-0.7.0/constec/db/migrations/0008_refactor_creator_fields.py

@@ -0,0 +1,173 @@
+# Generated manually - Refactor creator fields to support User and OrganizationUser
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def migrate_creator_data(apps, schema_editor):
+    """Migrate existing created_by data to created_by_user."""
+    Automation = apps.get_model('constec_db', 'Automation')
+    NotificationTemplate = apps.get_model('constec_db', 'NotificationTemplate')
+
+    # Migrate Automation creators
+    for automation in Automation.objects.all():
+        if automation.created_by:
+            automation.created_by_user = automation.created_by
+            automation.save(update_fields=['created_by_user'])
+
+    # Migrate NotificationTemplate creators
+    for template in NotificationTemplate.objects.all():
+        if template.created_by:
+            template.created_by_user = template.created_by
+            template.save(update_fields=['created_by_user'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('constec_db', '0007_add_organization_to_automations'),
+    ]
+
+    operations = [
+        # 1. Add new creator fields to Automation (nullable temporarily for data migration)
+        migrations.AddField(
+            model_name='automation',
+            name='created_by_user',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='User creator (company-level)',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='created_automations',
+                to='constec_db.user'
+            ),
+        ),
+        migrations.AddField(
+            model_name='automation',
+            name='created_by_org_user',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='OrganizationUser creator (org-level)',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='created_automations',
+                to='constec_db.organizationuser'
+            ),
+        ),
+
+        # 2. Add new creator fields to NotificationTemplate (nullable temporarily for data migration)
+        migrations.AddField(
+            model_name='notificationtemplate',
+            name='created_by_user',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='User creator (company-level)',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='created_templates',
+                to='constec_db.user'
+            ),
+        ),
+        migrations.AddField(
+            model_name='notificationtemplate',
+            name='created_by_org_user',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='OrganizationUser creator (org-level)',
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='created_templates',
+                to='constec_db.organizationuser'
+            ),
+        ),
+
+        # 3. Add triggered_by_org_user to ExecutionLog
+        migrations.AddField(
+            model_name='executionlog',
+            name='triggered_by_org_user',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='OrganizationUser who triggered execution (org-level)',
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name='triggered_executions',
+                to='constec_db.organizationuser'
+            ),
+        ),
+
+        # 4. Update existing triggered_by_user field help text
+        migrations.AlterField(
+            model_name='executionlog',
+            name='triggered_by_user',
+            field=models.ForeignKey(
+                blank=True,
+                help_text='User who triggered execution (company-level)',
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name='triggered_executions',
+                to='constec_db.user'
+            ),
+        ),
+
+        # 5. Migrate data from old created_by to new created_by_user
+        migrations.RunPython(migrate_creator_data, reverse_code=migrations.RunPython.noop),
+
+        # 6. Remove old created_by fields
+        migrations.RemoveField(
+            model_name='automation',
+            name='created_by',
+        ),
+        migrations.RemoveField(
+            model_name='notificationtemplate',
+            name='created_by',
+        ),
+
+        # 7. Add constraints for Automation
+        migrations.AddConstraint(
+            model_name='automation',
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ('created_by_user__isnull', False),
+                    ('created_by_org_user__isnull', True)
+                ) | models.Q(
+                    ('created_by_user__isnull', True),
+                    ('created_by_org_user__isnull', False)
+                ),
+                name='automation_single_creator'
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name='automation',
+            constraint=models.CheckConstraint(
+                check=models.Q(('created_by_user__isnull', False)) | models.Q(('created_by_org_user__isnull', False)),
+                name='automation_requires_creator'
+            ),
+        ),
+
+        # 8. Add constraints for NotificationTemplate
+        migrations.AddConstraint(
+            model_name='notificationtemplate',
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    ('created_by_user__isnull', False),
+                    ('created_by_org_user__isnull', True)
+                ) | models.Q(
+                    ('created_by_user__isnull', True),
+                    ('created_by_org_user__isnull', False)
+                ),
+                name='template_single_creator'
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name='notificationtemplate',
+            constraint=models.CheckConstraint(
+                check=models.Q(('created_by_user__isnull', False)) | models.Q(('created_by_org_user__isnull', False)),
+                name='template_requires_creator'
+            ),
+        ),
+
+        # 9. Delete deprecated Event model
+        migrations.DeleteModel(
+            name='Event',
+        ),
+    ]

constec-0.7.0/constec/db/migrations/0009_rename_user_to_companyuser.py

@@ -0,0 +1,40 @@
+# Generated manually - Rename User to CompanyUser for clarity and consistency
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('constec_db', '0008_refactor_creator_fields'),
+    ]
+
+    operations = [
+        # Rename tables
+        migrations.RenameModel(
+            old_name='User',
+            new_name='CompanyUser',
+        ),
+        migrations.RenameModel(
+            old_name='UserRole',
+            new_name='CompanyUserRole',
+        ),
+        migrations.RenameModel(
+            old_name='UserCompanyAccess',
+            new_name='CompanyUserAccess',
+        ),
+
+        # Update table names
+        migrations.AlterModelTable(
+            name='companyuser',
+            table='core"."company_users',
+        ),
+        migrations.AlterModelTable(
+            name='companyuserrole',
+            table='core"."company_user_roles',
+        ),
+        migrations.AlterModelTable(
+            name='companyuseraccess',
+            table='core"."company_user_access',
+        ),
+    ]

{constec-0.5.3 → constec-0.7.0}/constec/db/models/__init__.py

@@ -19,9 +19,14 @@ from .base import UUIDModel
 # Core models (core schema)
 from .organization import Organization, OrganizationRole, OrganizationUser
 from .company import Company
-from .user import User, UserRole, UserCompanyAccess
+from .user import CompanyUser, CompanyUserRole, CompanyUserAccess
 from .person import Person
 from .group import UserGroup
+
+# Backward compatibility aliases
+User = CompanyUser
+UserRole = CompanyUserRole
+UserCompanyAccess = CompanyUserAccess
 from .contact import ContactType, Contact, PersonContact
 from .tag import TagCategory, PersonTag, PersonTagged
 from .module import Module, CompanyModule, OrganizationModule
@@ -42,7 +47,7 @@ from .flow import FlowTemplate, Flow
 from .session import Session, Message
 
 # Automations models (automations schema)
-from .automation import Event, Automation, Trigger, Action, ExecutionLog, NotificationTemplate
+from .automation import Automation, Trigger, Action, ExecutionLog, NotificationTemplate
 
 
 __all__ = [
@@ -54,7 +59,11 @@ __all__ = [
     'OrganizationUser',
     # Company
     'Company',
-    # User
+    # CompanyUser
+    'CompanyUser',
+    'CompanyUserRole',
+    'CompanyUserAccess',
+    # Backward compatibility aliases
     'User',
     'UserRole',
     'UserCompanyAccess',
@@ -93,7 +102,6 @@ __all__ = [
     'Session',
     'Message',
     # Automations (automations schema)
-    'Event',
     'Automation',
     'Trigger',
     'Action',

{constec-0.5.3 → constec-0.7.0}/constec/db/models/automation.py

@@ -6,8 +6,8 @@ from django.db.models import Q
 from django.core.exceptions import ValidationError
 from .base import UUIDModel
 from .company import Company
-from .organization import Organization
-from .user import User
+from .organization import Organization, OrganizationUser
+from .user import CompanyUser
 
 
 class Automation(UUIDModel):
@@ -53,10 +53,23 @@ class Automation(UUIDModel):
         db_index=True,
         help_text="Organization para automations compartidas (opcional si se define company)"
     )
-    created_by = models.ForeignKey(
-        User,
+
+    # Creator - only ONE of these should be filled (XOR)
+    created_by_user = models.ForeignKey(
+        CompanyUser,
         on_delete=models.CASCADE,
-        related_name='created_automations'
+        null=True,
+        blank=True,
+        related_name='created_automations',
+        help_text="User creator (company-level)"
+    )
+    created_by_org_user = models.ForeignKey(
+        OrganizationCompanyUser,
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        related_name='created_automations',
+        help_text="OrganizationUser creator (org-level)"
     )
 
     # Info básica
@@ -107,12 +120,26 @@ class Automation(UUIDModel):
             models.CheckConstraint(
                 check=Q(company__isnull=False) | Q(organization__isnull=False),
                 name='automation_requires_company_or_organization'
-            )
+            ),
+            models.CheckConstraint(
+                check=Q(created_by_user__isnull=False) | Q(created_by_org_user__isnull=False),
+                name='automation_requires_creator'
+            ),
+            models.CheckConstraint(
+                check=Q(created_by_user__isnull=False, created_by_org_user__isnull=True) |
+                      Q(created_by_user__isnull=True, created_by_org_user__isnull=False),
+                name='automation_single_creator'
+            ),
         ]
 
     def __str__(self):
         return f"{self.name} ({self.status})"
 
+    @property
+    def creator(self):
+        """Helper to access creator regardless of type."""
+        return self.created_by_user or self.created_by_org_user
+
 
 class Trigger(UUIDModel):
     """
@@ -290,11 +317,20 @@ class ExecutionLog(UUIDModel):
         related_name='execution_logs'
     )
     triggered_by_user = models.ForeignKey(
-        User,
+        CompanyUser,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='triggered_executions',
+        help_text="User who triggered execution (company-level)"
+    )
+    triggered_by_org_user = models.ForeignKey(
+        OrganizationCompanyUser,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        related_name='triggered_executions'
+        related_name='triggered_executions',
+        help_text="OrganizationUser who triggered execution (org-level)"
     )
 
     # Estado
@@ -341,6 +377,11 @@ class ExecutionLog(UUIDModel):
     def __str__(self):
         return f"{self.automation.name} - {self.status} ({self.started_at})"
 
+    @property
+    def trigger_user(self):
+        """Helper to access trigger user regardless of type."""
+        return self.triggered_by_user or self.triggered_by_org_user
+
 
 class NotificationTemplate(UUIDModel):
     """
@@ -374,10 +415,23 @@ class NotificationTemplate(UUIDModel):
         db_index=True,
         help_text="Organization para templates compartidos (opcional si se define company)"
     )
-    created_by = models.ForeignKey(
-        User,
+
+    # Creator - only ONE of these should be filled (XOR)
+    created_by_user = models.ForeignKey(
+        CompanyUser,
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+        related_name='created_templates',
+        help_text="User creator (company-level)"
+    )
+    created_by_org_user = models.ForeignKey(
+        OrganizationCompanyUser,
         on_delete=models.CASCADE,
-        related_name='created_templates'
+        null=True,
+        blank=True,
+        related_name='created_templates',
+        help_text="OrganizationUser creator (org-level)"
     )
 
     # Info básica
@@ -413,100 +467,22 @@ class NotificationTemplate(UUIDModel):
             models.CheckConstraint(
                 check=Q(company__isnull=False) | Q(organization__isnull=False),
                 name='template_requires_company_or_organization'
-            )
+            ),
+            models.CheckConstraint(
+                check=Q(created_by_user__isnull=False) | Q(created_by_org_user__isnull=False),
+                name='template_requires_creator'
+            ),
+            models.CheckConstraint(
+                check=Q(created_by_user__isnull=False, created_by_org_user__isnull=True) |
+                      Q(created_by_user__isnull=True, created_by_org_user__isnull=False),
+                name='template_single_creator'
+            ),
         ]
 
     def __str__(self):
         return f"{self.channel}: {self.name}"
 
-
-class Event(UUIDModel):
-    """
-    Evento programado con soporte para múltiples tipos y recurrencia flexible.
-
-    Tipos soportados:
-    - notification: Notificaciones programadas
-    - automation: Automatizaciones programadas (acciones HTTP, workflows, etc.)
-    """
-
-    EVENT_TYPE_CHOICES = [
-        ('notification', 'Notification'),
-        ('automation', 'Automation'),
-    ]
-
-    STATUS_CHOICES = [
-        ('active', 'Active'),         # Activo y programado
-        ('paused', 'Paused'),         # Pausado temporalmente
-        ('completed', 'Completed'),   # Completado (para puntuales)
-        ('failed', 'Failed'),         # Falló la última ejecución
-        ('cancelled', 'Cancelled'),   # Cancelado permanentemente
-    ]
-
-    RECURRENCE_TYPE_CHOICES = [
-        ('punctual', 'Punctual'),     # Una o más veces en fechas específicas
-        ('periodic', 'Periodic'),     # Recurrente
-    ]
-
-    # FKs
-    company = models.ForeignKey(Company, on_delete=models.CASCADE, db_index=True)
-
-    # Tipo de evento
-    event_type = models.CharField(max_length=50, choices=EVENT_TYPE_CHOICES)
-
-    # Info básica
-    title = models.CharField(max_length=255)
-    description = models.TextField(blank=True)
-    status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='active')
-
-    # Recurrencia
-    recurrence_type = models.CharField(
-        max_length=20,
-        choices=RECURRENCE_TYPE_CHOICES,
-        help_text="Tipo de recurrencia: puntual (fechas específicas) o periódico"
-    )
-    recurrence_config = models.JSONField(
-        help_text="Configuración de recurrencia en formato JSON"
-    )
-
-    # Configuración específica del tipo de evento
-    config = models.JSONField(
-        default=dict,
-        help_text="Configuración específica según event_type (mensaje, URL, etc.)"
-    )
-
-    # Control de ejecución
-    next_execution_at = models.DateTimeField(
-        null=True,
-        blank=True,
-        db_index=True,
-        help_text="Próxima fecha/hora de ejecución calculada"
-    )
-    last_executed_at = models.DateTimeField(
-        null=True,
-        blank=True,
-        help_text="Última vez que se ejecutó"
-    )
-    execution_count = models.IntegerField(
-        default=0,
-        help_text="Cantidad de veces que se ha ejecutado"
-    )
-
-    # Auditoría
-    created_by = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE,
-        related_name='created_events'
-    )
-
-    class Meta:
-        db_table = '"automations"."events"'
-        app_label = 'constec_db'
-        indexes = [
-            models.Index(fields=['company', 'event_type']),
-            models.Index(fields=['status', 'next_execution_at']),
-            models.Index(fields=['recurrence_type']),
-        ]
-        ordering = ['next_execution_at']
-
-    def __str__(self):
-        return f"{self.event_type}: {self.title}"
+    @property
+    def creator(self):
+        """Helper to access creator regardless of type."""
+        return self.created_by_user or self.created_by_org_user

{constec-0.5.3 → constec-0.7.0}/constec/db/models/group.py

@@ -1,7 +1,7 @@
 from django.db import models
 from .base import UUIDModel
 from .company import Company
-from .user import User
+from .user import CompanyUser
 
 
 class UserGroup(UUIDModel):
@@ -23,7 +23,7 @@ class UserGroup(UUIDModel):
         blank=True
     )
     users = models.ManyToManyField(
-        User,
+        CompanyUser,
         related_name="groups"
     )
 

{constec-0.5.3 → constec-0.7.0}/constec/db/models/user.py

@@ -3,7 +3,7 @@ from .base import UUIDModel
 from .company import Company
 
 
-class User(UUIDModel):
+class CompanyUser(UUIDModel):
     """User belonging to a company."""
     company = models.ForeignKey(
         Company,
@@ -16,13 +16,13 @@ class User(UUIDModel):
 
     class Meta:
         app_label = 'constec_db'
-        db_table = 'core"."users'
+        db_table = 'core"."company_users'
 
     def __str__(self):
         return f"{self.name} ({self.email})"
 
 
-class UserRole(UUIDModel):
+class CompanyUserRole(UUIDModel):
     """Role within a company."""
     company = models.ForeignKey(
         Company,
@@ -38,17 +38,17 @@ class UserRole(UUIDModel):
 
     class Meta:
         app_label = 'constec_db'
-        db_table = 'core"."user_roles'
+        db_table = 'core"."company_user_roles'
         unique_together = [['company', 'name']]
 
     def __str__(self):
         return f"{self.name}"
 
 
-class UserCompanyAccess(UUIDModel):
-    """Cross-company access: one User can access multiple Companies."""
+class CompanyUserAccess(UUIDModel):
+    """Cross-company access: one CompanyUser can access multiple Companies."""
     user = models.ForeignKey(
-        User,
+        CompanyUser,
         on_delete=models.CASCADE,
         related_name="company_accesses",
     )
@@ -58,16 +58,16 @@ class UserCompanyAccess(UUIDModel):
         related_name="user_accesses",
     )
     role = models.ForeignKey(
-        UserRole,
+        CompanyUserRole,
         on_delete=models.PROTECT,
         related_name="user_accesses",
     )
 
     class Meta:
         app_label = 'constec_db'
-        db_table = 'core"."user_company_access'
-        verbose_name = 'User company access'
-        verbose_name_plural = 'User company access'
+        db_table = 'core"."company_user_access'
+        verbose_name = 'Company user access'
+        verbose_name_plural = 'Company user access'
         unique_together = [['user', 'company']]
 
     def __str__(self):

{constec-0.5.3 → constec-0.7.0}/constec.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: constec
-Version: 0.5.3
+Version: 0.7.0
 Summary: Base library for the Constec ecosystem - shared utilities, models, and namespace foundation
 License: MIT
 Project-URL: Homepage, https://github.com/TpmyCT/constec-python

{constec-0.5.3 → constec-0.7.0}/constec.egg-info/SOURCES.txt

@@ -16,6 +16,8 @@ constec/db/migrations/0004_rename_entities_company_cuit_idx_entities_company_e2c
 constec/db/migrations/0005_event.py
 constec/db/migrations/0006_automation_trigger_action_executionlog_notificationtemplate.py
 constec/db/migrations/0007_add_organization_to_automations.py
+constec/db/migrations/0008_refactor_creator_fields.py
+constec/db/migrations/0009_rename_user_to_companyuser.py
 constec/db/migrations/__init__.py
 constec/db/models/__init__.py
 constec/db/models/automation.py

{constec-0.5.3 → constec-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "constec"
-version = "0.5.3"
+version = "0.7.0"
 description = "Base library for the Constec ecosystem - shared utilities, models, and namespace foundation"
 readme = "README.md"
 requires-python = ">=3.9"