-
Notifications
You must be signed in to change notification settings - Fork 858
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.
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
Tickets and Orders solution #505
Open
Lyutillis
wants to merge
5
commits into
mate-academy:master
Choose a base branch
from
Lyutillis:solution
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8fe6de3
Tickets and Orders solution
Lyutillis 549e0d0
Tickets and Orders solution
Lyutillis 20186a6
Fixed clean() and save() methods in Ticket model
Lyutillis 0e840d8
Changed on_delete for models
Lyutillis a24de31
Changed code following the checklist, removed redundant code
Lyutillis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
114 changes: 114 additions & 0 deletions
114
db/migrations/0002_user_order_ticket_alter_movie_actors_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
# Generated by Django 4.0.2 on 2023-11-07 15:09 | ||
|
||
from django.conf import settings | ||
import django.contrib.auth.models | ||
import django.contrib.auth.validators | ||
from django.db import migrations, models | ||
import django.db.models.deletion | ||
import django.utils.timezone | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('auth', '0012_alter_user_first_name_max_length'), | ||
('db', '0001_initial'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='User', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('password', models.CharField(max_length=128, verbose_name='password')), | ||
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), | ||
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), | ||
('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), | ||
('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), | ||
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), | ||
('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), | ||
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), | ||
('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), | ||
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), | ||
], | ||
options={ | ||
'verbose_name': 'user', | ||
'verbose_name_plural': 'users', | ||
'abstract': False, | ||
}, | ||
managers=[ | ||
('objects', django.contrib.auth.models.UserManager()), | ||
], | ||
), | ||
migrations.CreateModel( | ||
name='Order', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('created_at', models.DateTimeField(auto_now_add=True)), | ||
], | ||
options={ | ||
'ordering': ['-created_at'], | ||
}, | ||
), | ||
migrations.CreateModel( | ||
name='Ticket', | ||
fields=[ | ||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
('row', models.IntegerField()), | ||
('seat', models.IntegerField()), | ||
], | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='actors', | ||
field=models.ManyToManyField(related_name='movies', to='db.Actor'), | ||
), | ||
migrations.AlterField( | ||
model_name='movie', | ||
name='genres', | ||
field=models.ManyToManyField(related_name='movies', to='db.Genre'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='cinema_hall', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='db.cinemahall'), | ||
), | ||
migrations.AlterField( | ||
model_name='moviesession', | ||
name='movie', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie_sessions', to='db.movie'), | ||
), | ||
migrations.AddIndex( | ||
model_name='movie', | ||
index=models.Index(fields=['title'], name='db_movie_title_5d0841_idx'), | ||
), | ||
migrations.AddField( | ||
model_name='ticket', | ||
name='movie_session', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='db.moviesession'), | ||
), | ||
migrations.AddField( | ||
model_name='ticket', | ||
name='order', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='db.order'), | ||
), | ||
migrations.AddField( | ||
model_name='order', | ||
name='user', | ||
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to=settings.AUTH_USER_MODEL), | ||
), | ||
migrations.AddField( | ||
model_name='user', | ||
name='groups', | ||
field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'), | ||
), | ||
migrations.AddField( | ||
model_name='user', | ||
name='user_permissions', | ||
field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'), | ||
), | ||
migrations.AddConstraint( | ||
model_name='ticket', | ||
constraint=models.UniqueConstraint(fields=('row', 'seat', 'movie_session'), name='TicketUniqueConstraint'), | ||
), | ||
] |
21 changes: 21 additions & 0 deletions
21
db/migrations/0003_remove_ticket_ticketuniqueconstraint_and_more.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Generated by Django 4.0.2 on 2023-11-07 16:08 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('db', '0002_user_order_ticket_alter_movie_actors_and_more'), | ||
] | ||
|
||
operations = [ | ||
migrations.RemoveConstraint( | ||
model_name='ticket', | ||
name='TicketUniqueConstraint', | ||
), | ||
migrations.AddConstraint( | ||
model_name='ticket', | ||
constraint=models.UniqueConstraint(fields=('movie_session', 'row', 'seat'), name='TicketUniqueConstraint'), | ||
), | ||
] |
17 changes: 17 additions & 0 deletions
17
db/migrations/0004_remove_ticket_ticketuniqueconstraint.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Generated by Django 4.0.2 on 2023-11-07 16:16 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('db', '0003_remove_ticket_ticketuniqueconstraint_and_more'), | ||
] | ||
|
||
operations = [ | ||
migrations.RemoveConstraint( | ||
model_name='ticket', | ||
name='TicketUniqueConstraint', | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Generated by Django 4.0.2 on 2023-11-07 16:16 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('db', '0004_remove_ticket_ticketuniqueconstraint'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddConstraint( | ||
model_name='ticket', | ||
constraint=models.UniqueConstraint(fields=('movie_session', 'row', 'seat'), name='TicketUniqueConstraint'), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import datetime | ||
from django.db import transaction, models | ||
from django.contrib.auth import get_user_model | ||
|
||
from db.models import Ticket, Order | ||
from .movie_session import get_movie_session_by_id | ||
|
||
|
||
@transaction.atomic | ||
def create_order( | ||
tickets: list[dict], username: str, date: datetime = None | ||
) -> Order: | ||
user = get_user_model().objects.get(username=username) | ||
order = Order.objects.create( | ||
user=user, | ||
) | ||
|
||
if date: | ||
order.created_at = date | ||
order.save() | ||
|
||
for ticket in tickets: | ||
Ticket.objects.create( | ||
movie_session=get_movie_session_by_id(ticket["movie_session"]), | ||
order=order, | ||
row=ticket["row"], | ||
seat=ticket["seat"], | ||
) | ||
|
||
return Order | ||
|
||
|
||
@transaction.atomic | ||
def get_orders(username: str = None) -> models.QuerySet: | ||
if username: | ||
return Order.objects.filter(user__username=username) | ||
|
||
return Order.objects.all() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
from db.models import User | ||
from django.contrib.auth import get_user_model | ||
|
||
|
||
def create_user( | ||
username: str, | ||
password: str, | ||
email: str = None, | ||
first_name: str = None, | ||
last_name: str = None, | ||
) -> User: | ||
user = get_user_model().objects.create_user( | ||
username=username, | ||
password=password | ||
) | ||
if email: | ||
user.email = email | ||
if first_name: | ||
user.first_name = first_name | ||
if last_name: | ||
user.last_name = last_name | ||
|
||
user.save() | ||
|
||
return user | ||
|
||
|
||
def get_user(user_id: int) -> User: | ||
return get_user_model().objects.get(pk=user_id) | ||
|
||
|
||
def update_user( | ||
user_id: int, | ||
username: str = None, | ||
password: str = None, | ||
email: str = None, | ||
first_name: str = None, | ||
last_name: str = None | ||
) -> User: | ||
user = get_user(user_id) | ||
|
||
if username: | ||
user.username = username | ||
if password: | ||
user.set_password(password) | ||
if email: | ||
user.email = email | ||
if first_name: | ||
user.first_name = first_name | ||
if last_name: | ||
user.last_name = last_name | ||
|
||
user.save() | ||
|
||
return user |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So if order will be canceled and deleted the ticked will be remain and there will be no possibility to sell this ticket to another person