From 6cfc1dc0de20a6fa1e34ce83c4fcf9987de11d99 Mon Sep 17 00:00:00 2001 From: Matt Hammerly Date: Tue, 12 Mar 2024 13:17:13 -0700 Subject: [PATCH 1/4] add initial api core state --- shared/django_apps/core/__init__.py | 0 shared/django_apps/core/admin.py | 3 ++ shared/django_apps/core/apps.py | 6 ++++ .../core/migrations/0001_initial.py | 28 +++++++++++++++++++ .../django_apps/core/migrations/__init__.py | 0 shared/django_apps/core/models.py | 8 ++++++ shared/django_apps/core/tests.py | 3 ++ shared/django_apps/core/views.py | 3 ++ shared/django_apps/dummy_settings.py | 1 + 9 files changed, 52 insertions(+) create mode 100644 shared/django_apps/core/__init__.py create mode 100644 shared/django_apps/core/admin.py create mode 100644 shared/django_apps/core/apps.py create mode 100644 shared/django_apps/core/migrations/0001_initial.py create mode 100644 shared/django_apps/core/migrations/__init__.py create mode 100644 shared/django_apps/core/models.py create mode 100644 shared/django_apps/core/tests.py create mode 100644 shared/django_apps/core/views.py diff --git a/shared/django_apps/core/__init__.py b/shared/django_apps/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/shared/django_apps/core/admin.py b/shared/django_apps/core/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/shared/django_apps/core/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/shared/django_apps/core/apps.py b/shared/django_apps/core/apps.py new file mode 100644 index 000000000..c0ce093bd --- /dev/null +++ b/shared/django_apps/core/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class CoreConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "core" 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/migrations/__init__.py b/shared/django_apps/core/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/shared/django_apps/core/models.py b/shared/django_apps/core/models.py new file mode 100644 index 000000000..d1f254ca6 --- /dev/null +++ b/shared/django_apps/core/models.py @@ -0,0 +1,8 @@ +from django.db import models + + +class Owner(models.Model): + username = models.TextField() + + +# Create your models here. diff --git a/shared/django_apps/core/tests.py b/shared/django_apps/core/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/shared/django_apps/core/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/shared/django_apps/core/views.py b/shared/django_apps/core/views.py new file mode 100644 index 000000000..91ea44a21 --- /dev/null +++ b/shared/django_apps/core/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/shared/django_apps/dummy_settings.py b/shared/django_apps/dummy_settings.py index 358cc8dbf..b5301d894 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", ] MIDDLEWARE = [] From 3baf8fcc0d872d3a6458f574c43250ee5cd5e5d6 Mon Sep 17 00:00:00 2001 From: Matt Hammerly Date: Tue, 12 Mar 2024 14:10:43 -0700 Subject: [PATCH 2/4] rename core to apicore --- shared/django_apps/{core => apicore}/__init__.py | 0 shared/django_apps/{core => apicore}/admin.py | 0 shared/django_apps/{core => apicore}/apps.py | 4 ++-- .../django_apps/{core => apicore}/migrations/0001_initial.py | 0 shared/django_apps/{core => apicore}/migrations/__init__.py | 0 shared/django_apps/{core => apicore}/models.py | 0 shared/django_apps/{core => apicore}/tests.py | 0 shared/django_apps/{core => apicore}/views.py | 0 shared/django_apps/dummy_settings.py | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) rename shared/django_apps/{core => apicore}/__init__.py (100%) rename shared/django_apps/{core => apicore}/admin.py (100%) rename shared/django_apps/{core => apicore}/apps.py (63%) rename shared/django_apps/{core => apicore}/migrations/0001_initial.py (100%) rename shared/django_apps/{core => apicore}/migrations/__init__.py (100%) rename shared/django_apps/{core => apicore}/models.py (100%) rename shared/django_apps/{core => apicore}/tests.py (100%) rename shared/django_apps/{core => apicore}/views.py (100%) diff --git a/shared/django_apps/core/__init__.py b/shared/django_apps/apicore/__init__.py similarity index 100% rename from shared/django_apps/core/__init__.py rename to shared/django_apps/apicore/__init__.py diff --git a/shared/django_apps/core/admin.py b/shared/django_apps/apicore/admin.py similarity index 100% rename from shared/django_apps/core/admin.py rename to shared/django_apps/apicore/admin.py diff --git a/shared/django_apps/core/apps.py b/shared/django_apps/apicore/apps.py similarity index 63% rename from shared/django_apps/core/apps.py rename to shared/django_apps/apicore/apps.py index c0ce093bd..3cc1ff3cf 100644 --- a/shared/django_apps/core/apps.py +++ b/shared/django_apps/apicore/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class CoreConfig(AppConfig): +class ApiCoreConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" - name = "core" + name = "apicore" diff --git a/shared/django_apps/core/migrations/0001_initial.py b/shared/django_apps/apicore/migrations/0001_initial.py similarity index 100% rename from shared/django_apps/core/migrations/0001_initial.py rename to shared/django_apps/apicore/migrations/0001_initial.py diff --git a/shared/django_apps/core/migrations/__init__.py b/shared/django_apps/apicore/migrations/__init__.py similarity index 100% rename from shared/django_apps/core/migrations/__init__.py rename to shared/django_apps/apicore/migrations/__init__.py diff --git a/shared/django_apps/core/models.py b/shared/django_apps/apicore/models.py similarity index 100% rename from shared/django_apps/core/models.py rename to shared/django_apps/apicore/models.py diff --git a/shared/django_apps/core/tests.py b/shared/django_apps/apicore/tests.py similarity index 100% rename from shared/django_apps/core/tests.py rename to shared/django_apps/apicore/tests.py diff --git a/shared/django_apps/core/views.py b/shared/django_apps/apicore/views.py similarity index 100% rename from shared/django_apps/core/views.py rename to shared/django_apps/apicore/views.py diff --git a/shared/django_apps/dummy_settings.py b/shared/django_apps/dummy_settings.py index b5301d894..618e20ac3 100644 --- a/shared/django_apps/dummy_settings.py +++ b/shared/django_apps/dummy_settings.py @@ -11,7 +11,7 @@ "shared.django_apps.pg_telemetry", "shared.django_apps.ts_telemetry", "shared.django_apps.rollouts", - "shared.django_apps.core", + "shared.django_apps.apicore", ] MIDDLEWARE = [] From 78c11a07e5c0d1b9ce9e8108690444838a0b00e5 Mon Sep 17 00:00:00 2001 From: Matt Hammerly Date: Tue, 12 Mar 2024 14:11:36 -0700 Subject: [PATCH 3/4] initial new core state --- shared/django_apps/core/__init__.py | 0 shared/django_apps/core/admin.py | 3 +++ shared/django_apps/core/apps.py | 6 ++++++ shared/django_apps/core/migrations/__init__.py | 0 shared/django_apps/core/models.py | 3 +++ shared/django_apps/core/tests.py | 3 +++ shared/django_apps/core/views.py | 3 +++ 7 files changed, 18 insertions(+) create mode 100644 shared/django_apps/core/__init__.py create mode 100644 shared/django_apps/core/admin.py create mode 100644 shared/django_apps/core/apps.py create mode 100644 shared/django_apps/core/migrations/__init__.py create mode 100644 shared/django_apps/core/models.py create mode 100644 shared/django_apps/core/tests.py create mode 100644 shared/django_apps/core/views.py diff --git a/shared/django_apps/core/__init__.py b/shared/django_apps/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/shared/django_apps/core/admin.py b/shared/django_apps/core/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/shared/django_apps/core/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/shared/django_apps/core/apps.py b/shared/django_apps/core/apps.py new file mode 100644 index 000000000..c0ce093bd --- /dev/null +++ b/shared/django_apps/core/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class CoreConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "core" diff --git a/shared/django_apps/core/migrations/__init__.py b/shared/django_apps/core/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/shared/django_apps/core/models.py b/shared/django_apps/core/models.py new file mode 100644 index 000000000..71a836239 --- /dev/null +++ b/shared/django_apps/core/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/shared/django_apps/core/tests.py b/shared/django_apps/core/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/shared/django_apps/core/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/shared/django_apps/core/views.py b/shared/django_apps/core/views.py new file mode 100644 index 000000000..91ea44a21 --- /dev/null +++ b/shared/django_apps/core/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. From 91ab80e49073ed7fdc019ec814663eae414595d5 Mon Sep 17 00:00:00 2001 From: Matt Hammerly Date: Tue, 12 Mar 2024 14:21:42 -0700 Subject: [PATCH 4/4] 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", ]