Merge pull request #54 from moscowpython/tech/move_to_enrollment_model

move enrollment to db

Author: Melevir

landing_page/mainpage/models.py

@@ -1,4 +1,6 @@
 from django.db import models
+from django.utils.timezone import now
+from mainpage.utils.typing import ensured
 
 
 class Curators(models.Model):
@@ -63,3 +65,10 @@ class Enrollment(models.Model):
     late_price_rub = models.IntegerField()
     early_price_date_to = models.DateField()
     late_price_date_from = models.DateField()
+
+    @staticmethod
+    def get_enrollment_with_active_registration() -> "Enrollment":
+        return ensured(Enrollment.objects.filter(end_registration_date__gte=now()).first())
+
+    def __str__(self) -> str:
+        return f"Enrollment ({self.start_date} - {self.end_date})"

landing_page/mainpage/templates/mainpage/include/index_hero.html

@@ -45,9 +45,9 @@ <h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h
                                     <div class="price-parent">
                                         <div class="price-date"><b>Ранняя регистрация</b></div>
                                         <div class="price-date">
-                                            До {{ enrollment.early_price.date_to | date:"j E" }}
+                                            До {{ enrollment.early_price_date_to | date:"j E" }}
                                         </div>
-                                        <strong class="price">{{ enrollment.early_price.price_rub }} р.</strong>
+                                        <strong class="price">{{ enrollment.early_price_rub }} р.</strong>
                                     </div>
                                     <div class="decr-price-parent">
                                         <a href="#howToPay" class="decr-price d-none d-lg-block scroll-to">
@@ -58,7 +58,7 @@ <h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h
                                         </a>
                                     </div>
                                 </div>
-                                {% if today <= enrollment.early_price.date_to %}
+                                {% if today <= enrollment.early_price_date_to %}
                                     <button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
                                         Купить билет
                                     </button>
@@ -72,8 +72,8 @@ <h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h
                                 <div class="pt-lg-3">
                                     <div class="price-parent">
                                         <div class="price-date"><b>Обычная регистрация</b></div>
-                                        <div class="price-date"> С {{ enrollment.late_price.date_from | date:"j E" }}</div>
-                                        <strong class="price">{{ enrollment.late_price.price_rub }} р.</strong>
+                                        <div class="price-date"> С {{ enrollment.late_price_date_from | date:"j E" }}</div>
+                                        <strong class="price">{{ enrollment.late_price_rub }} р.</strong>
                                     </div>
                                     <div class="decr-price-parent">
                                         <a href="#howToPay" class="decr-price d-none d-lg-block scroll-to">
@@ -82,7 +82,7 @@ <h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h
                                         <a href="#howToPay" class="decr-price d-lg-none scroll-to" style="padding-top: 5px">Есть рассрочка</a>
                                     </div>
                                 </div>
-                                {% if today >= enrollment.late_price.date_from %}
+                                {% if today >= enrollment.late_price_date_from %}
                                     <button class="btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
                                         Купить билет
                                     </button>

landing_page/mainpage/utils/__init__.py

@@ -0,0 +1,8 @@
+from typing import Optional, TypeVar
+
+_T = TypeVar("_T")
+
+
+def ensured(value: Optional[_T]) -> _T:
+    assert value
+    return value

landing_page/mainpage/utils/typing.py

@@ -1,47 +1,16 @@
-import dataclasses
-import datetime
 from datetime import date
-from typing import Optional
 
 from django.http import HttpRequest, HttpResponse
-from django.template import loader
+from django.shortcuts import render
 
-from .models import Curators, GraduateProjects
-
-
-@dataclasses.dataclass
-class CoursePrice:
-    price_rub: int
-    date_from: Optional[datetime.date] = None
-    date_to: Optional[datetime.date] = None
-
-
-@dataclasses.dataclass
-class Enrollment:
-    timepad_event_id: str
-    start_date: datetime.date
-    end_date: datetime.date
-    end_registration_date: datetime.date
-    early_price: CoursePrice
-    late_price: CoursePrice
+from .models import Curators, Enrollment, GraduateProjects
 
 
 def index(request: HttpRequest) -> HttpResponse:
-    template = loader.get_template('mainpage/index.html')
-
-    enrollment = Enrollment(
-        timepad_event_id='2441413',
-        start_date=datetime.date(2023, 9, 2),
-        end_date=datetime.date(2023, 11, 4),
-        end_registration_date=datetime.date(2023, 8, 31),
-        early_price=CoursePrice(price_rub=30000, date_to=datetime.date(2023, 6, 30)),
-        late_price=CoursePrice(price_rub=35000, date_from=datetime.date(2023, 7, 1)),
-    )
-
+    enrollment = Enrollment.get_enrollment_with_active_registration()
     context = {
         'enrollment': enrollment,
         'projects': GraduateProjects.objects.all(),
-
         'registration_closes_date_formatted': enrollment.end_registration_date.strftime('%b %d, %Y %H:%M:%S'),
         'student_videos': [
             {
@@ -72,4 +41,4 @@ def index(request: HttpRequest) -> HttpResponse:
         'curators_list': Curators.objects.filter(is_visible=True),
         'today': date.today(),
     }
-    return HttpResponse(template.render(context, request))
+    return render(request, 'mainpage/index.html', context)

landing_page/mainpage/views.py

@@ -0,0 +1,19 @@
+import datetime
+
+import pytest
+from mainpage.models import Enrollment
+
+
+@pytest.fixture
+def active_enrollment() -> Enrollment:
+    now = datetime.datetime.now()
+    return Enrollment.objects.create(
+        timepad_event_id="123",
+        start_date=now + datetime.timedelta(days=3),
+        end_date=now + datetime.timedelta(days=10),
+        end_registration_date=now + datetime.timedelta(days=1),
+        early_price_rub=100,
+        late_price_rub=200,
+        early_price_date_to=now,
+        late_price_date_from=now,
+    )

landing_page/tests/conftest.py

@@ -1,8 +1,9 @@
 import pytest
 from django.test import Client
+from mainpage.models import Enrollment
 
 
 @pytest.mark.django_db
-def test__index__shows_up(client: Client) -> None:
+def test__index__shows_up(client: Client, active_enrollment: Enrollment) -> None:
     response = client.get('/')
     assert response.status_code == 200