eeettt5 #530

melnikalex1977 · 2023-11-09T18:28:49Z

No description provided.

ArsenPidhoretskyi · 2023-11-09T18:50:49Z

.run/pytest in test_main.py.run.xml

Remove this file, and folder

ArsenPidhoretskyi · 2023-11-09T18:51:44Z

db/models.py

+ ]
+
+ def __str__(self) -> str:
+ return f"Matrix 2019-08-19 20:30:00 (row: {self.row}, seat: {self.seat})"


Why matrix and date hardcoded?

ArsenPidhoretskyi · 2023-11-09T18:51:52Z

services/movie.py

 from db.models import Movie


 def get_movies(
 genres_ids: list[int] = None,
 actors_ids: list[int] = None,
+ title=None,


add type annotations

ArsenPidhoretskyi · 2023-11-09T18:52:15Z

services/movie.py

@@ -15,13 +16,18 @@ def get_movies(
 if actors_ids:
 queryset = queryset.filter(actors__id__in=actors_ids)

+ if title:
+ # фільтрувати фільми за назвою, якщо аргумент `title` переданий
+ return Movie.objects.filter(title__icontains=title)


Why you do return this? And do not use already filtered queryset

ArsenPidhoretskyi · 2023-11-09T18:52:23Z

services/movie_session.py

+ tickets = Ticket.objects.filter(movie_session_id=movie_session_id)
+ for ticket in tickets:
+ taken_seats.append({"row": ticket.row, "seat": ticket.seat})
+ return taken_seats


Add empty line

ArsenPidhoretskyi · 2023-11-09T18:52:38Z

services/order.py

+ for ticket_data in tickets:
+ row = ticket_data.get("row")
+ seat = ticket_data.get("seat")
+ movie_session = MovieSession.objects.get(pk=1)


Why do you use pk=1? Also .get redundant here

Not fixed why pk=1???

ArsenPidhoretskyi · 2023-11-09T18:52:54Z

services/order.py

+ if username is not None:
+ return Order.objects.filter(user__username=username).order_by("created_at")
+ elif username is None:
+ return Order.objects.all().order_by("-created_at")


Use just one if here

ArsenPidhoretskyi · 2023-11-09T18:53:08Z

services/user.py

+ user.last_name = last_name
+ user.save()
+ return user
+ except User.DoesNotExist:


This is not possible

Remove try-except!!!

ArsenPidhoretskyi · 2023-11-09T18:53:25Z

services/user.py

+ try:
+ user = User.objects.get(id=user_id)
+ except User.DoesNotExist:


Use get_object_or_404

melnikalex1977 · 2023-11-12T18:55:03Z

перевір виконання цього завдання по даній адресі #537 (comment)

melnikalex1977 · 2023-11-12T19:12:44Z

перед тим як закинути на github виконане завдання я не побачив твої зауваження, тому якщо можна я їх виправлю після твоїх зауважень до #537 (comment)

ArsenPidhoretskyi

Comments are not fixed

ArsenPidhoretskyi · 2023-11-13T09:33:10Z

.run/pytest in test_main.py.run.xml

ArsenPidhoretskyi · 2023-11-13T09:33:21Z

db/models.py

@@ -49,4 +54,56 @@ class MovieSession(models.Model):
 )

 def __str__(self) -> str:
- return f"{self.movie.title} {str(self.show_time)}"
+ return f"{self.movie.title} {str(self.show_time)} {self.cinema_hall.rows} {self.cinema_hall.seats_in_row}"


Suggested change

return f"{self.movie.title} {str(self.show_time)} {self.cinema_hall.rows} {self.cinema_hall.seats_in_row}"

return f"{self.movie.title} {self.show_time} {self.cinema_hall.rows} {self.cinema_hall.seats_in_row}"

ArsenPidhoretskyi · 2023-11-13T09:33:39Z

db/models.py

+ ]
+
+ def __str__(self) -> str:
+ return f"Matrix 2019-08-19 20:30:00 (row: {self.row}, seat: {self.seat})"


ArsenPidhoretskyi · 2023-11-15T09:31:19Z

db/models.py

+class User(AbstractUser):
+ USERNAME_FIELD = "username"
+ REQUIRED_FIELDS = []
+ pass


remove pass

ArsenPidhoretskyi · 2023-11-15T09:31:30Z

db/models.py

+
+
+class User(AbstractUser):
+ USERNAME_FIELD = "username"


this is by default the same

ArsenPidhoretskyi · 2023-11-15T09:31:46Z

services/movie.py

@@ -15,13 +16,17 @@ def get_movies(
 if actors_ids:
 queryset = queryset.filter(actors__id__in=actors_ids)

+ if title:
+ return queryset.filter(title__icontains=title)


Why do you return here???

Suggested change

return queryset.filter(title__icontains=title)

queryset = queryset.filter(title__icontains=title)

ArsenPidhoretskyi · 2023-11-15T09:32:07Z

services/order.py

+ for ticket_data in tickets:
+ row = ticket_data.get("row")
+ seat = ticket_data.get("seat")
+ movie_session = MovieSession.objects.get(pk=1)


Not fixed why pk=1???

ArsenPidhoretskyi · 2023-11-15T09:32:31Z

services/order.py

+ date: datetime = None
+) -> None:
+ user, created = User.objects.get_or_create(username=username)
+ order, created = Order.objects.get_or_create(user=user)


Suggested change

order, created = Order.objects.get_or_create(user=user)

order = Order.objects.create(user)

One use can have many orders

ArsenPidhoretskyi · 2023-11-15T09:33:18Z

services/order.py

+ if username is not None:
+ return Order.objects.filter(
+ user__username=username).order_by("created_at"
+ )
+ elif username is None:
+ return Order.objects.all().order_by("-created_at")


Suggested change

if username is not None:

return Order.objects.filter(

user__username=username).order_by("created_at"

)

elif username is None:

return Order.objects.all().order_by("-created_at")

orders = Order.objects.all()

if username is not None:

orders = orders.filter(user__username=username)

return orders.order_by("-created_at")

ArsenPidhoretskyi · 2023-11-15T09:33:34Z

services/order.py

+ ticket.save()
+
+
+def get_orders(username: str = None) -> list:


it returns QuerySet, not list

ArsenPidhoretskyi · 2023-11-15T09:33:44Z

services/user.py

+ user.last_name = last_name
+ user.save()
+ return user
+ except User.DoesNotExist:


Remove try-except!!!

ArsenPidhoretskyi · 2023-11-15T09:33:50Z

services/user.py

+ try:
+ user = User.objects.get(id=user_id)
+ except User.DoesNotExist:


vasylhnatiuk · 2023-11-15T12:55:35Z

services/user.py

+ try:
+ user = User.objects.get(id=user_id)
+ except User.DoesNotExist:


vasylhnatiuk · 2023-11-15T12:55:50Z

services/order.py

+ ticket.save()
+
+
+def get_orders(username: str = None) -> QuerySet:


Suggested change

def get_orders(username: str = None) -> QuerySet:

def get_orders(username: str = None) -> QuerySet[Order]:

ArsenPidhoretskyi · 2023-11-15T14:07:06Z

services/order.py

+ username: str,
+ date: datetime = None
+) -> None:
+ user, created = User.objects.get_or_create(username=username)


Why do you create user? Use just get

ArsenPidhoretskyi · 2023-11-15T14:08:34Z

services/order.py

+ for ticket_data in tickets:
+ row = ticket_data.get("row")
+ seat = ticket_data.get("seat")
+ movie_session = MovieSession.objects.filter().first()


Why do you use .filter(). Also this line is redundant

this line redundant

ArsenPidhoretskyi · 2023-11-15T14:09:38Z

services/order.py

+ ticket, created = Ticket.objects.get_or_create(
+ row=row,
+ seat=seat,
+ movie_session=movie_session,


Suggested change

movie_session=movie_session,

movie_session_id=and here id of movie session,

поясни, що означає "movie_session_id=and here id of movie session,"

Suggested change

movie_session=movie_session,

movie_session_id=ticket_data["movie_session"],

ArsenPidhoretskyi · 2023-11-17T09:17:11Z

db/models.py

+
+ def __str__(self) -> str :
+ return (
+ f"{Movie.objects.first()} {self.movie_session.show_time} " # noqa


Why do you use Movie.objects.first() here?

ArsenPidhoretskyi · 2023-11-17T09:17:53Z

services/order.py

+ ticket, created = Ticket.objects.get_or_create(
+ row=row,
+ seat=seat,
+ movie_session=movie_session,


Suggested change

movie_session=movie_session,

movie_session_id=ticket_data["movie_session"],

ArsenPidhoretskyi · 2023-11-17T09:17:59Z

services/order.py

+ for ticket_data in tickets:
+ row = ticket_data.get("row")
+ seat = ticket_data.get("seat")
+ movie_session = MovieSession.objects.filter().first()


this line redundant

eeettt5

c9efc56

ArsenPidhoretskyi suggested changes Nov 9, 2023

View reviewed changes

melnikalex1977 requested a review from ArsenPidhoretskyi November 12, 2023 18:55

ArsenPidhoretskyi suggested changes Nov 13, 2023

View reviewed changes

melnikalex1977 and others added 9 commits November 13, 2023 18:58

Delete .run directory

34beb0c

Delete .run directory

0277f61

Merge remote-tracking branch 'origin/develop' into develop

ea6cf8b

Delete .run directory

3291d18

Merge remote-tracking branch 'origin/develop' into develop

6bcca84

Merge remote-tracking branch 'origin/develop' into develop

6518a43

Merge remote-tracking branch 'origin/develop' into develop

e66db13

Merge remote-tracking branch 'origin/develop' into develop

2f3e155

Merge remote-tracking branch 'origin/develop' into develop

fc8ce3a

melnikalex1977 requested a review from ArsenPidhoretskyi November 14, 2023 21:45

ArsenPidhoretskyi suggested changes Nov 15, 2023

View reviewed changes

Olexandr and others added 2 commits November 15, 2023 14:01

Merge remote-tracking branch 'origin/develop' into develop

bee2693

Merge remote-tracking branch 'origin/develop' into develop

6ccce95

melnikalex1977 requested a review from ArsenPidhoretskyi November 15, 2023 12:04

vasylhnatiuk suggested changes Nov 15, 2023

View reviewed changes

Olexandr added 2 commits November 15, 2023 16:01

Merge remote-tracking branch 'origin/develop' into develop

6ef09ff

Merge remote-tracking branch 'origin/develop' into develop

a540536

melnikalex1977 requested a review from vasylhnatiuk November 15, 2023 14:03

ArsenPidhoretskyi suggested changes Nov 15, 2023

View reviewed changes

melnikalex1977 requested a review from ArsenPidhoretskyi November 16, 2023 20:19

ArsenPidhoretskyi suggested changes Nov 17, 2023

View reviewed changes

Olexandr added 3 commits November 17, 2023 16:06

Merge remote-tracking branch 'origin/develop' into develop

7b97e40

Merge remote-tracking branch 'origin/develop' into develop

6d157c7

Merge remote-tracking branch 'origin/develop' into develop

4220275

Merge remote-tracking branch 'origin/develop' into develop

133eaaf

melnikalex1977 requested a review from ArsenPidhoretskyi November 17, 2023 14:12

vasylhnatiuk approved these changes Nov 17, 2023

View reviewed changes

	return f"{self.movie.title} {str(self.show_time)} {self.cinema_hall.rows} {self.cinema_hall.seats_in_row}"
	return f"{self.movie.title} {self.show_time} {self.cinema_hall.rows} {self.cinema_hall.seats_in_row}"

	return queryset.filter(title__icontains=title)
	queryset = queryset.filter(title__icontains=title)

	order, created = Order.objects.get_or_create(user=user)
	order = Order.objects.create(user)

		ticket.save()


		def get_orders(username: str = None) -> QuerySet:

	movie_session=movie_session,
	movie_session_id=and here id of movie session,

	movie_session=movie_session,
	movie_session_id=ticket_data["movie_session"],

eeettt5 #530

Are you sure you want to change the base?

eeettt5 #530

Conversation

melnikalex1977 commented Nov 9, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

melnikalex1977 commented Nov 12, 2023

melnikalex1977 commented Nov 12, 2023

ArsenPidhoretskyi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment