Skip to content

Commit

Permalink
CodeReview
Browse files Browse the repository at this point in the history
  • Loading branch information
KoalaSat committed Jun 21, 2024
1 parent 1fee89f commit a9e411d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 22 deletions.
12 changes: 4 additions & 8 deletions api/migrations/0047_notification.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,26 @@
# Generated by Django 5.0.6 on 2024-06-09 10:21
# Generated by Django 5.0.6 on 2024-06-14 18:31

import django.db.models.deletion
import django.utils.timezone
import uuid
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('api', '0046_alter_currency_currency'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.CreateModel(
name='Notification',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('reference', models.UUIDField(default=uuid.uuid4, editable=False)),
('created_at', models.DateTimeField(default=django.utils.timezone.now)),
('title', models.CharField(default=None, max_length=120)),
('description', models.CharField(blank=True, default=None, max_length=120)),
('title', models.CharField(default=None, max_length=240)),
('description', models.CharField(blank=True, default=None, max_length=240)),
('order', models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='api.order')),
('user', models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
('robot', models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='api.robot')),
],
),
]
10 changes: 4 additions & 6 deletions api/models/notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import uuid

from decouple import config
from django.contrib.auth.models import User
from api.models import Order
from api.models import Order, Robot
from django.db import models
from django.utils import timezone

Expand All @@ -23,15 +22,14 @@ def custom_uuid():

class Notification(models.Model):
# notification info
reference = models.UUIDField(default=custom_uuid, editable=False)
created_at = models.DateTimeField(default=timezone.now)

user = models.ForeignKey(User, on_delete=models.CASCADE, default=None)
robot = models.ForeignKey(Robot, on_delete=models.CASCADE, default=None)
order = models.ForeignKey(Order, on_delete=models.CASCADE, default=None)

# notification details
title = models.CharField(max_length=120, null=False, default=None)
description = models.CharField(max_length=120, default=None, blank=True)
title = models.CharField(max_length=240, null=False, default=None)
description = models.CharField(max_length=240, default=None, blank=True)

def __str__(self):
return f"{self.title} {self.description}"
9 changes: 3 additions & 6 deletions api/notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,9 @@ def send_message(self, order, robot, title, description):

def save_message(self, order, robot, title, description):
"""Save a message for a user"""
notification = Notification()
notification.title = title
notification.description = description
notification.user = robot
notification.order = order
notification.save()
Notification.objects.create(
title=title, description=description, robot=robot, order=order
)

def send_telegram_message(self, chat_id, title, description):
"""sends a message to a user with telegram notifications enabled"""
Expand Down
4 changes: 2 additions & 2 deletions api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -749,8 +749,8 @@ class NotificationsView(ListAPIView):

@extend_schema(**NotificationSchema.get)
def get(self, request, format=None):
user = request.user
queryset = Notification.objects.filter(user=user)
robot = request.user.robot
queryset = Notification.objects.filter(robot=robot)
created_at = request.GET.get("created_at")

if created_at:
Expand Down

0 comments on commit a9e411d

Please sign in to comment.