corentin.lemaire
/
Django-Redis-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added search feature 🎉

Browse Source
master
Corentin LEMAIRE 6 months ago
parent 799497fe9b
commit d6321f5718
11 changed files with 101 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
redis_app/templates/courses.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
<h1>Courses for {{ person.name }}</h1> <h1>Courses for {{ person.name }}</h1>

1
redis_app/templates/create.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
<form action="{% url 'create_course_form' %}" method="POST"> <form action="{% url 'create_course_form' %}" method="POST">

4
redis_app/templates/details.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
{% if error_message %} {% if error_message %}
@ -27,6 +28,9 @@
<p> <p>
There's only {{ course.places }} places There's only {{ course.places }} places
</p> </p>
<p>
The course has been created by {{ course.teacher_name }}
</p>
{% else %} {% else %}
<h1>No course found!</h1> <h1>No course found!</h1>
{% endif %} {% endif %}

1
redis_app/templates/home.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
{% if person != '' %} {% if person != '' %}

1
redis_app/templates/login.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
<form action="{% url 'login' %}" method="POST"> <form action="{% url 'login' %}" method="POST">

1
redis_app/templates/profile.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
<form action="{% url 'change_profile' %}" method="POST"> <form action="{% url 'change_profile' %}" method="POST">

1
redis_app/templates/register.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
<form action="{% url 'register' %}" method="POST"> <form action="{% url 'register' %}" method="POST">

32
redis_app/templates/search.html
Unescape View File

@ -0,0 +1,32 @@
<html>
<body>
<nav>
<a href="{% url 'home' %}">Home</a>
{% if person.name == '' %}
<a href="{% url 'login_form' %}">Login</a>
<a href="{% url 'register_form' %}">Register</a>
{% else %}
<a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %}
</nav>
<form action="{% url 'search_form' %}" method="POST">
{% csrf_token %}
<fieldset>
<legend><h1>Search</h1></legend>
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
<label for="keywords">Keywords</label><br>
<input name="keywords" id="keywords" placeholder="Keywords separated by spaces"><br/>
</fieldset>
<input type="submit" value="Search">
</form>
{% if courses %}
{% for course in courses %}
<a href="{% url 'details' course.id %}">{{ course.title }}</a>
{% endfor %}
{% else %}
<p>No course found</p>
{% endif %}
</body>
</html>

1
redis_app/templates/update.html
Unescape View File

@ -8,6 +8,7 @@
{% else %} {% else %}
<a href="{% url 'courses' %}">Courses</a> <a href="{% url 'courses' %}">Courses</a>
<a href="{% url 'profile' %}">Profile</a> <a href="{% url 'profile' %}">Profile</a>
<a href="{% url 'search' %}">Search</a>
{% endif %} {% endif %}
</nav> </nav>
<form action="{% url 'update_course_form' course.id %}" method="POST"> <form action="{% url 'update_course_form' course.id %}" method="POST">

2
redis_app/urls.py
Unescape View File

@ -13,6 +13,8 @@ urlpatterns = [
path('logout', views.logout, name='logout'), path('logout', views.logout, name='logout'),
path('create_course', views.create_course_view, name='create_course'), path('create_course', views.create_course_view, name='create_course'),
path('create_course_form', views.create_course_form, name='create_course_form'), path('create_course_form', views.create_course_form, name='create_course_form'),
path('search', views.search_view, name='search'),
path('search_form', views.search_form, name='search_form'),
path('update_course/<str:course_id>', views.update_course_view, name='update_course'), path('update_course/<str:course_id>', views.update_course_view, name='update_course'),
path('update_course_form/<str:course_id>', views.update_course_form, name='update_course_form'), path('update_course_form/<str:course_id>', views.update_course_form, name='update_course_form'),
path('delete/<str:course_id>', views.delete_course_view, name='delete_course'), path('delete/<str:course_id>', views.delete_course_view, name='delete_course'),

64
redis_app/views.py
Unescape View File

@ -39,10 +39,11 @@ def getCourseId(course):
def home(request, person=''): def home(request):
global cancel global cancel
global personLoggedIn
cancel = True cancel = True
return render(request, 'home.html', {'person': person}) return render(request, 'home.html', {'person': personLoggedIn})
def details(request, course_id): def details(request, course_id):
global redis_connection global redis_connection
@ -52,10 +53,11 @@ def details(request, course_id):
course = redis_connection.hgetall(f"course:{course_id}") course = redis_connection.hgetall(f"course:{course_id}")
if not course: if not course:
raise Http404("Course does not exist") raise Http404("Course does not exist")
course_id = getCourseId2(course['title'], course['teacher']) course['id'] = course_id
if course_id == False: teacher = redis_connection.hgetall(f"person:{course['teacher']}")
raise Http404("Course does not exist") if not teacher:
course['id'] = course_id.split(":")[1] raise Http404("Teacher does not exist")
course['teacher_name'] = teacher.get('name')
return render(request, 'details.html', {'course': course, 'person': personLoggedIn}) return render(request, 'details.html', {'course': course, 'person': personLoggedIn})
# Handle error messages. # Handle error messages.
@ -78,7 +80,7 @@ def register(request):
'role': person_role 'role': person_role
}) })
personLoggedIn = redis_connection.hgetall(person_key) personLoggedIn = redis_connection.hgetall(person_key)
return home(request, personLoggedIn) return home(request)
return render(request, 'register.html', {'person': Person(name="", role=""), "error_message": "The form has been wrongly filled!"}) return render(request, 'register.html', {'person': Person(name="", role=""), "error_message": "The form has been wrongly filled!"})
@ -96,7 +98,7 @@ def login(request):
if results[0] > 0: if results[0] > 0:
person_key = results[1] person_key = results[1]
personLoggedIn = redis_connection.hgetall(person_key) personLoggedIn = redis_connection.hgetall(person_key)
return home(request, personLoggedIn) return home(request)
return render(request, 'login.html', {'person': Person(name="", role=""), "error_message": "No user found!"}) return render(request, 'login.html', {'person': Person(name="", role=""), "error_message": "No user found!"})
return login_form(request) return login_form(request)
@ -334,4 +336,50 @@ def subscribe(courses_id):
def send_new_course_notification(message): def send_new_course_notification(message):
print(message) print(message)
def search(keywords):
courses = []
for keyword in keywords.split(' '):
if not keyword: # When the users end his keywords with a ' '
continue
title_query = f"@title:{keyword}"
summary_query = f"@summary:{keyword}"
level_query = f"@level:{keyword}"
teacher_query = f"@teacher:{keyword}"
title_results = redis_connection.execute_command('FT.SEARCH', 'idx:courses', title_query)
summary_results = redis_connection.execute_command('FT.SEARCH', 'idx:courses', summary_query)
level_results = redis_connection.execute_command('FT.SEARCH', 'idx:courses', level_query)
teacher_results = redis_connection.execute_command('FT.SEARCH', 'idx:courses', teacher_query)
for i in range(1, len(title_results), 2):
courses.append(title_results[i])
for i in range(1, len(summary_results), 2):
courses.append(summary_results[i])
for i in range(1, len(level_results), 2):
courses.append(level_results[i])
for i in range(1, len(teacher_results), 2):
courses.append(teacher_results[i])
return courses
def search_view(request):
global personLoggedIn
return render(request, 'search.html', {'person': personLoggedIn})
def search_form(request):
global personLoggedIn
global redis_connection
global cancel
cancel = True
if request.method == 'POST':
keywords = request.POST.get('keywords')
courses = []
courses_id = search(keywords)
for course_id in courses_id:
course = redis_connection.hgetall(course_id)
if not course:
continue
course['id'] = course_id.split(":")[1]
courses.append(course)
return render(request, 'search.html', {'person': personLoggedIn, 'courses': courses})
return render(request, 'search.html', {'person': personLoggedIn, "error_message": "The form has been wrongly filled!"})
# Every id is only the number, not the course:number or person:number # Every id is only the number, not the course:number or person:number
Write Preview
Loading…
Cancel
Save