gcivil-nyu-org / Wednesday-Fall2023-Team-5 / 901

Committed 10 Dec 2023 02:45AM UTC coverage: 86.714% (-1.4%) from 88.104%

Build # 901

Build Type

Pull #201

travis-pro

Committed by

web-flow

Commit Message

Merge 7ac0ae996 into bba3f4208

Pull Request Pull Request #201: Front end changes for chat

Run Details

6 of 31 new or added lines in 3 files covered. (19.35%)

2 existing lines in 2 files now uncovered.

1227 of 1415 relevant lines covered (86.71%)

0.87 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

47.62

/chat/views.py

import json

# import logging

from django.contrib.auth.models import User
from django.shortcuts import render
from django.contrib.auth.decorators import login_required

# from common import db_retrieve_or_none
# from matching.models import UserTripMatches

# from common import db_retrieve_or_none
# from matching.models import UserTripMatches
from .models import Thread, ChatMessage
from django.db.models import Q


@login_required
def threads_page(request):
    threads = (
        Thread.objects.filter(Q(first_user=request.user) | Q(second_user=request.user))
        .prefetch_related("chat_message")
        .order_by("timestamp")
    )
    # if not threads:
    #     print("No threads present")
    #     first_user = request.user
    #     print(first_user)
    #     matches = UserTripMatches.objects.values().filter(Q(match_status="Matched"))
    #     print(matches)
    #     for match in matches:
    #         print("sender id: ")
    #         print(match["sender_id"])
    #         print("receiver id: ")
    #         print(match["receiver_id"])
    #         print("request_id: ")
    #         print(request.user.id)
    #         if request.user.id == match["sender_id"]:
    #             second_user = db_retrieve_or_none(User, match["receiver_id"])
    #             print("second_user: ")
    #             print(second_user.id)
    #             if second_user:
    #                 if second_user.id != first_user.id:
    #                     t = Thread.objects.get_or_create(
    #                         first_user=first_user, second_user=second_user
    #                     )
    #                 #         # print(t)
    #                     print("Created thread for")
    #                     print(first_user)
    #                     print(second_user)

    # Thread.objects.create()
    return render(request, "chat/threads.html", {"threads": threads})


@login_required
def messages_page(request, thread_id, other_user_id):
    threads = (
        Thread.objects.filter(Q(first_user=request.user) | Q(second_user=request.user))
        .prefetch_related("chat_message")
        .order_by("timestamp")
    )

    message_history = ChatMessage.objects.filter(thread=thread_id)

    json_data = {
        "thread_id": thread_id,
        "other_user_id": other_user_id,
        "self_user_id": request.user.id,
    }

    other_user = User.objects.get(id=other_user_id)

    chat_data = {"thread_id": thread_id, "other_user_instance": other_user}

    print(request.user.id)
    print(other_user_id)

    context = {
        "dump": json.dumps(json_data),
        "chat_data": chat_data,
        "message_history": message_history,
        "threads": threads,
    }

    return render(request, "chat/message_room.html", context)

1	import json	1✔
2
3	# import logging
4
5	from django.contrib.auth.models import User	1✔
6	from django.shortcuts import render	1✔
7	from django.contrib.auth.decorators import login_required	1✔
8
9	# from common import db_retrieve_or_none
10	# from matching.models import UserTripMatches
11
12	# from common import db_retrieve_or_none
13	# from matching.models import UserTripMatches
14	from .models import Thread, ChatMessage	1✔
15	from django.db.models import Q	1✔
16
17
18	@login_required	1✔
19	def threads_page(request):	1✔
20	threads = (	×
21	Thread.objects.filter(Q(first_user=request.user) \| Q(second_user=request.user))
22	.prefetch_related("chat_message")
23	.order_by("timestamp")
24	)
25	# if not threads:
26	# print("No threads present")
27	# first_user = request.user
28	# print(first_user)
29	# matches = UserTripMatches.objects.values().filter(Q(match_status="Matched"))
30	# print(matches)
31	# for match in matches:
32	# print("sender id: ")
33	# print(match["sender_id"])
34	# print("receiver id: ")
35	# print(match["receiver_id"])
36	# print("request_id: ")
37	# print(request.user.id)
38	# if request.user.id == match["sender_id"]:
39	# second_user = db_retrieve_or_none(User, match["receiver_id"])
40	# print("second_user: ")
41	# print(second_user.id)
42	# if second_user:
43	# if second_user.id != first_user.id:
44	# t = Thread.objects.get_or_create(
45	# first_user=first_user, second_user=second_user
46	# )
47	# # # print(t)
48	# print("Created thread for")
49	# print(first_user)
50	# print(second_user)
51
52	# Thread.objects.create()
53	return render(request, "chat/threads.html", {"threads": threads})	×
54
55
56	@login_required	1✔
57	def messages_page(request, thread_id, other_user_id):	1✔
NEW 58	threads = (	×
59	Thread.objects.filter(Q(first_user=request.user) \| Q(second_user=request.user))
60	.prefetch_related("chat_message")
61	.order_by("timestamp")
62	)
63
UNCOV 64	message_history = ChatMessage.objects.filter(thread=thread_id)	×
65
66	json_data = {	×
67	"thread_id": thread_id,
68	"other_user_id": other_user_id,
69	"self_user_id": request.user.id,
70	}
71
NEW 72	other_user = User.objects.get(id=other_user_id)	×
73
NEW 74	chat_data = {"thread_id": thread_id, "other_user_instance": other_user}	×
75
76	print(request.user.id)	×
77	print(other_user_id)	×
78
NEW 79	context = {	×
80	"dump": json.dumps(json_data),
81	"chat_data": chat_data,
82	"message_history": message_history,
83	"threads": threads,
84	}
85
86	return render(request, "chat/message_room.html", context)	×

gcivil-nyu-org / Wednesday-Fall2023-Team-5 / 901

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous