django-restit 4.2.102__py3-none-any.whl → 4.2.104__py3-none-any.whl

account/migrations/0022_alter_memberdevice_modified.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-06-18 17:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0021_alter_cloudcredentials_group'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='memberdevice',
+            name='modified',
+            field=models.DateTimeField(auto_now=True, db_index=True),
+        ),
+    ]

account/models/device.py

@@ -16,7 +16,7 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
     This can include mobile and desktop devices.
     """
     created = models.DateTimeField(auto_now_add=True)
-    modified = models.DateTimeField(auto_now=True)
+    modified = models.DateTimeField(auto_now=True, db_index=True)
 
     member = models.ForeignKey("account.Member", related_name="devices", on_delete=models.CASCADE)
 
@@ -41,13 +41,15 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
     def sendData(self, message, **kwargs):
         messenger = getCloudMessenger(self.cm_provider)
         if messenger:
-            return messenger.sendToDevice(self, message)
+            resp = messenger.sendToDevice(self, message)
+            return resp
         return objict(status_code=404, reason=self.cm_provider)
 
     def sendNotification(self, title, body):
         messenger = getCloudMessenger(self.cm_provider)
         if messenger:
-            return messenger.sendNotification(self.cm_token, title, body)
+            resp = messenger.sendNotification(self.cm_token, title, body)
+            return resp
         return objict(status_code=404, reason=self.cm_provider)
 
     def notify(self, title, body):

account/models/member.py

@@ -627,10 +627,24 @@ class Member(User, RestModel, MetaDataModel):
         #     for slog in qset:
         #         slog.logout()
 
-    def notifyMobile(self, data=None, title=None, body=None):
-        for device in self.devices.filter(cm_provider="fcm", state=1):
-            if device.cm_token is None:
-                continue
+    def notifyMobile(self, data=None, title=None, body=None, delay=None):
+        if delay:
+            Task = RestModel.getModel("taskqueue", "Task")
+            if delay < 60:
+                Task.Publish(
+                    "account.Member", "on_task_cm",
+                    data=dict(pk=self.pk, delay=delay, data=data, title=title, body=body),
+                    stale_after_seconds=300,
+                    channel="tq_app_handler")
+            else:
+                Task.Publish(
+                    "account.Member", "on_task_cm",
+                    data=dict(pk=self.pk, data=data, title=title, body=body),
+                    scheduled_for=datetime.now() + timedelta(seconds=delay),
+                    channel="tq_app_handler")
+            return
+        stale = datetime.now() - timedelta(days=60)
+        for device in self.devices.filter(state=1, modified__gt=stale).exclude(cm_provider="ws", cm_token__isnull=True):
             if data is not None:
                 device.sendData(data)
             else:
@@ -1227,6 +1241,16 @@ class Member(User, RestModel, MetaDataModel):
             return None
         return cls.objects.filter(pk=uid).last()
 
+    @classmethod
+    def on_task_cm(cls, task):
+        member = cls.objects.filter(pk=task.data.pk).last()
+        if not member:
+            task.failed("could not find member")
+            return False
+        if task.data.delay:
+            time.sleep(task.data.delay)  # delay
+        member.notifyMobile(data=task.data.data, title=task.data.title, body=task.data.body)
+
 
 class MemberMetaData(MetaDataBase):
     parent = models.ForeignKey(Member, related_name="properties", on_delete=models.CASCADE)

{django_restit-4.2.102.dist-info → django_restit-4.2.104.dist-info}/METADATA

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

{django_restit-4.2.102.dist-info → django_restit-4.2.104.dist-info}/RECORD

@@ -23,13 +23,14 @@ account/migrations/0018_userpasskey.py,sha256=SdXYo4TkIeP5wLNfCza3Jq5-gKuUufzTHG
 account/migrations/0019_group_location.py,sha256=EfMB_w4qWUGDqQeNc453PFZwpjpTeoA6xr6Qgo_YAOM,601
 account/migrations/0020_cloudcredentials_cloudcredentialsmetadata.py,sha256=mHwxkyDfA4ueQOt34w5ndJB4XwNTDLv79CkKgzhlz-c,2250
 account/migrations/0021_alter_cloudcredentials_group.py,sha256=zoFYmE-hd3uRGX6DRO9k-osPwH0jFeTU7S-pjCOtakk,561
+account/migrations/0022_alter_memberdevice_modified.py,sha256=9eeKcdr9p6qFJ8ZxSnKSj1KxZjW8NZfM0YCMck6i0QQ,424
 account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
-account/models/device.py,sha256=DDeYCX_6gNgSIvfkPaICtxVilZXcjZNSNDQNikGA9lc,5871
+account/models/device.py,sha256=0AFeLMGk4im4KZVd3eGSyRbK4eQEXiFM2cdY8GUzihs,5934
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
 account/models/group.py,sha256=mjWwePt3ogQUo9m0EhURMz0aBrVVx_0Drr0lNDESQio,22281
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
-account/models/member.py,sha256=8xi-NahJipic_ut81vCFG-hY9x1U-trZ9KhnhIHAaFM,53092
+account/models/member.py,sha256=JziyYNC13SFWX07Thtoe2V_YlrKNn2RHJZcRk15Zh-s,54205
 account/models/membership.py,sha256=90EpAhOsGaqphDAkONP6j_qQ0OWSRaQsI8H7E7fgMkE,9249
 account/models/notify.py,sha256=TOkuVBLAsbzT58FOxII_G3Cj_IDQx16vyehyEsNrDcY,15306
 account/models/passkeys.py,sha256=TJxITUi4DT4_1tW2K7ZlOcRjJuMVl2NtKz7pKQU8-Tw,1516
@@ -454,7 +455,7 @@ taskqueue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskqueue/admin.py,sha256=E6zXoToS_ea3MdoGjZzF1JiepWFtDSoZUQdan8H-pXI,208
 taskqueue/migrations/0001_initial.py,sha256=JwYib8CK5ftSXlfxKZUcKEEVsXktNB5q3h-2tu9inGk,4738
 taskqueue/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-taskqueue/models.py,sha256=N3_9jWHPGzs6UxlAzpjst6qPhvIs1RELTy1cMXMeXsA,22407
+taskqueue/models.py,sha256=i8v0vQqlz4X3rVFVJsUSldA-26NEPWnsMZF2Kly_1Qo,22398
 taskqueue/periodic.py,sha256=2i0271khrCow3hDmlNEcoAZnesBVl40jd7MIim2Cxs4,3543
 taskqueue/rpc.py,sha256=Lf5VUoqCRkfWUAIvx_s508mjAtDPwpiWyxg0ryqWbQA,5793
 taskqueue/tq.py,sha256=PzSoDrawYcqZylruEgsK95gcJ4J_VhdM6rxg9V6_X8E,942
@@ -507,7 +508,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.102.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.102.dist-info/METADATA,sha256=XAlBU_rG-nUShVMEQRbDr1YUXqziHC7YmRYTsotPZ1c,7663
-django_restit-4.2.102.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.102.dist-info/RECORD,,
+django_restit-4.2.104.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.104.dist-info/METADATA,sha256=HsONd8WhUPc5fhviH3GzFFyW0mu-LUo17xAdeFDtrRQ,7663
+django_restit-4.2.104.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.104.dist-info/RECORD,,

taskqueue/models.py

@@ -392,7 +392,7 @@ class Task(models.Model, RestModel):
         return task
 
     @classmethod
-    def PublishModelTask(cls, model_name, fname, data, stale_after_seconds=0, channel="tq_model_handler", scheduled_for=scheduled_for):
+    def PublishModelTask(cls, model_name, fname, data, stale_after_seconds=0, channel="tq_model_handler", scheduled_for=None):
         return cls.Publish(cls, model_name, fname, data, stale_after_seconds, channel, scheduled_for)
 
     @classmethod