Skip to content

Commit f4c8ade

Browse files
committed
configure
1 parent 16ae46b commit f4c8ade

File tree

6 files changed

+39
-46
lines changed

6 files changed

+39
-46
lines changed

apps/blog/tests.py

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,69 @@
1+
from datetime import datetime
2+
13
from django.test import TestCase
2-
from .models import User, Post
4+
from apps.users.models import User
5+
from apps.blog.models import Post
36
from django.urls import reverse
4-
from .forms import PostCreateForm, RegisterForm
7+
from apps.users.forms import RegisterForm
8+
from .forms import PostCreateUpdateForm
9+
from .choices import StatusChoice
510

611

712
class TestBlog(TestCase):
813
def setUp(self):
914
user = User.objects.create(
10-
first_name="Saydula",
11-
last_name="Polatov",
12-
username="Polat",
15+
first_name="Admin",
16+
last_name="Adminovich",
17+
username="Admin",
1318
email="saydulapolatov456@gmail.com",
14-
avatar="avatars/fitnes.png",
1519
)
1620

1721
user.set_password("2007")
1822
user.save()
1923
self.user = user
2024

2125
post = Post.objects.create(
22-
title="Olamnig uygonishi",
23-
content="content1",
24-
publisher_at="2024-02-06",
25-
author=user,
26+
title="PostTitle1d",
27+
description="PostDescription1",
28+
content="PostContent1",
29+
publisher_at=datetime.now().strftime("%Y-%m-%d"),
30+
author=self.user,
2631
is_active=True,
2732
)
2833
self.post = post
2934

30-
def test_home(self):
31-
response = self.client.get(reverse("home"))
35+
def test_home_page(self):
36+
response = self.client.get(reverse("blog:home"))
3237
self.assertEqual(response.status_code, 200)
3338

34-
def test_About_page(self):
35-
response = self.client.get(reverse("about"))
39+
def test_about_page(self):
40+
response = self.client.get(reverse("blog:about"))
3641
self.assertEqual(response.status_code, 200)
3742

38-
def test_Login_page(self):
39-
response = self.client.get(reverse("login"))
40-
print(response.headers)
43+
def test_contacts_page(self):
44+
response = self.client.get(reverse("blog:contacts"))
45+
self.assertEqual(response.status_code, 200)
4146

4247
def test_post_detil(self):
43-
response = self.client.get(reverse("post_detail", kwargs={"id": self.post.id}))
48+
response = self.client.get(reverse("blog:post_detail", kwargs={"slug": self.post.slug}))
4449
self.assertContains(response, self.post.title)
4550
self.assertContains(response, self.post.content)
46-
self.assertContains(response, self.post.author.first_name)
47-
self.assertContains(response, self.post.author.last_name)
51+
self.assertContains(response, self.post.author.username)
4852
self.assertTrue(self.post.is_active, "True")
4953

50-
def test_forms(self):
54+
def test_PostCreateUpdateForm_forms(self):
5155
form_data = {
52-
"title": "postTietle1",
53-
"content": "postContent1",
54-
"publisher_at": "2024-02-05",
56+
"title": "PostTitle1",
57+
"description": "PostDescription1",
58+
"content": "PostContent1",
5559
"is_active": True,
5660
"author": self.user,
61+
"status": StatusChoice.PUBLISHED.value
5762
}
5863

59-
form = PostCreateForm(data=form_data)
64+
form = PostCreateUpdateForm(data=form_data)
6065
self.assertTrue(form.is_valid())
6166

62-
def test_objects_firstname_and_lastname(self):
63-
author = User.objects.get(id=1)
64-
post_count = author.is_active
65-
object_name = f"{author.first_name}, {author.last_name}|Is active: {post_count}"
66-
67-
print(object_name)
68-
6967
def test_register_form(self):
7068
user_create_form_data = {
7169
"username": "Saydula",
@@ -78,7 +76,3 @@ def test_register_form(self):
7876
}
7977
form = RegisterForm(data=user_create_form_data)
8078
self.assertTrue(form.is_valid())
81-
82-
def test_Users(self):
83-
users = User.objects.all()
84-
print(users)

apps/blog/views.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ def get_context_data(self, **kwargs):
9595
kwargs["form"] = PostCreateUpdateForm()
9696
kwargs["title"] = "Post Create"
9797
return super().get_context_data(**kwargs)
98-
# def get(self, request):
99-
# return render(request, self.template_name, {"form": PostCreateUpdateForm()})
10098

10199
def post(self, request):
102100
form = PostCreateUpdateForm(request.POST)

apps/users/models.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
from apps.shared.models import TimestempedAbstractModel
55
from .utils import processor_iamge
66

7-
from PIL import Image
8-
97

108
class User(TimestempedAbstractModel, AbstractUser):
119
email = models.EmailField(_("email address"), unique=True)

apps/users/services.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from django.http import HttpResponse, HttpRequest
2-
from rest_framework_simplejwt.tokens import RefreshToken
2+
from rest_framework_simplejwt.tokens import RefreshToken, AccessToken
33

44

5-
def generate_jwt_tokens(user):
5+
def generate_jwt_tokens(user) -> tuple[RefreshToken, AccessToken]:
66
refresh = RefreshToken.for_user(user)
77
access_token = refresh.access_token
88
access_token['user_id'] = user.id

apps/users/signals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
@receiver(post_save, sender=User)
77
def create_user_profile(sender, instance, created, **kwargs):
88
if created:
9-
print(f"Creating UserProfile to User({instance})")
9+
# print(f"Creating UserProfile to User({instance})")
1010

1111
UserProfile.objects.create(user=instance)

apps/users/views.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,14 @@ def post(self, request):
3131
if form.is_valid():
3232
form.save()
3333
messages.success(request, "User succesfully registered")
34-
return redirect(reverse_lazy("users:login"))
34+
response = redirect(reverse_lazy("users:login"))
35+
response.status_code = 302
36+
return response
3537

3638
messages.warning(request, "Invalid registration fields!")
37-
return redirect(reverse_lazy("auth:register"))
39+
response = redirect(reverse_lazy("users:register"))
40+
response.status_code = 400
41+
return response
3842

3943

4044
class LoginPageView(CustomHtmxMixin, View):
@@ -72,7 +76,6 @@ def post(self, request):
7276
return redirect(reverse_lazy("users:login"))
7377

7478

75-
7679
class LogoutPageView(CustomHtmxMixin, LoginRequiredMixin, View):
7780
template_name = "auth/logout.html"
7881

0 commit comments

Comments
 (0)