diff --git a/Hotails/urls.py b/Hotails/urls.py
index 21257e0..17bf626 100644
--- a/Hotails/urls.py
+++ b/Hotails/urls.py
@@ -15,6 +15,8 @@
"""
from django.contrib import admin
from django.urls import path
+
+import orders.views
from main import views
from django.contrib.auth import views as auth_views
@@ -26,4 +28,5 @@
path('homepage/', views.homepage, name='homepage'),
path('logout/', views.logout_view, name='logout'),
path('about/', views.about, name='about'),
+ path('orders/', orders.views.orders, name='orders'),
]
diff --git a/main/templates/main/base_template.html b/main/templates/main/base_template.html
index b045033..58d3f34 100644
--- a/main/templates/main/base_template.html
+++ b/main/templates/main/base_template.html
@@ -25,7 +25,7 @@
{% if request.user.is_authenticated %}
- Profile
- - Orders
+ - Orders
- Search
- Chats
{% endif %}
diff --git a/main/tests.py b/main/tests.py
index 3d3107c..cbdc966 100644
--- a/main/tests.py
+++ b/main/tests.py
@@ -1,4 +1,5 @@
import pytest
+from orders.models import Order
from daycare.models import DayCare
@@ -77,3 +78,28 @@ def test_dog_owner_homepage_is_visible_for_dog_owner(self, client, create_dog_ow
response = client.get("/homepage/")
assert response.status_code == 200
assert list(response.context['daycares']) == list(DayCare.objects.all())
+
+
+@pytest.mark.django_db
+class TestOrdersView:
+ def test_only_orders_which_belongs_to_user_as_daycare_are_displayed(self, client, create_daycare_user):
+ client.force_login(user=create_daycare_user.user)
+ response = client.get("/orders/")
+
+ response_orders_list = list(response.context['orders'])
+ all_orders_of_daycare_list = list(Order.objects.filter(daycare_id=create_daycare_user))
+ response_user = response.context['user']
+
+ assert response_user == 'daycare'
+ assert response_orders_list == all_orders_of_daycare_list
+
+ def test_only_orders_which_belongs_to_user_as_dog_owner_are_displayed(self, client, create_dog_owner_user):
+ client.force_login(user=create_dog_owner_user.user)
+ response = client.get("/orders/")
+
+ response_orders_list = list(response.context['orders'])
+ all_orders_of_dog_owner_list = list(Order.objects.filter(dog_owner_id=create_dog_owner_user))
+ response_user = response.context['user']
+
+ assert response_user == 'dog_owner'
+ assert response_orders_list == all_orders_of_dog_owner_list
diff --git a/orders/models.py b/orders/models.py
index 105e1f3..5f14e01 100644
--- a/orders/models.py
+++ b/orders/models.py
@@ -2,6 +2,7 @@
from django.utils import timezone
from daycare.models import DayCare
from dogowner.models import DogOwner
+import datetime
class StatusOptions(models.TextChoices):
@@ -71,3 +72,51 @@ def cancel_order(self):
def get_order_total_price(self):
return self.price_per_day * (self.end_date - self.start_date).days
+
+ def get_order_status(self):
+ if self.status == StatusOptions.Pending:
+ return "Pending"
+ elif self.status == StatusOptions.Approved:
+ return "Approved"
+ elif self.status == StatusOptions.Canceled:
+ return "Canceled"
+ elif self.status == StatusOptions.OnGoing:
+ return "Ongoing"
+ return "Finished"
+
+ @staticmethod
+ def get_capacity_of_daycare_in_dates_range(daycare_id: DayCare, start_datetime: datetime, end_datetime: datetime):
+ number_of_days = (end_datetime - start_datetime).days
+ capacity_per_day: list[int] = [0] * number_of_days
+ start_date = datetime.date(year=start_datetime.year, month=start_datetime.month, day=start_datetime.day)
+ end_date = datetime.date(year=end_datetime.year, month=end_datetime.month, day=end_datetime.day)
+ relevant_orders = Order.objects.filter(daycare_id=daycare_id,
+ status__in=['A', 'O'],
+ end_date__gte=start_date,
+ start_date__lte=end_date)
+
+ for order in relevant_orders:
+ for day in range(number_of_days):
+ current_date = order.start_date + datetime.timedelta(days=day)
+ if current_date < start_date:
+ continue
+ elif current_date > end_date:
+ break
+ else:
+ capacity_per_day[day] = capacity_per_day[day] + 1
+
+ return capacity_per_day
+
+ def are_order_dates_available(self):
+ capacity_per_day: list[int] = self.get_capacity_of_daycare_in_dates_range(self.daycare_id,
+ self.start_date,
+ self.end_date)
+
+ daycare_capacity = DayCare.objects.get(name=self.daycare_id.name).capacity
+ return all(current_capacity < daycare_capacity for current_capacity in capacity_per_day)
+
+ def is_the_order_cancelable(self):
+ return self.status == StatusOptions.Pending or self.status == StatusOptions.Approved
+
+ def is_the_order_approvable(self):
+ return self.status == StatusOptions.Pending and self.are_order_dates_available()
diff --git a/orders/templates/orders/orders.html b/orders/templates/orders/orders.html
new file mode 100644
index 0000000..615021b
--- /dev/null
+++ b/orders/templates/orders/orders.html
@@ -0,0 +1,54 @@
+{% extends "main/base_template.html" %}
+{% load static %}
+
+{% block stylesheets %}
+
+
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
+ Name |
+ Book Date |
+ Start Date |
+ End Date |
+ Status |
+ Actions |
+
+
+
+
+ {% for order in orders %}
+
+
+ {% if user == 'daycare' %}
+ {{ order.dog_owner_id }}
+ {% else %}
+ {{ order.daycare_id.name }}
+ {% endif %}
+ |
+ {{order.book_date}} |
+ {{order.start_date}} |
+ {{order.end_date}} |
+ {{order.get_order_status}} |
+
+ {% if order.is_the_order_approvable and user == 'daycare' %}
+
+ {% endif %}
+ {% if order.is_the_order_cancelable %}
+
+ {% endif %}
+ |
+
+ {% endfor %}
+
+
+
+
+
+{% endblock %}
diff --git a/orders/tests.py b/orders/tests.py
index e9259ab..1485a8f 100644
--- a/orders/tests.py
+++ b/orders/tests.py
@@ -52,3 +52,66 @@ def test_dog_owner_id_is_deleted_when_dog_owner_is_deleted(self, create_order):
def test_daycare_id_is_deleted_when_daycare_is_deleted(self, create_order):
DayCare.objects.get(id=1).delete()
assert Order.objects.get(id=create_order.id).daycare_id is None
+
+ @pytest.mark.parametrize("dog_owner_1_id, dog_owner_2_id, delta_1, delta_2, capacity, expected_result",
+ [(1, 2, 3, 5, 1, False),
+ (2, 5, 4, 3, 10, True),
+ (5, 4, 6, 7, 15, True),
+ (4, 3, 4, 2, 1, False)])
+ def test_order_is_approvable_according_to_daycare_capacity(self,
+ dog_owner_1_id: DogOwner,
+ dog_owner_2_id: DogOwner,
+ delta_1: int,
+ delta_2: int,
+ capacity: int,
+ expected_result: bool):
+ daycare = DayCare.create("capacity_email@gmail.com", "CapacityUserName", "CapacityPassword", "CapacityName",
+ "Changeable capacity", 100, capacity, "Merkaz", "Tel Aviv", "Capacity 123")
+ dog_owner_1 = DogOwner.objects.get(id=dog_owner_1_id)
+ dog_owner_2 = DogOwner.objects.get(id=dog_owner_2_id)
+
+ order1 = Order.create(start_date=timezone.now(), end_date=timezone.now() + datetime.timedelta(days=delta_1),
+ daycare_id=daycare, dog_owner_id=dog_owner_1, price_per_day=100)
+ order2 = Order.create(start_date=timezone.now(), end_date=timezone.now() + datetime.timedelta(days=delta_2),
+ daycare_id=daycare, dog_owner_id=dog_owner_2, price_per_day=100)
+
+ order1.approve_order()
+ assert order2.is_the_order_approvable() == expected_result
+
+ @pytest.mark.parametrize("new_status, expected_result", [(StatusOptions.Pending, True),
+ (StatusOptions.Canceled, False),
+ (StatusOptions.Approved, True),
+ (StatusOptions.OnGoing, False),
+ (StatusOptions.Finished, False)])
+ def test_order_cancellation_according_to_order_status(self,
+ create_order: Order,
+ new_status: StatusOptions,
+ expected_result: StatusOptions):
+ create_order.status = new_status
+ assert create_order.is_the_order_cancelable() == expected_result
+
+ @pytest.mark.parametrize("new_status, expected_result", [(StatusOptions.Pending, "Pending"),
+ (StatusOptions.Canceled, "Canceled"),
+ (StatusOptions.Approved, "Approved"),
+ (StatusOptions.OnGoing, "Ongoing"),
+ (StatusOptions.Finished, "Finished")])
+ def test_get_order_status_as_string(self,
+ create_order: Order,
+ new_status: StatusOptions,
+ expected_result: StatusOptions):
+ create_order.status = new_status
+ assert create_order.get_order_status() == expected_result
+
+ def test_get_daycare_capacity_in_dates_range(self, create_order):
+ original_capacity_list = Order.get_capacity_of_daycare_in_dates_range(create_order.daycare_id,
+ create_order.start_date,
+ create_order.end_date)
+ create_order.approve_order()
+ updated_capacity_list = Order.get_capacity_of_daycare_in_dates_range(create_order.daycare_id,
+ create_order.start_date,
+ create_order.end_date)
+ assert len(original_capacity_list) == len(updated_capacity_list)
+
+ equality_list = [updated_capacity_list[i] == original_capacity_list[i] + 1
+ for i in range(len(original_capacity_list))]
+ assert equality_list.count(True) == len(equality_list)
diff --git a/orders/views.py b/orders/views.py
index fd0e044..82a21f0 100644
--- a/orders/views.py
+++ b/orders/views.py
@@ -1,3 +1,21 @@
-# from django.shortcuts import render
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render
-# Create your views here.
+from dogowner.models import DogOwner
+from orders.models import Order
+
+
+@login_required()
+def orders(request):
+ if DogOwner.objects.filter(user=request.user).exists():
+ context = {
+ 'orders': Order.objects.filter(dog_owner_id__user=request.user),
+ 'user': 'dog_owner',
+ }
+ else:
+ context = {
+ 'orders': Order.objects.filter(daycare_id__user=request.user),
+ 'user': 'daycare',
+ }
+
+ return render(request, 'orders/orders.html', context)
diff --git a/static/CSS/orders.css b/static/CSS/orders.css
new file mode 100644
index 0000000..f80bf1b
--- /dev/null
+++ b/static/CSS/orders.css
@@ -0,0 +1,8 @@
+td, th
+{
+ text-align: center;
+}
+
+.container {
+ padding: 2rem 0;
+}