Pipeline ci cd conteneurisation

.circleci/config.yml

@@ -0,0 +1,24 @@
+  # CircleCi version
+  version: 2.1
+
+  orbs:
+    python: circleci/python@2.1.1
+
+  jobs:
+    build-and-test:
+      executor: python/default
+      steps:
+        - checkout
+        - python/install-packages:
+            pip-dependency-file: requirements.txt
+            pkg-manager: pip
+        - run:
+            command: pytest
+            name: run pytest
+        - run:
+            command: flake8
+            name: run linting
+  workflows:
+    master:
+      jobs:
+        - build-and-test

.dockerignore

@@ -0,0 +1,7 @@
+env
+.pytest_cache
+__pycache__
+Dockerfile
+.git
+venv
+.idea

.gitignore

@@ -1,3 +1,5 @@
 **/__pycache__
 *.pyc
 venv
+.idea/
+

Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.10.5-alpine
+
+WORKDIR /code
+
+# Add project files to the code/ folder
+ADD ./ .
+
+# Install dependencies
+RUN pip install -r requirements.txt
+
+# Define the default port
+EXPOSE 8000
+
+# Setup executable command in the container
+CMD python manage.py runserver 0.0.0.0:8000

oc_lettings_site/home_site/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class WebSiteConfig(AppConfig):
+    name = 'oc_lettings_site.home_site'

oc_lettings_site/home_site/migrations/0002_auto_20230227_1830.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0 on 2023-02-27 17:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oc_lettings_site', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='address',
+            options={'verbose_name_plural': 'Addresses'},
+        ),
+    ]

oc_lettings_site/home_site/migrations/0003_remove_old_tables.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0 on 2023-03-04 09:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ('oc_lettings_site', '0002_auto_20230227_1830'),
+    ]
+
+    operations = [
+        migrations.RunSQL("""
+                DROP TABLE main.oc_lettings_site_address;
+                DROP TABLE main.oc_lettings_site_letting;
+                DROP TABLE main.oc_lettings_site_profile;
+            """)
+    ]

oc_lettings_site/home_site/templates/home_site/index.html

@@ -0,0 +1,4 @@
+<title>Holiday Homes</title>
+<h1>Welcome to Holiday Homes</h1>
+<div><a href="{% url 'profiles:index' %}">Profiles</a></div>
+<div><a href="{% url 'lettings:index' %}">Lettings</a></div>

oc_lettings_site/home_site/tests.py

@@ -0,0 +1,14 @@
+import pytest
+from django.test import Client
+from django.urls import reverse
+
+
+@pytest.fixture
+def client(db) -> Client:
+    return Client()
+
+
+def test_home_index(client: Client):
+    response = client.get(reverse("home:index"), data={})
+    assert response.status_code == 200
+    assert "<title>Holiday Homes</title>" in str(response.content)

oc_lettings_site/home_site/urls.py

@@ -0,0 +1,8 @@
+from django.urls import path
+
+from oc_lettings_site.home_site import views
+
+app_name = 'home'
+urlpatterns = [
+    path('', views.index, name='index'),
+]

oc_lettings_site/home_site/views.py

@@ -0,0 +1,11 @@
+from django.shortcuts import render
+
+
+# Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque molestie quam lobortis leo
+# consectetur ullamcorper non id est. Praesent dictum, nulla eget feugiat sagittis, sem mi
+# convallis eros, vitae dapibus nisi lorem dapibus sem. Maecenas pharetra purus ipsum, eget
+# consequat ipsum lobortis quis. Phasellus eleifend ex auctor venenatis tempus.Aliquam vitae erat
+# ac orci placerat luctus. Nullam elementum urna nisi, pellentesque iaculis enim cursus in.
+# Praesent volutpat porttitor magna, non finibus neque cursus id.
+def index(request):
+    return render(request, 'home_site/index.html')

oc_lettings_site/admin.py → oc_lettings_site/lettings/admin.py

@@ -1,10 +1,6 @@
 from django.contrib import admin
-
 from .models import Letting
 from .models import Address
-from .models import Profile
-
 
 admin.site.register(Letting)
 admin.site.register(Address)
-admin.site.register(Profile)

oc_lettings_site/lettings/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class LettingsConfig(AppConfig):
+    name = 'oc_lettings_site.lettings'

oc_lettings_site/lettings/migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# Generated by Django 3.0 on 2023-02-28 16:43
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Address',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('number', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(9999)])),
+                ('street', models.CharField(max_length=64)),
+                ('city', models.CharField(max_length=64)),
+                ('state', models.CharField(max_length=2, validators=[django.core.validators.MinLengthValidator(2)])),
+                ('zip_code', models.PositiveIntegerField(validators=[django.core.validators.MaxValueValidator(99999)])),
+                ('country_iso_code', models.CharField(max_length=3, validators=[django.core.validators.MinLengthValidator(3)])),
+            ],
+            options={
+                'verbose_name_plural': 'Addresses',
+            },
+        ),
+        migrations.CreateModel(
+            name='Letting',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=256)),
+                ('address', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='lettings.Address')),
+            ],
+        ),
+    ]

oc_lettings_site/lettings/migrations/0002_insert_lettings_data.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0 on 2023-03-01 08:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lettings', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RunSQL("""
+                INSERT INTO main.lettings_address
+                SELECT * FROM main.oc_lettings_site_address;
+                INSERT INTO main.lettings_letting
+                SELECT * FROM main.oc_lettings_site_letting;
+            """)
+    ]

oc_lettings_site/models.py → oc_lettings_site/lettings/models.py

@@ -1,6 +1,5 @@
 from django.db import models
 from django.core.validators import MaxValueValidator, MinLengthValidator
-from django.contrib.auth.models import User
 
 
 class Address(models.Model):
@@ -14,18 +13,13 @@ class Address(models.Model):
     def __str__(self):
         return f'{self.number} {self.street}'
 
+    class Meta:
+        verbose_name_plural = 'Addresses'
+
 
 class Letting(models.Model):
     title = models.CharField(max_length=256)
     address = models.OneToOneField(Address, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.title
-
-
-class Profile(models.Model):
-    user = models.OneToOneField(User, on_delete=models.CASCADE)
-    favorite_city = models.CharField(max_length=64, blank=True)
-
-    def __str__(self):
-        return self.user.username

templates/lettings_index.html → oc_lettings_site/lettings/templates/lettings/index.html

@@ -4,7 +4,7 @@ <h1>Lettings</h1>
     <ul>
     {% for letting in lettings_list %}
         <li>
-            <a href="{% url 'letting' letting_id=letting.id %}">
+            <a href="{% url 'lettings:letting' letting_id=letting.id %}">
                 {{ letting.title }}
             </a>
         </li>
@@ -13,5 +13,5 @@ <h1>Lettings</h1>
 {% else %}
     <p>No lettings are available.</p>
 {% endif %}
-<div><a href="{% url 'index' %}">Home</a></div>
-<div><a href="{% url 'profiles_index' %}">Profiles</a></div>
+<div><a href="{% url 'home:index' %}">Home</a></div>
+<div><a href="{% url 'profiles:index' %}">Profiles</a></div>

templates/letting.html → oc_lettings_site/lettings/templates/lettings/letting.html

@@ -3,6 +3,6 @@ <h1>{{ title }}</h1>
 <p>{{ address.number }} {{ address.street }}</p>
 <p>{{ address.city }}, {{ address.state }} {{ address.zip_code }}</p>
 <p>{{ address.country_iso_code }}</p>
-<div><a href="{% url 'lettings_index' %}">Back</a></div>
-<div><a href="{% url 'index' %}">Home</a></div>
-<div><a href="{% url 'profiles_index' %}">Profiles</a></div>
+<div><a href="{% url 'lettings:index' %}">Back</a></div>
+<div><a href="{% url 'home:index' %}">Home</a></div>
+<div><a href="{% url 'profiles:index' %}">Profiles</a></div>

oc_lettings_site/lettings/tests.py

@@ -0,0 +1,47 @@
+import pytest
+from django.test import Client
+from django.urls import reverse
+
+from .models import Address, Letting
+
+
+@pytest.fixture
+def client(db) -> Client:
+    return Client()
+
+
+@pytest.fixture
+def test_address(db):
+    return Address.objects.create(
+        number=1,
+        street="my street",
+        city="my city",
+        state="France",
+        zip_code="75001",
+        country_iso_code="FRA",
+    )
+
+
+@pytest.fixture
+def test_letting(db, test_address):
+    return Letting.objects.create(title="My vacation home", address=test_address)
+
+
+def test_index_lettings(client: Client):
+    response = client.get(reverse("lettings:index"), data={})
+    assert response.status_code == 200
+    assert "<title>Lettings</title>" in str(response.content)
+
+
+def test_detail_letting(client: Client, test_letting: Letting):
+    response = client.get(reverse("lettings:letting", args=[1]), data={})
+    assert response.status_code == 200
+    assert "My vacation home" in str(response.content)
+
+
+def test_str_letting(test_letting: Letting):
+    assert str(test_letting) == "My vacation home"
+
+
+def test_str_address(test_address: Address):
+    assert str(test_address) == "1 my street"

oc_lettings_site/lettings/urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+
+from oc_lettings_site.lettings import views
+
+
+app_name = 'lettings'
+urlpatterns = [
+    path('lettings/', views.index, name='index'),
+    path('lettings/<int:letting_id>/', views.letting, name='letting'),
+]

oc_lettings_site/lettings/views.py

@@ -0,0 +1,35 @@
+from django.shortcuts import render
+from .models import Letting
+
+
+# Aenean leo magna, vestibulum et tincidunt fermentum, consectetur quis velit. Sed non placerat
+# massa. Integer est nunc, pulvinar a tempor et, bibendum id arcu. Vestibulum ante ipsum primis in
+# faucibus orci luctus et ultrices posuere cubilia curae; Cras eget scelerisque.
+
+
+def index(request):
+    lettings_list = Letting.objects.all()
+    context = {'lettings_list': lettings_list}
+    return render(request, 'lettings/index.html', context)
+
+
+# Cras ultricies dignissim purus, vitae hendrerit ex varius non. In accumsan porta nisl id
+# eleifend. Praesent dignissim, odio eu consequat pretium, purus urna vulputate arcu, vitae
+# efficitur lacus justo nec purus. Aenean finibus faucibus lectus at porta. Maecenas auctor, est ut
+# luctus congue, dui enim mattis enim, ac condimentum velit libero in magna. Suspendisse potenti.
+# In tempus a nisi sed laoreet. Suspendisse porta dui eget sem accumsan interdum. Ut quis urna
+# pellentesque justo mattis ullamcorper ac non tellus. In tristique mauris eu velit fermentum,
+# tempus pharetra est luctus. Vivamus consequat aliquam libero, eget bibendum lorem. Sed non dolor
+# risus. Mauris condimentum auctor elementum. Donec quis nisi ligula. Integer vehicula tincidunt
+# enim, ac lacinia augue pulvinar sit amet.
+def letting(request, letting_id):
+    letting = Letting.objects.get(id=letting_id)
+    context = {
+        'title': letting.title,
+        'address': letting.address,
+    }
+    return render(request, 'lettings/letting.html', context)
+
+# Sed placerat quam in pulvinar commodo. Nullam laoreet consectetur ex, sed consequat libero
+# pulvinar eget. Fusc faucibus, urna quis auctor pharetra, massa dolor cursus neque, quis dictum
+# lacus d

oc_lettings_site/profiles/admin.py

@@ -0,0 +1,4 @@
+from django.contrib import admin
+from .models import Profile
+
+admin.site.register(Profile)

oc_lettings_site/profiles/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ProfilesConfig(AppConfig):
+    name = 'oc_lettings_site.profiles'