From b8beeff2f1a9247b73db8587d8b57bb1fa4b930b Mon Sep 17 00:00:00 2001 From: LisaIncardona Date: Fri, 30 Sep 2022 16:51:51 +0200 Subject: [PATCH 1/4] add lettings and profile app and migrate data --- lettings/__init__.py | 0 lettings/admin.py | 5 + lettings/apps.py | 5 + lettings/migrations/0001_initial.py | 87 ++++++++++++++++++ lettings/migrations/__init__.py | 0 {oc_lettings_site => lettings}/models.py | 15 +-- .../templates/lettings/index.html | 0 .../templates/lettings}/letting.html | 0 lettings/views.py | 29 ++++++ oc-lettings-site.sqlite3 | Bin 151552 -> 159744 bytes oc_lettings_site/admin.py | 10 -- .../migrations/0002_auto_20220916_1449.py | 17 ++++ .../migrations/0003_auto_20220916_1454.py | 35 +++++++ oc_lettings_site/settings.py | 77 ++++++++-------- oc_lettings_site/tests.py | 2 - oc_lettings_site/urls.py | 16 ++-- oc_lettings_site/views.py | 48 ++-------- profiles/__init__.py | 0 profiles/admin.py | 4 + profiles/apps.py | 5 + profiles/migrations/0001_initial.py | 44 +++++++++ profiles/migrations/__init__.py | 0 profiles/models.py | 10 ++ .../templates/profiles/index.html | 0 .../templates/profiles}/profile.html | 0 profiles/views.py | 21 +++++ pytest.ini | 2 + 27 files changed, 326 insertions(+), 106 deletions(-) create mode 100644 lettings/__init__.py create mode 100644 lettings/admin.py create mode 100644 lettings/apps.py create mode 100644 lettings/migrations/0001_initial.py create mode 100644 lettings/migrations/__init__.py rename {oc_lettings_site => lettings}/models.py (71%) rename templates/lettings_index.html => lettings/templates/lettings/index.html (100%) rename {templates => lettings/templates/lettings}/letting.html (100%) create mode 100644 lettings/views.py delete mode 100644 oc_lettings_site/admin.py create mode 100644 oc_lettings_site/migrations/0002_auto_20220916_1449.py create mode 100644 oc_lettings_site/migrations/0003_auto_20220916_1454.py delete mode 100644 oc_lettings_site/tests.py create mode 100644 profiles/__init__.py create mode 100644 profiles/admin.py create mode 100644 profiles/apps.py create mode 100644 profiles/migrations/0001_initial.py create mode 100644 profiles/migrations/__init__.py create mode 100644 profiles/models.py rename templates/profiles_index.html => profiles/templates/profiles/index.html (100%) rename {templates => profiles/templates/profiles}/profile.html (100%) create mode 100644 profiles/views.py create mode 100644 pytest.ini diff --git a/lettings/__init__.py b/lettings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lettings/admin.py b/lettings/admin.py new file mode 100644 index 0000000000..6f89536422 --- /dev/null +++ b/lettings/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from .models import Letting, Address + +admin.site.register(Letting) +admin.site.register(Address) diff --git a/lettings/apps.py b/lettings/apps.py new file mode 100644 index 0000000000..b6abff1791 --- /dev/null +++ b/lettings/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class LettingsConfig(AppConfig): + name = 'lettings' diff --git a/lettings/migrations/0001_initial.py b/lettings/migrations/0001_initial.py new file mode 100644 index 0000000000..f77c1ae82b --- /dev/null +++ b/lettings/migrations/0001_initial.py @@ -0,0 +1,87 @@ +# Generated by Django 3.0 on 2022-09-16 14:54 + +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [] + + operations = [ + migrations.SeparateDatabaseAndState( + state_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": "address", + "verbose_name_plural": "adresses", + }, + ), + 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" + ), + ), + ], + ), + ], + database_operations=[], + ) + ] diff --git a/lettings/migrations/__init__.py b/lettings/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/oc_lettings_site/models.py b/lettings/models.py similarity index 71% rename from oc_lettings_site/models.py rename to lettings/models.py index ed255e8c11..f4d6a8ae27 100644 --- a/oc_lettings_site/models.py +++ b/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): @@ -11,8 +10,12 @@ class Address(models.Model): zip_code = models.PositiveIntegerField(validators=[MaxValueValidator(99999)]) country_iso_code = models.CharField(max_length=3, validators=[MinLengthValidator(3)]) + class Meta: + verbose_name = "address" + verbose_name_plural = "adresses" + def __str__(self): - return f'{self.number} {self.street}' + return f"{self.number} {self.street}" class Letting(models.Model): @@ -21,11 +24,3 @@ class Letting(models.Model): 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 diff --git a/templates/lettings_index.html b/lettings/templates/lettings/index.html similarity index 100% rename from templates/lettings_index.html rename to lettings/templates/lettings/index.html diff --git a/templates/letting.html b/lettings/templates/lettings/letting.html similarity index 100% rename from templates/letting.html rename to lettings/templates/lettings/letting.html diff --git a/lettings/views.py b/lettings/views.py new file mode 100644 index 0000000000..1a0037f0be --- /dev/null +++ b/lettings/views.py @@ -0,0 +1,29 @@ +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) diff --git a/oc-lettings-site.sqlite3 b/oc-lettings-site.sqlite3 index 3d885414f9f3ed046704e8b09bdcd5c791c82d42..ab85f1871681435d7eb0ac50fdf5666094bae83b 100644 GIT binary patch delta 2588 zcmai$U2Gdw7RTp$W^B)RGB;T}IB7P-NjGuQWSsf3<8f7tH%ih*VX4@zSRufg*yF^- zAI0OOr2-{Ry9kMwrh_`ws!gjEs|udh>y@%dP^w)Ccr3fE#7Ai(3P|ieAS5U+yTJHn zCZyr(VUF+l-+O-N+^-ogU!;~ds8d~SGZ==2t;c6QF6;Tt>WD)DGC57M26 zr?sE!1vUJ%o2p{iBV3%X@;`HEgmm(-$`E~>}U z1+6q!ofmmg#gHH+L?I!?B7!7H(U^1(iFNmV<&4FzR`aDfJ+0@fniVajt)j~5W-PA=v9usZ|Q)8B-Klj5i+Z`ZKZX zIz~Yrz)#^HVFkVppNEgaNyx*$!0Ywe|5yTE!y>DxfD&lMIp8c)+HMd5XsJ&5&SJO& z>^9ZNkM;t_cz$$Xunq44%{@aqMf%j+>0BeRZj3+nn%D>}Z@|@4VG>yT zPdD0@KZC0W$v<6b{p%H?73bNH4bRmB9WV@gVHa$N5K<6l|IdEKe$M`v{kUFxhTTu% z05CkVqsT^(<(k$vg6uG|dypM!T6z%KFtP*4_BXg&*OmqECCu;gWAJzEKU(gz3^TZo zqo4KqJvZH1@^P}82;l$5cey@rO?uyT`CXKYT1|Bk-b>)sdhPFkv7+}i4>g7fN%K?& z@E~ly{{%42;Ud^)Rtn%1cQWA){+2U^BIua5ms)q$JT2^0`c~YEC&+Q&M6#;R7McfR z^9^J-9N)Z91i@Cvb9iR!6o{I52|V~+m%Sh6H`5^OPR6&2$vY?BIZ$a~rxIGh$2N;m zP%%6EclzG(hbB^oCPIf&zn+;0^*P<<{bg`va^+|YvHs9|_r&b_wx(kHp1WC2_xh3w zWZ;&f?%-4}T2%9B1_aH#iwn1F2Mfy(cxz7{q=>gB~Mya-5N?VNqvuzsq%{v)z z*__cp$h?*X$IQQFL0~YB@s!V-mMOuP0(VBbGD7SiAcq7wA&w;kKBC0pQBhvm z>q3xRrj*Mn{8Pt{^3mLJE%StYToOvk;$pe<vNsP)90q}8MR=%buQdCtrqiIt%ukg z(HWdFE}ri+g6EUuR7IUH8tLlhVW5&LQ Fehcv3+oaJ@Vu{(7)vilmv6zHuXWGn?CTk`I zQI>WZ*OwJBWbuLzOA$nNpPJ1>))&Qn&=--o?1QVVcB3HfgNXR5I5yK=so4bwhPn5A z=N`^C-}&z5KC`*aygSqzMF@>5@8NT@`gA}WMV{fEI=>CHwI^NETSn`$ucwh7`cTt< z8!^z2;1_rwO7JP{z$Hk*6!h2Szu1?CEp!YQm$P}HTowzfQdSbnLiT*AxFY5S%`kLB z)m+^$+XbzOlP=8EE=`V&n`j5-*2}r8Vi`?Y2yPawmDJw#j?YJmLt z3YFB(b8DhNl4 zS6`THq?K~*3^l8nFXjrwlcmN7&J_8QxVkR9E|1b`O&h1w>?5NYDn-Y6j$Fu4F~ezY zJ+J%(xhh{Ei&=`Zd)?kCw=d}QPDg{jXlTka9S-@z!RD~!?&tTQv(;d^U(Vx-pP!0NJ>|)!fWzMlxQ^|ay=ew%>!Nx*F zXJ3wCBo=t#HR;v-Kk_T06%Y2=hfPM-_b|j+fhoN`7Q+{PWo{`i{3nm&`H~<>YTWx^ z=u|*IdnOT2C7h}FbEgu{<44aoudU!9Cbk^DY&HIjtcNb>e98B#I7ImZq;Cm(pX{kj z`1N*&1Ha`u=;i(}-d`9=?>x2YqW{v1Ar1LUrVE96TNJDV5J;WxAzrSKnB`8V?X z5+-DD8GlUnmT)YyH8y=fvy$yjQ#Hxa_79EbdNfP2$m6#yM-P)Y=DJf+Zv(ZP$OFYx!0>1;hqno_Byot`6>tR`8+f1gex%vPUV6lMh3H#Y znc)|W%`4yHm4ptnHxYZYF5h4cThCza3vX)UWPgToHt%_;L9D~Di(t3WyLk)9?hG}q f1lkDNO5huK;&D38_`UuE>-Z!8vQ8uziG=?KmYb~p diff --git a/oc_lettings_site/admin.py b/oc_lettings_site/admin.py deleted file mode 100644 index 63328c6dd3..0000000000 --- a/oc_lettings_site/admin.py +++ /dev/null @@ -1,10 +0,0 @@ -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) diff --git a/oc_lettings_site/migrations/0002_auto_20220916_1449.py b/oc_lettings_site/migrations/0002_auto_20220916_1449.py new file mode 100644 index 0000000000..6d07f40e5a --- /dev/null +++ b/oc_lettings_site/migrations/0002_auto_20220916_1449.py @@ -0,0 +1,17 @@ +# Generated by Django 3.0 on 2022-09-16 14:49 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('oc_lettings_site', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='address', + options={'verbose_name': 'address', 'verbose_name_plural': 'adresses'}, + ), + ] diff --git a/oc_lettings_site/migrations/0003_auto_20220916_1454.py b/oc_lettings_site/migrations/0003_auto_20220916_1454.py new file mode 100644 index 0000000000..2a39e8b612 --- /dev/null +++ b/oc_lettings_site/migrations/0003_auto_20220916_1454.py @@ -0,0 +1,35 @@ +# Generated by Django 3.0 on 2022-09-16 14:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("oc_lettings_site", "0002_auto_20220916_1449"), + ] + + operations = [ + migrations.SeparateDatabaseAndState( + state_operations=[ + migrations.RemoveField( + model_name="letting", + name="address", + ), + migrations.RemoveField( + model_name="profile", + name="user", + ), + migrations.DeleteModel( + name="Address", + ), + migrations.DeleteModel( + name="Letting", + ), + migrations.DeleteModel( + name="Profile", + ), + ], + database_operations=[], + ) + ] diff --git a/oc_lettings_site/settings.py b/oc_lettings_site/settings.py index ffce49d343..66f37920aa 100644 --- a/oc_lettings_site/settings.py +++ b/oc_lettings_site/settings.py @@ -8,7 +8,7 @@ # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'fp$9^593hsriajg$_%=5trot9g!1qa@ew(o-1#@=&4%=hp46(s' +SECRET_KEY = "fp$9^593hsriajg$_%=5trot9g!1qa@ew(o-1#@=&4%=hp46(s" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -19,53 +19,58 @@ # Application definition INSTALLED_APPS = [ - 'oc_lettings_site.apps.OCLettingsSiteConfig', - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', + "oc_lettings_site.apps.OCLettingsSiteConfig", + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + "lettings", + "profiles", ] MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', + "django.middleware.security.SecurityMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.middleware.common.CommonMiddleware", + "django.middleware.csrf.CsrfViewMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", ] -ROOT_URLCONF = 'oc_lettings_site.urls' +ROOT_URLCONF = "oc_lettings_site.urls" TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'templates')], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', + "BACKEND": "django.template.backends.django.DjangoTemplates", + "DIRS": [os.path.join(BASE_DIR, "templates")], + "APP_DIRS": True, + "OPTIONS": { + "context_processors": [ + "django.template.context_processors.debug", + "django.template.context_processors.request", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", ], }, }, ] -WSGI_APPLICATION = 'oc_lettings_site.wsgi.application' +WSGI_APPLICATION = "oc_lettings_site.wsgi.application" # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'oc-lettings-site.sqlite3'), + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": os.path.join(BASE_DIR, "oc-lettings-site.sqlite3"), + "TEST": { + "test_NAME": "test_db", + }, } } @@ -75,16 +80,16 @@ AUTH_PASSWORD_VALIDATORS = [ { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator", }, { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator", }, ] @@ -92,9 +97,9 @@ # Internationalization # https://docs.djangoproject.com/en/3.0/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = "en-us" -TIME_ZONE = 'UTC' +TIME_ZONE = "UTC" USE_I18N = True @@ -106,4 +111,4 @@ # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.0/howto/static-files/ -STATIC_URL = '/static/' +STATIC_URL = "/static/" diff --git a/oc_lettings_site/tests.py b/oc_lettings_site/tests.py deleted file mode 100644 index 3fd62bb718..0000000000 --- a/oc_lettings_site/tests.py +++ /dev/null @@ -1,2 +0,0 @@ -def test_dummy(): - assert 1 diff --git a/oc_lettings_site/urls.py b/oc_lettings_site/urls.py index f0ff5897ab..50bca014c2 100644 --- a/oc_lettings_site/urls.py +++ b/oc_lettings_site/urls.py @@ -1,13 +1,15 @@ from django.contrib import admin from django.urls import path -from . import views +from .views import index +from lettings.views import index as lettings_index, letting +from profiles.views import index as profiles_index, profile urlpatterns = [ - path('', views.index, name='index'), - path('lettings/', views.lettings_index, name='lettings_index'), - path('lettings//', views.letting, name='letting'), - path('profiles/', views.profiles_index, name='profiles_index'), - path('profiles//', views.profile, name='profile'), - path('admin/', admin.site.urls), + path("", index, name="index"), + path("lettings/", lettings_index, name="lettings_index"), + path("lettings//", letting, name="letting"), + path("profiles/", profiles_index, name="profiles_index"), + path("profiles//", profile, name="profile"), + path("admin/", admin.site.urls), ] diff --git a/oc_lettings_site/views.py b/oc_lettings_site/views.py index a72db27074..30c2e4671a 100644 --- a/oc_lettings_site/views.py +++ b/oc_lettings_site/views.py @@ -1,45 +1,11 @@ from django.shortcuts import render -from .models import Letting, Profile - - -# 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. +# 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, 'index.html') - -# 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 lettings_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, '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 -def profiles_index(request): - profiles_list = Profile.objects.all() - context = {'profiles_list': profiles_list} - return render(request, 'profiles_index.html', context) - -# Aliquam sed metus eget nisi tincidunt ornare accumsan eget lac -# laoreet neque quis, pellentesque dui. Nullam facilisis pharetra vulputate. Sed tincidunt, dolor id facilisis fringilla, eros leo tristique lacus, -# it. Nam aliquam dignissim congue. Pellentesque habitant morbi tristique senectus et netus et males -def profile(request, username): - profile = Profile.objects.get(user__username=username) - context = {'profile': profile} - return render(request, 'profile.html', context) + return render(request, "index.html") diff --git a/profiles/__init__.py b/profiles/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/profiles/admin.py b/profiles/admin.py new file mode 100644 index 0000000000..d914f1fcc4 --- /dev/null +++ b/profiles/admin.py @@ -0,0 +1,4 @@ +from django.contrib import admin +from .models import Profile + +admin.site.register(Profile) diff --git a/profiles/apps.py b/profiles/apps.py new file mode 100644 index 0000000000..5501fdad35 --- /dev/null +++ b/profiles/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ProfilesConfig(AppConfig): + name = 'profiles' diff --git a/profiles/migrations/0001_initial.py b/profiles/migrations/0001_initial.py new file mode 100644 index 0000000000..c228c69dc0 --- /dev/null +++ b/profiles/migrations/0001_initial.py @@ -0,0 +1,44 @@ +# Generated by Django 3.0 on 2022-09-16 14:54 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.SeparateDatabaseAndState( + state_operations=[ + migrations.CreateModel( + name="Profile", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("favorite_city", models.CharField(blank=True, max_length=64)), + ( + "user", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + ], + database_operations=[], + ) + ] diff --git a/profiles/migrations/__init__.py b/profiles/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/profiles/models.py b/profiles/models.py new file mode 100644 index 0000000000..84c85c1001 --- /dev/null +++ b/profiles/models.py @@ -0,0 +1,10 @@ +from django.db import models +from django.contrib.auth.models import User + + +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 diff --git a/templates/profiles_index.html b/profiles/templates/profiles/index.html similarity index 100% rename from templates/profiles_index.html rename to profiles/templates/profiles/index.html diff --git a/templates/profile.html b/profiles/templates/profiles/profile.html similarity index 100% rename from templates/profile.html rename to profiles/templates/profiles/profile.html diff --git a/profiles/views.py b/profiles/views.py new file mode 100644 index 0000000000..de7f551533 --- /dev/null +++ b/profiles/views.py @@ -0,0 +1,21 @@ +from django.shortcuts import render +from .models import Profile + + +# 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 +def index(request): + profiles_list = Profile.objects.all() + context = {"profiles_list": profiles_list} + return render(request, "profiles/index.html", context) + + +# Aliquam sed metus eget nisi tincidunt ornare accumsan eget lac +# laoreet neque quis, pellentesque dui. Nullam facilisis pharetra vulputate. Sed tincidunt, dolor +# id facilisis fringilla, eros leo tristique lacus, it. Nam aliquam dignissim congue. Pellentesque +# habitant morbi tristique senectus et netus et males +def profile(request, username): + profile = Profile.objects.get(user__username=username) + context = {"profile": profile} + return render(request, "profiles/profile.html", context) diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000000..ff68e21cce --- /dev/null +++ b/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +DJANGO_SETTINGS_MODULE = oc_lettings_site.settings \ No newline at end of file From 14bb68dd53b151c699309cfaa0623125f9188586 Mon Sep 17 00:00:00 2001 From: LisaIncardona Date: Fri, 7 Oct 2022 10:50:10 +0200 Subject: [PATCH 2/4] Start test : no such table bug --- lettings/tests/unit_test/lettings_test.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 lettings/tests/unit_test/lettings_test.py diff --git a/lettings/tests/unit_test/lettings_test.py b/lettings/tests/unit_test/lettings_test.py new file mode 100644 index 0000000000..c4d6e76256 --- /dev/null +++ b/lettings/tests/unit_test/lettings_test.py @@ -0,0 +1,22 @@ +import sqlite3 +from django.test import TestCase +from lettings.models import Letting, Address +import pytest + + +@pytest.mark.django_db +class LettingTestCase(TestCase): + def setUp(self): + address = Address.objects.create( + number=1, + street="rue du test", + city="testville", + state="testland", + zip_code="01000", + country_iso_code="fr", + ) + Letting.objects.create(title="titre", address=address) + + def test_create_Letting(self): + letting = Letting.objects.get(id=1) + self.assertEqual(letting.title, "titre") From 811a25e84cd86b913f427e02e240fc30d331502f Mon Sep 17 00:00:00 2001 From: LisaIncardona Date: Fri, 7 Oct 2022 11:02:44 +0200 Subject: [PATCH 3/4] debug db test : create from models not migrations --- lettings/tests/unit_test/lettings_test.py | 1 - pytest.ini | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lettings/tests/unit_test/lettings_test.py b/lettings/tests/unit_test/lettings_test.py index c4d6e76256..520897ccea 100644 --- a/lettings/tests/unit_test/lettings_test.py +++ b/lettings/tests/unit_test/lettings_test.py @@ -1,4 +1,3 @@ -import sqlite3 from django.test import TestCase from lettings.models import Letting, Address import pytest diff --git a/pytest.ini b/pytest.ini index ff68e21cce..ca21e9bfd1 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,3 @@ [pytest] -DJANGO_SETTINGS_MODULE = oc_lettings_site.settings \ No newline at end of file +DJANGO_SETTINGS_MODULE = oc_lettings_site.settings +addopts = --nomigrations \ No newline at end of file From f8ed54ab99f611cdd417f027343a21ecab2d273f Mon Sep 17 00:00:00 2001 From: Lisa Incardona <62611442+LisaInc@users.noreply.github.com> Date: Fri, 7 Oct 2022 16:49:25 +0200 Subject: [PATCH 4/4] Add .circleci/config.yml --- .circleci/config.yml | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000000..1c5b43979e --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,47 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/2.0/configuration-reference +version: 2.1 + +# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects. +# See: https://circleci.com/docs/2.0/orb-intro/ +orbs: + # The python orb contains a set of prepackaged CircleCI configuration you can use repeatedly in your configuration files + # Orb commands and jobs help you with common scripting around a language/tool + # so you dont have to copy and paste it everywhere. + # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/python + python: circleci/python@1.5.0 + +# Define a job to be invoked later in a workflow. +# See: https://circleci.com/docs/2.0/configuration-reference/#jobs +jobs: + build-and-test: # This is the name of the job, feel free to change it to better match what you're trying to do! + # These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/ + # You can specify an image from Dockerhub or use one of the convenience images from CircleCI's Developer Hub + # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python + # The executor is the environment in which the steps below will be executed - below will use a python 3.10.2 container + # Change the version below to your required version of python + docker: + - image: cimg/python:3.10.2 + # Checkout the code as the first step. This is a dedicated CircleCI step. + # The python orb's install-packages step will install the dependencies from a Pipfile via Pipenv by default. + # Here we're making sure we use just use the system-wide pip. By default it uses the project root's requirements.txt. + # Then run your tests! + # CircleCI will report the results back to your VCS provider. + steps: + - checkout + - python/install-packages: + pkg-manager: pip + # app-dir: ~/project/package-directory/ # If you're requirements.txt isn't in the root directory. + # pip-dependency-file: test-requirements.txt # if you have a different name for your requirements file, maybe one that combines your runtime and test requirements. + - run: + name: Run tests + # This assumes pytest is installed via the install-package step above + command: pytest + +# Invoke jobs via workflows +# See: https://circleci.com/docs/2.0/configuration-reference/#workflows +workflows: + sample: # This is the name of the workflow, feel free to change it to better match your workflow. + # Inside the workflow, you define the jobs you want to run. + jobs: + - build-and-test