gcivil-nyu-org / INET-Wednesday-Spring2024-Team-2 / 155

Committed 13 Mar 2024 03:58AM UTC coverage: 70.4%. Remained the same

Build # 155

Build Type

cron

travis-pro

Committed by

web-flow

Commit Message

Merge pull request #49 from gcivil-nyu-org/develop

first pull from develop into master

Run Details

174 of 246 new or added lines in 12 files covered. (70.73%)

2 existing lines in 2 files now uncovered.

176 of 250 relevant lines covered (70.4%)

0.7 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

70.45

/users/forms.py

from django import forms
from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth import get_user_model
from .models import CustomUser
from django.contrib.auth.forms import AuthenticationForm
from django.core.exceptions import ValidationError

User = get_user_model()


class UserSignUpForm(UserCreationForm):
    full_name = forms.CharField(max_length=255, required=True)
    phone_number = forms.CharField(max_length=15, required=True)
    city = forms.CharField(max_length=100, required=True)
    email = forms.EmailField(required=True)

    class Meta:
        model = User
        fields = (
            "email",
            "full_name",
            "phone_number",
            "city",
            "password1",
            "password2",
        )
    def clean_email(self):
        email = self.cleaned_data['email']
        if not email.endswith('@nyu.edu'):
            raise ValidationError("Oops!! Only NYU email addresses are supported.")
        return email


class LandlordSignupForm(UserCreationForm):
    pdf_file = forms.FileField(required=False)

    class Meta:
        model = CustomUser
        fields = (
            "username",
            "email",
            "full_name",
            "phone_number",
            "city",
            "password1",
            "password2",
            # "user_type",
            "pdf_file",
        )

    # def _init_(self, *args, **kwargs):
    #     super(LandlordSignupForm, self)._init_(*args, **kwargs)
    #     self.fields["user_type"].initial = CustomUser.LANDLORD
    #     self.fields[
    #         "user_type"
    #     ].widget = forms.HiddenInput()  # Hide the user_type field

    def _init_(self, *args, **kwargs):
        super(LandlordSignupForm, self)._init_(*args, **kwargs)
        # No need to set user_type initial value here, as it will be set in save.

    def save(self, commit=True):
        user = super(LandlordSignupForm, self).save(commit=False)
        user.user_type = CustomUser.LANDLORD  # Set user_type to LANDLORD

        if commit:
            user.save()
            self.save_m2m()  # Call save_m2m if there are many-to-many fields that need to be saved.

        return user
class PasswordResetForm(forms.Form):
    email = forms.EmailField(label="Email", max_length=254)

    def clean_email(self):
        email = self.cleaned_data.get('email')
        if not User.objects.filter(email=email).exists():
            raise forms.ValidationError("""This email does not exist in our records.
                                        Please make sure you entered it correctly,
                                        or sign up for a new account
                                        if you haven't already.""")
        return email


class CustomLoginForm(AuthenticationForm):
    def __init__(self, *args, **kwargs):
        super().__init__(*args, **kwargs)

1	from django import forms	1✔
2	from django.contrib.auth.forms import UserCreationForm	1✔
3	from django.contrib.auth import get_user_model	1✔
4	from .models import CustomUser	1✔
5	from django.contrib.auth.forms import AuthenticationForm	1✔
6	from django.core.exceptions import ValidationError	1✔
7
8	User = get_user_model()	1✔
9
10
11	class UserSignUpForm(UserCreationForm):	1✔
12	full_name = forms.CharField(max_length=255, required=True)	1✔
13	phone_number = forms.CharField(max_length=15, required=True)	1✔
14	city = forms.CharField(max_length=100, required=True)	1✔
15	email = forms.EmailField(required=True)	1✔
16
17	class Meta:	1✔
18	model = User	1✔
19	fields = (	1✔
20	"email",
21	"full_name",
22	"phone_number",
23	"city",
24	"password1",
25	"password2",
26	)
27	def clean_email(self):
28	email = self.cleaned_data['email']	1✔
29	if not email.endswith('@nyu.edu'):	1✔
30	raise ValidationError("Oops!! Only NYU email addresses are supported.")	1✔
NEW 31	return email	×
32		1✔
33
34	class LandlordSignupForm(UserCreationForm):
35	pdf_file = forms.FileField(required=False)	1✔
36		1✔
37	class Meta:
38	model = CustomUser	1✔
39	fields = (	1✔
40	"username",	1✔
41	"email",
42	"full_name",
43	"phone_number",
44	"city",
45	"password1",
46	"password2",
47	# "user_type",
48	"pdf_file",
49	)
50
51	# def _init_(self, args, *kwargs):
52	# super(LandlordSignupForm, self)._init_(args, *kwargs)
53	# self.fields["user_type"].initial = CustomUser.LANDLORD
54	# self.fields[
55	# "user_type"
56	# ].widget = forms.HiddenInput() # Hide the user_type field
57
58	def _init_(self, args, *kwargs):
59	super(LandlordSignupForm, self)._init_(args, *kwargs)	1✔
NEW 60	# No need to set user_type initial value here, as it will be set in save.	×
61
62	def save(self, commit=True):
63	user = super(LandlordSignupForm, self).save(commit=False)	1✔
NEW 64	user.user_type = CustomUser.LANDLORD # Set user_type to LANDLORD	×
NEW 65		×
66	if commit:
NEW 67	user.save()	×
NEW 68	self.save_m2m() # Call save_m2m if there are many-to-many fields that need to be saved.	×
NEW 69		×
70	return user
NEW 71	class PasswordResetForm(forms.Form):	×
72	email = forms.EmailField(label="Email", max_length=254)
73
74	def clean_email(self):	1✔
75	email = self.cleaned_data.get('email')	1✔
76	if not User.objects.filter(email=email).exists():
77	raise forms.ValidationError("""This email does not exist in our records.	1✔
NEW 78	Please make sure you entered it correctly,	×
NEW 79	or sign up for a new account	×
NEW 80	if you haven't already.""")	×
81	return email
82
83
84	class CustomLoginForm(AuthenticationForm):
85	def __init__(self, args, *kwargs):
NEW 86	super().__init__(args, *kwargs)	×

gcivil-nyu-org / INET-Wednesday-Spring2024-Team-2 / 155

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous