Merge pull request redhat-beyond#67 from OfirMatasas/dog-owner-homepage

Adding homepage for dog owner

daycare/models.py

@@ -40,8 +40,7 @@ def create(email, username, password, name, description, price_per_day, capacity
         validate_max_length(address, 50, "address")
         validate_price(price_per_day)
 
-        new_daycare = DayCare(user=User.objects.create_user(email=email, username=username, password=password,
-                                                            ),
+        new_daycare = DayCare(user=User.objects.create_user(email=email, username=username, password=password),
                               name=name, description=description, price_per_day=price_per_day,
                               capacity=capacity, area=area, city=city, address=address)
 
@@ -50,6 +49,12 @@ def create(email, username, password, name, description, price_per_day, capacity
 
         return new_daycare
 
+    def get_daycare_primary_image_url(self):
+        daycare_images = Image.get_images_by_daycare_id(daycare_id=self.id)
+        if daycare_images is not None and daycare_images.first() is not None:
+            return daycare_images.first().url
+        return "../../static/images/daycare-default-profile-image.jpeg"
+
 
 class Image(models.Model):
     url = models.CharField(max_length=1000)

daycare/test_image.py

@@ -3,6 +3,8 @@
 from .models import Image
 from django.core.exceptions import ValidationError
 
+DEFAULT_DAYCARE_PROFILE_URL = "../../static/images/daycare-default-profile-image.jpeg"
+
 
 @pytest.mark.django_db()
 class TestImageModel:
@@ -20,3 +22,12 @@ def test_image_creation_with_invalid_image_url(self, create_daycare_user):
         with pytest.raises(ValidationError,
                            match="Invalid URL image - URL should end with \'.gif\', \'.png\', \'.jpg\' or \'.jpeg\'."):
             Image.create(url="NOT_VALID_URL", daycare_id=DayCare.objects.get(id=create_daycare_user.id))
+
+    def test_daycare_has_customized_profile_image(self, create_image1, create_image2, create_daycare_user):
+        daycare_profile_image = create_daycare_user.get_daycare_primary_image_url()
+        assert daycare_profile_image != DEFAULT_DAYCARE_PROFILE_URL
+        assert daycare_profile_image is not None
+
+    def test_daycare_has_default_profile_image_when_no_customized_picture_was_found(self, create_daycare_user):
+        daycare_profile_image = create_daycare_user.get_daycare_primary_image_url()
+        assert daycare_profile_image == DEFAULT_DAYCARE_PROFILE_URL

dogowner/templates/dogowner/dog_owner_homepage.html

@@ -0,0 +1,26 @@
+{% extends "main/base_template.html" %}
+{% load static %}
+
+{% block stylesheets %}
+    <link rel="stylesheet" href="{% static 'CSS/dog_owner_homepage.css' %}">
+{% endblock %}
+
+{% block content %}
+<div class="row row-cols-1 g-3 cards">
+  <div style="display: flex; flex-direction: row; flex-wrap: wrap">
+    {% for daycare in daycares %}
+    <div class="card">
+      <img src="{{ daycare.get_daycare_primary_image_url }}" alt="{{ daycare.name }} image" class="card-img-top">
+      <div class="card-body">
+        <div style="display: flex; flex-direction: row">
+          <h5 class="card-title">{{ daycare.name }}</h5>
+        </div>
+        <p class="card-text">{{ daycare.description | truncatechars:250 }}</p>
+        <a href="/daycare/{{ daycare.id }}" class="btn btn-primary">Daycare Profile</a>
+      </div>
+    </div>
+    {% endfor %}
+  </div>
+</div>
+
+{% endblock %}

dogowner/views.py

@@ -1,3 +1,11 @@
-# from django.shortcuts import render
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render
+from daycare.models import DayCare
 
-# Create your views here.
+
+@login_required()
+def dog_owner_home(request):
+    context = {
+        'daycares': DayCare.objects.all(),
+    }
+    return render(request, 'dogowner/dog_owner_homepage.html', context)

main/tests.py

@@ -1,4 +1,5 @@
 import pytest
+from daycare.models import DayCare
 
 
 @pytest.mark.django_db
@@ -64,8 +65,15 @@ def test_root_entrypoint_redirection_logged_daycare_user(self, client, create_da
         assert response['Location'] == '/homepage/'
 
 
+@pytest.mark.django_db
 class TestHomepageView:
     def test_unlogged_user_access_to_homepage(self, client):
         response = client.get("/homepage/")
         assert response.status_code == 302
         assert response['Location'] == '/login/?next=/homepage/'
+
+    def test_dog_owner_homepage_is_visible_for_dog_owner(self, client, create_dog_owner_user):
+        client.force_login(user=create_dog_owner_user.user)
+        response = client.get("/homepage/")
+        assert response.status_code == 200
+        assert list(response.context['daycares']) == list(DayCare.objects.all())

main/urls.py

@@ -0,0 +1,7 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+    path('', views.homepage, name='homepage'),
+    path('about/', views.about, name='about'),
+]

main/views.py

@@ -2,8 +2,9 @@
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect
 from django.contrib.auth import logout
-from daycare.models import DayCare
 from dogowner.models import DogOwner
+from daycare.models import DayCare
+from dogowner.views import dog_owner_home
 from daycare.views import daycare_home
 
 
@@ -16,7 +17,7 @@ def index(request):
 @login_required()
 def homepage(request):
     if DogOwner.objects.filter(user=request.user).exists():
-        return render(request, 'main/homepage.html')
+        return dog_owner_home(request)
     elif DayCare.objects.filter(user=request.user).exists():
         return daycare_home(request)
 

static/CSS/dog_owner_homepage.css

@@ -0,0 +1,41 @@
+.cards
+{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-left: 50px;
+    justify-content: center;
+    align-items: center;
+}
+
+.row
+{
+    height: 30rem;
+    width: 120rem;
+    margin-left: 200px;
+}
+
+.card
+{
+    width: 18.5%;
+    height: 30rem;
+    margin: 60px 60px 0 60px;
+    max-width: 100%;
+}
+
+.card-body
+{
+    display: flex;
+    flex-direction: column;
+}
+
+.card-body .btn
+{
+    margin-right: 50%;
+    margin-top: auto;
+}
+
+.card-img-top
+{
+    height: 200px;
+}