diff --git a/apiserver/plane/license/management/commands/register_instance.py b/apiserver/plane/license/management/commands/register_instance.py index 0403f57de..2ee4239d1 100644 --- a/apiserver/plane/license/management/commands/register_instance.py +++ b/apiserver/plane/license/management/commands/register_instance.py @@ -9,7 +9,7 @@ from django.utils import timezone from django.conf import settings # Module imports -from plane.license.models import Instance, EditionTypes +from plane.license.models import Instance, InstanceEdition from plane.license.bgtasks.tracer import instance_traces @@ -55,7 +55,7 @@ class Command(BaseCommand): latest_version=payload.get("version"), last_checked_at=timezone.now(), is_test=os.environ.get("IS_TEST", "0") == "1", - edition=EditionTypes.PLANE_CE.value, + edition=InstanceEdition.PLANE_COMMUNITY.value, ) self.stdout.write(self.style.SUCCESS("Instance registered")) @@ -69,7 +69,7 @@ class Command(BaseCommand): instance.current_version = payload.get("version") instance.latest_version = payload.get("version") instance.is_test = os.environ.get("IS_TEST", "0") == "1" - instance.edition = EditionTypes.PLANE_CE.value + instance.edition = InstanceEdition.PLANE_COMMUNITY.value instance.save() # Call the instance traces task diff --git a/apiserver/plane/license/migrations/0005_rename_product_instance_edition_and_more.py b/apiserver/plane/license/migrations/0005_rename_product_instance_edition_and_more.py index 7b7a6bfd5..6746d4e69 100644 --- a/apiserver/plane/license/migrations/0005_rename_product_instance_edition_and_more.py +++ b/apiserver/plane/license/migrations/0005_rename_product_instance_edition_and_more.py @@ -4,28 +4,32 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ - ('license', '0004_changelog_deleted_at_instance_deleted_at_and_more'), + ("license", "0004_changelog_deleted_at_instance_deleted_at_and_more"), ] operations = [ migrations.RenameField( - model_name='instance', - old_name='product', - new_name='edition', + model_name="instance", + old_name="product", + new_name="edition", ), migrations.RemoveField( - model_name='instance', - name='license_key', + model_name="instance", + name="license_key", ), migrations.RemoveField( - model_name='instance', - name='user_count', + model_name="instance", + name="user_count", ), migrations.AddField( - model_name='instance', - name='is_test', + model_name="instance", + name="is_test", field=models.BooleanField(default=False), ), + migrations.AlterField( + model_name="instance", + name="edition", + field=models.CharField(default="PLANE_COMMUNITY", max_length=255), + ), ] diff --git a/apiserver/plane/license/models/__init__.py b/apiserver/plane/license/models/__init__.py index 4b8c13178..7580abf89 100644 --- a/apiserver/plane/license/models/__init__.py +++ b/apiserver/plane/license/models/__init__.py @@ -2,5 +2,5 @@ from .instance import ( Instance, InstanceAdmin, InstanceConfiguration, - EditionTypes, + InstanceEdition, ) diff --git a/apiserver/plane/license/models/instance.py b/apiserver/plane/license/models/instance.py index 85140e3a6..113b59ce4 100644 --- a/apiserver/plane/license/models/instance.py +++ b/apiserver/plane/license/models/instance.py @@ -11,8 +11,8 @@ from plane.db.models import BaseModel ROLE_CHOICES = ((20, "Admin"),) -class EditionTypes(Enum): - PLANE_CE = "plane-ce" +class InstanceEdition(Enum): + PLANE_COMMUNITY = "PLANE_COMMUNITY" class Instance(BaseModel): @@ -23,7 +23,7 @@ class Instance(BaseModel): current_version = models.CharField(max_length=255) latest_version = models.CharField(max_length=255, null=True, blank=True) edition = models.CharField( - max_length=255, default=EditionTypes.PLANE_CE.value + max_length=255, default=InstanceEdition.PLANE_COMMUNITY.value ) domain = models.TextField(blank=True) # Instance specifics