Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Model Updates #6

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Draft: Model Updates #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions server/messenger_backend/models/conversation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
from django.db import models
from django.db.models import Q

from . import utils
from .user import User


class Conversation(utils.CustomModel):

user1 = models.ForeignKey(
User, on_delete=models.CASCADE, db_column="user1Id", related_name="+"
)
user2 = models.ForeignKey(
User, on_delete=models.CASCADE, db_column="user2Id", related_name="+",
)
users = models.ManyToManyField(User)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

createdAt = models.DateTimeField(auto_now_add=True, db_index=True)
updatedAt = models.DateTimeField(auto_now=True)

# find conversation given two user Ids
def find_conversation(user1Id, user2Id):
# find conversation given user Ids
def find_conversation(userIds):
# return conversation or None if it doesn't exist
try:
return Conversation.objects.get(
(Q(user1__id=user1Id) | Q(user1__id=user2Id)),
(Q(user2__id=user1Id) | Q(user2__id=user2Id)),
)
return Conversation.objects.get(users__exact=userIds)
except Conversation.DoesNotExist:
return None
2 changes: 2 additions & 0 deletions server/messenger_backend/models/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from . import utils
from .conversation import Conversation
from .user import User


class Message(utils.CustomModel):
Expand All @@ -14,5 +15,6 @@ class Message(utils.CustomModel):
related_name="messages",
related_query_name="message"
)
readByUsers = models.ManyToMany(User, through='Reads')
createdAt = models.DateTimeField(auto_now_add=True, db_index=True)
updatedAt = models.DateTimeField(auto_now=True)
11 changes: 11 additions & 0 deletions server/messenger_backend/models/read.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from django.db import models

from . import utils
from .message import Message
from .user import User


class Reads(utils.CustomModel):
message = models.ForeignKey(Message, on_delete=models.CASCADE)
user = models.ForeignKey(User, on_delete=models.CASCADE)
readAt = models.DateTimeField(null=False)