django-restit 4.2.45__tar.gz → 4.2.46__tar.gz

{django_restit-4.2.45 → django_restit-4.2.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.45
+Version: 4.2.46
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

django_restit-4.2.46/account/migrations/0019_group_location.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.4 on 2024-02-23 20:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0004_remove_address_modified_by_address_group_and_more'),
+        ('account', '0018_userpasskey'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='location',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='location.address'),
+        ),
+    ]

{django_restit-4.2.45 → django_restit-4.2.46}/account/models/group.py

@@ -38,6 +38,10 @@ class Group(models.Model, RestModel, MetaDataModel):
     # this is the new model for groups having multiple parents
     children = models.ManyToManyField("self", related_name="parents", symmetrical=False)
 
+    location = models.ForeignKey(
+        "location.Address", default=None, null=True, blank=True,
+        related_name="+", on_delete=models.SET_NULL)
+
     class RestMeta:
         SEARCH_FIELDS = [
             "name"
@@ -76,7 +80,8 @@ class Group(models.Model, RestModel, MetaDataModel):
             "default": {
                 "graphs": {
                     "self": "basic",
-                    "parent": "basic"
+                    "parent": "basic",
+                    "location": "basic"
                 },
                 "fields": ["metadata"],
             },
@@ -84,9 +89,17 @@ class Group(models.Model, RestModel, MetaDataModel):
                 "graphs": {
                     "self": "basic",
                     "parent": "basic",
-                    "children": "basic"
+                    "children": "basic",
+                    "location": "basic"
                 },
-                "fields": ["metadata"],
+                "extra": ["metadata"],
+            },
+            "location": {
+                "fields": ["name", "kind", "id"],
+                "extra": ["location"],
+                "graphs": {
+                    "location": "basic"
+                }
             },
             "abstract": {
                 "fields": [
@@ -157,7 +170,7 @@ class Group(models.Model, RestModel, MetaDataModel):
                 raise PermissionDeniedException("invalid parent")
             qset = qset.filter(parent=parent)
         elif child_of:
-            parent = parent = request.member.getGroup(child_of)
+            parent = request.member.getGroup(child_of)
             if parent:
                 request.group = None
                 return parent.getAllChildren(grand_children=True)

django_restit-4.2.46/location/migrations/0004_remove_address_modified_by_address_group_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.1.4 on 2024-02-23 19:15
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('account', '0018_userpasskey'),
+        ('location', '0003_address_postalcode_suffix'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='address',
+            name='modified_by',
+        ),
+        migrations.AddField(
+            model_name='address',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to='account.group'),
+        ),
+        migrations.AddField(
+            model_name='address',
+            name='label',
+            field=models.CharField(blank=True, db_index=True, default=None, max_length=250, null=True),
+        ),
+        migrations.AddField(
+            model_name='address',
+            name='member',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='addresses', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

{django_restit-4.2.45 → django_restit-4.2.46}/location/models/address.py

@@ -6,6 +6,11 @@ from .. import geolocate
 
 class Address(models.Model, rm.RestModel):
     class RestMeta:
+        VIEW_PERMS = [
+            "view_all_groups",
+            "manage_groups",
+            "manage_group",
+            "manage_settings"]
         GRAPHS = {
             "abstract": {
                 "fields":[
@@ -18,7 +23,15 @@ class Address(models.Model, rm.RestModel):
                 ]
             }
         }
-    modified_by = models.ForeignKey("account.User", null=True, blank=True, default=None, on_delete=models.CASCADE)
+    label = models.CharField(
+        max_length=250, null=True, blank=True,
+        default=None, db_index=True)
+    member = models.ForeignKey(
+        "account.User", null=True, blank=True,
+        default=None, on_delete=models.SET_NULL, related_name="addresses")
+    group = models.ForeignKey(
+        "account.Group", null=True, blank=True,
+        default=None, on_delete=models.SET_NULL, related_name="addresses")
     modified = models.DateTimeField(auto_now=True)
     line1 = models.CharField(max_length=255, blank=True, null=True, default=None)
     line2 = models.CharField(max_length=255, blank=True, null=True, default=None)

{django_restit-4.2.45 → django_restit-4.2.46}/location/rpc/__init__.py

@@ -1,3 +1,4 @@
 from .ip import *  # noqa: F401, F403
 from .track import *  # noqa: F401, F403
 from .location import *  # noqa: F401, F403
+from .address import *  # noqa: F401, F403

django_restit-4.2.46/location/rpc/address.py

@@ -0,0 +1,8 @@
+from rest import decorators as rd
+from location import models as location
+
+
+@rd.url('address')
+@rd.url('address/<int:pk>')
+def rest_on_address(request, pk=None):
+    return location.Address.on_rest_request(request, pk)

{django_restit-4.2.45 → django_restit-4.2.46}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.45"
+version = "4.2.46"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.45 → django_restit-4.2.46}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.45"
+__version__ = "4.2.46"

{django_restit-4.2.45 → django_restit-4.2.46}/rest/models/base.py

@@ -321,6 +321,16 @@ class RestModel(object):
     def getModel(app_name, model_name):
         return apps.get_model(app_name, model_name)
 
+    @staticmethod
+    def getModelInstance(app_name, model_name, **kwargs):
+        Model = apps.get_model(app_name, model_name)
+        return Model.objects.filter(**kwargs).last()
+
+    @staticmethod
+    def createModelInstance(app_name, model_name, **kwargs):
+        Model = apps.get_model(app_name, model_name)
+        return Model(**kwargs)
+
     def restGetGenericModel(self, field):
         # called by the rest module to magically parse
         # a component that is marked genericr elation in a graph