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.

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

'Solution' #861

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,47 +1,53 @@
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.shortcuts import render
from django.views import generic

from .models import Driver, Car, Manufacturer


@login_required

Choose a reason for hiding this comment

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

The @login_required decorator is correctly used here to ensure that only authenticated users can access the index view. This is a good practice for securing views that should not be publicly accessible.

def index(request):
"""View function for the home page of the site."""

num_drivers = Driver.objects.count()
num_cars = Car.objects.count()
num_manufacturers = Manufacturer.objects.count()
num_visits = request.session.get("num_visits", 0)
request.session["num_visits"] = num_visits + 1

context = {
"num_drivers": num_drivers,
"num_cars": num_cars,
"num_manufacturers": num_manufacturers,
"num_visits": num_visits + 1,

Choose a reason for hiding this comment

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

The num_visits is incremented twice: once when retrieving from the session and once when setting it back. This is correct, but you might want to consider using a single increment operation to avoid potential confusion.

}

return render(request, "taxi/index.html", context=context)


class ManufacturerListView(generic.ListView):
class ManufacturerListView(LoginRequiredMixin, generic.ListView):

Choose a reason for hiding this comment

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

The ManufacturerListView uses LoginRequiredMixin, which is appropriate for class-based views to ensure that only logged-in users can access this view.

model = Manufacturer
context_object_name = "manufacturer_list"
template_name = "taxi/manufacturer_list.html"
paginate_by = 5


class CarListView(generic.ListView):
class CarListView(LoginRequiredMixin, generic.ListView):
model = Car
paginate_by = 5
queryset = Car.objects.select_related("manufacturer")

Choose a reason for hiding this comment

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

In CarListView, the use of select_related is efficient for reducing the number of queries when accessing related manufacturer objects. This is a good practice for optimizing database access.



class CarDetailView(generic.DetailView):
class CarDetailView(LoginRequiredMixin, generic.DetailView):
model = Car


class DriverListView(generic.ListView):
class DriverListView(LoginRequiredMixin, generic.ListView):
model = Driver
paginate_by = 5


class DriverDetailView(generic.DetailView):
class DriverDetailView(LoginRequiredMixin, generic.DetailView):
model = Driver
queryset = Driver.objects.prefetch_related("cars__manufacturer")

Choose a reason for hiding this comment

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

In DriverDetailView, the use of prefetch_related is appropriate for optimizing queries when you expect to access related cars and their manufacturer. This helps in reducing the number of database queries.

2 changes: 2 additions & 0 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@

AUTH_USER_MODEL = "taxi.Driver"

Choose a reason for hiding this comment

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

The AUTH_USER_MODEL is set to taxi.Driver. Ensure that this custom user model is correctly implemented in your models.py file.


LOGIN_REDIRECT_URL = "/"

# Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/

Expand Down
1 change: 1 addition & 0 deletions taxi_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@
urlpatterns = [
path("admin/", admin.site.urls),
path("", include("taxi.urls", namespace="taxi")),
path("accounts/", include("django.contrib.auth.urls")),

Choose a reason for hiding this comment

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

The inclusion of django.contrib.auth.urls under the accounts/ path is correct for handling authentication-related views such as login and logout. Ensure that your templates for these views are correctly set up.

] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

Choose a reason for hiding this comment

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

The use of static() is appropriate for serving static files during development. Remember to configure a proper static files server for production environments.

7 changes: 7 additions & 0 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<ul class="sidebar-nav">
{% if user.is_authenticated %}
<li><a href="{% url "taxi:driver-detail" pk=user.id %}">User: {{ user.username }}</a></li>

Choose a reason for hiding this comment

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

The link for the user profile uses user.id to generate the URL for driver-detail. Ensure that the user object has an id attribute and that the driver-detail URL pattern is correctly configured to accept this parameter.

<li><a href="{% url "logout" %}">Logout</a></li>
{% else %}
<li><a href="{% url "login" %}">Login</a></li>
{% endif %}
<br>

Choose a reason for hiding this comment

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

Consider using CSS for spacing instead of <br> tags for better control over the layout and to maintain a clean HTML structure.

<li><a href="{% url "taxi:index" %}">Home page</a></li>
<li><a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li>
<li><a href="{% url "taxi:car-list" %}">Cars</a></li>
Expand Down
5 changes: 5 additions & 0 deletions templates/registration/logged_out.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% extends "base.html" %}

{% block content %}
<h2>Logged out</h2>
{% endblock %}
14 changes: 14 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% extends "base.html" %}

{% block content %}
<h2>Login</h2>
{% if form.errors %}
<p style="color: red">Invalid credentials</p>

Choose a reason for hiding this comment

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

Displaying a generic error message like 'Invalid credentials' is a good practice as it doesn't reveal whether the username or password was incorrect, enhancing security.

{% endif %}
<form action="{% url 'login' %}" method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Submit">
<input type="hidden" name="next" value="{{ next }}">

Choose a reason for hiding this comment

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

The use of the next hidden input field is correct for redirecting users to their intended destination after a successful login. Ensure that the next context variable is properly set in the view handling this form.

</form>
{% endblock %}
9 changes: 7 additions & 2 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ <h1>Driver list</h1>
<ul>
{% for driver in driver_list%}
<li>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
({{ driver.first_name }} {{ driver.last_name }})
{% if user.id == driver.id %}

Choose a reason for hiding this comment

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

The condition user.id == driver.id is used to check if the current user is the same as the driver in the list. Ensure that the user object is available in the template context and that both user.id and driver.id are correctly set.

<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
({{ driver.first_name }} {{ driver.last_name }}) (Me)
{% else %}
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
({{ driver.first_name }} {{ driver.last_name }})
{% endif %}
</li>
{% endfor %}
</ul>
Expand Down
1 change: 1 addition & 0 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ <h2>Dynamic content</h2>
<li><strong>Drivers:</strong> {{ num_drivers }}</li>
<li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>
<p>You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}.</p>

Choose a reason for hiding this comment

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

The use of the pluralize filter is correct for handling singular and plural forms of the word 'time'. This improves the readability and correctness of the message displayed to the user.

{% endblock %}
Loading