Merge branch 'bugfix/playbook-view'

Author: Marcin Sołek

RELEASE-NOTES.md

@@ -1,3 +1,9 @@
+### v1.26.1
+
+##### Bugfixes
+- Bugfix playbook view ([#321](https://github.com/Code-Poets/project-liberation/pull/321))
+
+
 ### v1.26.0
 
 ##### Features

common/helpers.py

@@ -33,8 +33,3 @@ def create_image(
     if return_relative_path:
         return os.path.join(tmp_dir, file_name)
     return file_path
-
-
-def read_file(path: str) -> bytes:
-    with open(path, "rb") as file:
-        return file.read()

company_website/urls.py

@@ -11,5 +11,5 @@
     url(r"^how-we-work/$", views.HowWeWorkView.as_view(), name="how_we_work"),
     url(r"^privacy-and-policy/$", views.PrivacyAndPolicyView.as_view(), name="privacy_and_policy"),
     url(r"^thank-you/$", views.ThankYouView.as_view(), name="thank_you"),
-    url(r"^CodePoetsPlaybook/$", views.display_playbook_view, name="display_playbook"),
+    url(r"^CodePoetsPlaybook/$", views.PlaybookView.as_view(), name="display_playbook"),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

company_website/views.py

@@ -8,8 +8,8 @@
 from django.urls import reverse_lazy
 from django.views.generic import FormView
 from django.views.generic import ListView
+from django.views.generic import View
 
-from common.helpers import read_file
 from company_website.constants import ESTIMATE_PROJECT_EMAIL_SUBJECT
 from company_website.constants import ESTIMATE_PROJECT_EMAIL_TEMPLATE_NAME
 from company_website.constants import PageNames
@@ -102,14 +102,17 @@ class ThankYouView(CustomTemplateView):
     page_name = PageNames.THANK_YOU.name
 
 
-def display_playbook_view(request: HttpRequest) -> HttpResponse:
-    playbook_file_name = "CodePoetsPlaybook.pdf"
-    playbook_path = os.path.join(settings.STATIC_ROOT, "how_we_work", "files", playbook_file_name)
-
-    if request.method == "GET":
+class PlaybookView(View):
+    def get(self, _request: HttpRequest) -> HttpResponse:
+        playbook_file_name = "CodePoetsPlaybook.pdf"
+        playbook_path = os.path.join(settings.STATIC_ROOT, "how_we_work", "files", playbook_file_name)
         if os.path.isfile(playbook_path):
-            response = HttpResponse(read_file(playbook_path), content_type="application/pdf")
+            response = HttpResponse(self.read_file(playbook_path), content_type="application/pdf")
             response["Content-Disposition"] = f"filename={playbook_file_name}"
             return response
         return HttpResponse(status=404)
-    return HttpResponse(status=405)
+
+    @staticmethod
+    def read_file(path: str) -> bytes:
+        with open(path, "rb") as file:
+            return file.read()

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "project-liberation",
-  "version": "v1.26.0",
+  "version": "v1.26.1",
   "description": "Packages needed for proper application work.",
   "main": "index.js",
   "scripts": {

package.json

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "project-liberation"
-version = "v1.26.0"
+version = "v1.26.1"
 description = "Necessary packages for Project Liberation"
 authors = ["Karol Beker <[email protected]>"]