From b7c554b67f2eac2869e4bdb69e1b1e3dec5bc5eb Mon Sep 17 00:00:00 2001
From: Ruslan Ignatov <ruslanlena30@gmail.com>
Date: Thu, 3 Nov 2022 12:21:09 +0300
Subject: [PATCH] Fixed slash end of calendar urls. Fixed error message for
 incorrect year

---
 faerun_calendar/urls.py  |  4 ++--
 faerun_calendar/views.py | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/faerun_calendar/urls.py b/faerun_calendar/urls.py
index facba81..61b7e6a 100644
--- a/faerun_calendar/urls.py
+++ b/faerun_calendar/urls.py
@@ -4,7 +4,7 @@ from . import views
 
 urlpatterns = [
     path('', views.index, name='index'),
-    path('<int:year>', views.year_page, name='index'),
-    path('<int:year>/<int:month>/<int:day>', views.day_page, name='index'),
+    path('<int:year>/', views.year_page, name='index'),
+    path('<int:year>/<int:month>/<int:day>/', views.day_page, name='index'),
 ]
 
diff --git a/faerun_calendar/views.py b/faerun_calendar/views.py
index 131dbac..0aea9bc 100644
--- a/faerun_calendar/views.py
+++ b/faerun_calendar/views.py
@@ -81,23 +81,26 @@ def day_page(request, year: int, month: int, day: int):
 
 
 def year_page(request, year: int):
+    params = None
+
     try:
         year_data = YearData.objects.get(number=year)
     except YearData.DoesNotExist:
-        return HttpResponseNotFound('<h1>404 Not Found</h1>')
+        params = {'type': 'error', 'error_type': 'year'}
 
-    month_data = MonthData.objects.all().order_by('number')
-    calendar_data = CalendarData.objects.first()
-    events = Event.objects.all()
+    if not params:
+        month_data = MonthData.objects.all().order_by('number')
+        calendar_data = CalendarData.objects.first()
+        events = Event.objects.all()
 
-    params = {
-        'type': 'year',
-        'calendar_data': calendar_data,
-        'year_data': year_data,
-        'month_data': month_data,
-        'month_days': tuple(i+1 for i in range(30)),
-        'events': events,
-    }
+        params = {
+            'type': 'year',
+            'calendar_data': calendar_data,
+            'year_data': year_data,
+            'month_data': month_data,
+            'month_days': tuple(i+1 for i in range(30)),
+            'events': events,
+        }
 
     return render(request, 'faerun_calendar/index.html', params)