diff --git a/django_views_routing_homework/urls.py b/django_views_routing_homework/urls.py index 269591b..cfb9a6d 100644 --- a/django_views_routing_homework/urls.py +++ b/django_views_routing_homework/urls.py @@ -2,7 +2,10 @@ from django.urls import path from django_views_routing_homework.views.level_1.a_welcome_user import welcome_user_view +from django_views_routing_homework.views.level_1.b_bye_user import bye_user_view from django_views_routing_homework.views.level_1.c_baned_username import is_username_banned_view +from django_views_routing_homework.views.level_1.d_user_info import get_user_info_view +from django_views_routing_homework.views.level_1.e_month_title import get_month_title_view from django_views_routing_homework.views.level_2.a_user_info_by_username import get_user_info_by_username_view from django_views_routing_homework.views.level_2.c_product_type import get_products_view from django_views_routing_homework.views.level_2.d_authorization import authorization_view, process_authorization_view @@ -24,5 +27,8 @@ path('user/validate/', validate_user_data_view), path('user/github//full-name/', fetch_name_from_github_view), path('text/generate/', generate_file_with_text_view), + path('bye/', bye_user_view), + path('user-info//', get_user_info_view), + path('month-title//', get_month_title_view), # добавлять пути тут ] diff --git a/django_views_routing_homework/views/level_1/a_welcome_user.py b/django_views_routing_homework/views/level_1/a_welcome_user.py index c45ef16..f61e00b 100644 --- a/django_views_routing_homework/views/level_1/a_welcome_user.py +++ b/django_views_routing_homework/views/level_1/a_welcome_user.py @@ -10,5 +10,5 @@ def welcome_user_view(request): - welcome_message = 'Bye, user' + welcome_message = 'Hello, user' return HttpResponse(welcome_message) diff --git a/django_views_routing_homework/views/level_1/c_baned_username.py b/django_views_routing_homework/views/level_1/c_baned_username.py index 54bb122..34f6adc 100644 --- a/django_views_routing_homework/views/level_1/c_baned_username.py +++ b/django_views_routing_homework/views/level_1/c_baned_username.py @@ -14,5 +14,6 @@ def is_username_banned_view(request, username: str): - # код писать тут + if username in BANNED_USERNAMES: + return HttpResponse('User banned') return HttpResponse('User not banned') diff --git a/django_views_routing_homework/views/level_1/d_user_info.py b/django_views_routing_homework/views/level_1/d_user_info.py index 99db774..19fa593 100644 --- a/django_views_routing_homework/views/level_1/d_user_info.py +++ b/django_views_routing_homework/views/level_1/d_user_info.py @@ -22,3 +22,9 @@ def get_user_info_view(request, user_id: int): return JsonResponse(data=USER_ID_TO_USER_INFO_MAPPER[user_id]) else: return JsonResponse(data={'error': 'There is no user info'}, status=404) + +# http://127.0.0.1:8080/user-info/1/ +# {"username": "red_dev", "age": 34} + +# http://127.0.0.1:8080/user-info/5/ +# {"error": "There is no user info"} \ No newline at end of file diff --git a/django_views_routing_homework/views/level_1/e_month_title.py b/django_views_routing_homework/views/level_1/e_month_title.py index 77b266c..d121455 100644 --- a/django_views_routing_homework/views/level_1/e_month_title.py +++ b/django_views_routing_homework/views/level_1/e_month_title.py @@ -1,3 +1,5 @@ +import datetime + from django.http import HttpResponse, HttpResponseNotFound @@ -14,9 +16,13 @@ def get_month_title_by_number(month_number: int): - pass # код писать тут + time = datetime.datetime(2023, month_number, 1) + # months = ['January', 'February', 'March', 'April', 'May', 'June', + # 'July', 'August', 'September', 'October', 'November', 'December'] + return time.strftime('%B') # months[month_number-1] def get_month_title_view(request, month_number: int): - # код писать тут + if 1 <= month_number <= 12: + return HttpResponse(get_month_title_by_number(month_number)) return HttpResponseNotFound('Месяца с таким номером не существует')