From 91ab80e49073ed7fdc019ec814663eae414595d5 Mon Sep 17 00:00:00 2001 From: Matt Hammerly Date: Tue, 12 Mar 2024 14:21:42 -0700 Subject: [PATCH] move model definition from apicore to core --- .../apicore/migrations/0001_initial.py | 29 +++++++++---------- shared/django_apps/apicore/models.py | 10 +++++-- .../core/migrations/0001_initial.py | 28 ++++++++++++++++++ shared/django_apps/core/models.py | 8 +++++ shared/django_apps/dummy_settings.py | 1 + 5 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 shared/django_apps/core/migrations/0001_initial.py diff --git a/shared/django_apps/apicore/migrations/0001_initial.py b/shared/django_apps/apicore/migrations/0001_initial.py index b575bfd4f..ca6904b61 100644 --- a/shared/django_apps/apicore/migrations/0001_initial.py +++ b/shared/django_apps/apicore/migrations/0001_initial.py @@ -1,28 +1,25 @@ -# Generated by Django 5.0.3 on 2024-03-12 20:16 +# Generated by Django 5.0.3 on 2024-03-12 21:20 -from django.db import migrations, models +from django.db import migrations class Migration(migrations.Migration): initial = True - dependencies = [] + dependencies = [ + ("core", "0001_initial"), + ] operations = [ migrations.CreateModel( - name="Owner", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("username", models.TextField()), - ], + name="ProxyOwner", + fields=[], + options={ + "proxy": True, + "indexes": [], + "constraints": [], + }, + bases=("core.owner",), ), ] diff --git a/shared/django_apps/apicore/models.py b/shared/django_apps/apicore/models.py index d1f254ca6..3b3d01abb 100644 --- a/shared/django_apps/apicore/models.py +++ b/shared/django_apps/apicore/models.py @@ -1,8 +1,14 @@ +import core.models as shared_core from django.db import models -class Owner(models.Model): - username = models.TextField() +class ProxyOwner(shared_core.Owner): + @property + def some_property(self): + return self.name + + class Meta: + proxy = True # Create your models here. diff --git a/shared/django_apps/core/migrations/0001_initial.py b/shared/django_apps/core/migrations/0001_initial.py new file mode 100644 index 000000000..b575bfd4f --- /dev/null +++ b/shared/django_apps/core/migrations/0001_initial.py @@ -0,0 +1,28 @@ +# Generated by Django 5.0.3 on 2024-03-12 20:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [] + + operations = [ + migrations.CreateModel( + name="Owner", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("username", models.TextField()), + ], + ), + ] diff --git a/shared/django_apps/core/models.py b/shared/django_apps/core/models.py index 71a836239..a2d7a5b82 100644 --- a/shared/django_apps/core/models.py +++ b/shared/django_apps/core/models.py @@ -1,3 +1,11 @@ from django.db import models + +class Owner(models.Model): + username = models.TextField() + + class Meta: + app_label = "core" + + # Create your models here. diff --git a/shared/django_apps/dummy_settings.py b/shared/django_apps/dummy_settings.py index 618e20ac3..29e863c3c 100644 --- a/shared/django_apps/dummy_settings.py +++ b/shared/django_apps/dummy_settings.py @@ -11,6 +11,7 @@ "shared.django_apps.pg_telemetry", "shared.django_apps.ts_telemetry", "shared.django_apps.rollouts", + "shared.django_apps.core", "shared.django_apps.apicore", ]