🔧 chore(apps): update app names and structures in various files

This commit is contained in:
sankalp committed 2025-06-15 22:45:09 +05:45
1 parent e7a78acfe4
commit b198b18538
27 files changed
+588 -45

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
"""
This file makes the apps directory a Python package.
"""
+158 -1
View File
@@ -1,3 +1,160 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
from django.utils.translation import gettext_lazy as _
from .models import User, UserProfile
# Register your models here.
class UserProfileInline(admin.StackedInline):
model = UserProfile
can_delete = False
verbose_name_plural = "Profile"
fk_name = "user"
fieldsets = (
(_("Personal Info"), {"fields": ("avatar", "bio", "location")}),
(_("Education"), {"fields": ("graduation_year", "degree", "major")}),
(
_("Professional Info"),
{
"fields": (
"current_company",
"current_position",
"linkedin_url",
"website_url",
)
},
),
(_("Preferences"), {"fields": ("privacy_level", "notification_preferences")}),
(
_("Mentorship"),
{"fields": ("is_mentor_available", "mentor_skills", "is_job_seeking")},
),
)
@admin.register(User)
class CustomUserAdmin(UserAdmin):
list_display = (
"email",
"phone",
"first_name",
"last_name",
"is_active",
"is_alumni",
"is_staff_member",
"is_admin",
"last_active",
)
list_filter = (
"is_active",
"is_alumni",
"is_staff_member",
"is_admin",
"created_at",
"updated_at",
)
search_fields = ("email", "phone", "first_name", "last_name")
ordering = ("-created_at",)
filter_horizontal = (
"groups",
"user_permissions",
)
fieldsets = (
(None, {"fields": ("email", "phone", "password")}),
(_("Personal Info"), {"fields": ("first_name", "last_name")}),
(
_("Status"),
{"fields": ("is_active", "is_alumni", "is_staff_member", "is_admin")},
),
(
_("Permissions"),
{
"fields": ("is_staff", "is_superuser", "groups", "user_permissions"),
},
),
(
_("Important Dates"),
{"fields": ("last_login", "created_at", "updated_at", "last_active")},
),
)
readonly_fields = ("created_at", "updated_at", "last_active")
add_fieldsets = (
(
None,
{
"classes": ("wide",),
"fields": (
"email",
"phone",
"password1",
"password2",
"first_name",
"last_name",
),
},
),
)
inlines = [UserProfileInline]
def get_inline_instances(self, request, obj=None):
if not obj:
return []
return super().get_inline_instances(request, obj)
@admin.register(UserProfile)
class UserProfileAdmin(admin.ModelAdmin):
list_display = (
"user",
"graduation_year",
"current_company",
"is_mentor_available",
"is_job_seeking",
"privacy_level",
)
list_filter = (
"graduation_year",
"is_mentor_available",
"is_job_seeking",
"privacy_level",
"created_at",
)
search_fields = (
"user__email",
"user__first_name",
"user__last_name",
"current_company",
"degree",
"major",
)
raw_id_fields = ("user",)
fieldsets = (
(_("User"), {"fields": ("user",)}),
(_("Personal Info"), {"fields": ("avatar", "bio", "location")}),
(_("Education"), {"fields": ("graduation_year", "degree", "major")}),
(
_("Professional Info"),
{
"fields": (
"current_company",
"current_position",
"linkedin_url",
"website_url",
)
},
),
(_("Preferences"), {"fields": ("privacy_level", "notification_preferences")}),
(
_("Mentorship"),
{"fields": ("is_mentor_available", "mentor_skills", "is_job_seeking")},
),
(_("Timestamps"), {"fields": ("created_at", "updated_at")}),
)
readonly_fields = ("created_at", "updated_at")
def get_queryset(self, request):
return super().get_queryset(request).select_related("user")
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class AccountsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'accounts'
name = 'apps.accounts'
+17
View File
@@ -0,0 +1,17 @@
from django.contrib.auth import get_user_model
from django.contrib.auth.backends import ModelBackend
from django.db.models import Q
UserModel = get_user_model()
class EmailOrPhoneBackend(ModelBackend):
def authenticate(self, request, username=None, password=None, **kwargs):
try:
user = UserModel.objects.get(Q(email=username) | Q(phone=username))
except UserModel.DoesNotExist:
return None
if user.check_password(password) and self.user_can_authenticate(user):
return user
return None
+100
View File
@@ -0,0 +1,100 @@
# Generated by Django 5.2.3 on 2025-06-15 16:51
import django.core.validators
import django.db.models.deletion
import django.utils.timezone
import uuid
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
('auth', '0012_alter_user_first_name_max_length'),
]
operations = [
migrations.CreateModel(
name='User',
fields=[
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('email', models.EmailField(max_length=254, unique=True)),
('phone', models.CharField(blank=True, max_length=10, null=True, unique=True, validators=[django.core.validators.RegexValidator(message='Phone number must be 10 digits.', regex='^\\d{10}$')])),
('is_active', models.BooleanField(default=False)),
('is_alumni', models.BooleanField(default=True)),
('is_staff_member', models.BooleanField(default=False)),
('is_admin', models.BooleanField(default=False)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('last_active', models.DateTimeField(blank=True, null=True)),
('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
],
),
migrations.CreateModel(
name='UserProfile',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('avatar', models.ImageField(blank=True, null=True, upload_to='avatars/')),
('bio', models.TextField(blank=True, max_length=500)),
('location', models.CharField(blank=True, max_length=100)),
('graduation_year', models.PositiveIntegerField(blank=True, null=True)),
('degree', models.CharField(blank=True, max_length=100)),
('major', models.CharField(blank=True, max_length=100)),
('current_company', models.CharField(blank=True, max_length=100)),
('current_position', models.CharField(blank=True, max_length=100)),
('linkedin_url', models.URLField(blank=True)),
('website_url', models.URLField(blank=True)),
('privacy_level', models.CharField(choices=[('public', 'Public'), ('alumni_only', 'Alumni Only'), ('private', 'Private')], default='alumni_only', max_length=20)),
('notification_preferences', models.JSONField(default=dict)),
('is_mentor_available', models.BooleanField(default=False)),
('mentor_skills', models.JSONField(default=list)),
('is_job_seeking', models.BooleanField(default=False)),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)),
],
options={
'verbose_name': 'User Profile',
'verbose_name_plural': 'User Profiles',
},
),
migrations.AddIndex(
model_name='user',
index=models.Index(fields=['email'], name='user_email_idx'),
),
migrations.AddIndex(
model_name='user',
index=models.Index(fields=['phone'], name='user_phone_idx'),
),
migrations.AddIndex(
model_name='user',
index=models.Index(fields=['first_name', 'last_name'], name='user_name_idx'),
),
migrations.AddIndex(
model_name='userprofile',
index=models.Index(fields=['graduation_year'], name='profile_grad_year_idx'),
),
migrations.AddIndex(
model_name='userprofile',
index=models.Index(fields=['current_company'], name='profile_company_idx'),
),
migrations.AddIndex(
model_name='userprofile',
index=models.Index(fields=['is_mentor_available'], name='profile_mentor_idx'),
),
migrations.AddIndex(
model_name='userprofile',
index=models.Index(fields=['is_job_seeking'], name='profile_jobseek_idx'),
),
]
+147 -2
View File
@@ -1,3 +1,148 @@
from django.db import models
import uuid
from django.contrib.auth.models import AbstractUser, BaseUserManager
from django.core.validators import RegexValidator
from django.db import models, IntegrityError
from django.conf import settings
from django.db.models.signals import post_save
from django.dispatch import receiver
# Create your models here.
class CustomUserManager(BaseUserManager):
def create_user(self, email=None, phone=None, password=None, **extra_fields):
if not email and not phone:
raise ValueError("User must have an email or a phone number.")
if email:
email = self.normalize_email(email)
try:
user = self.model(email=email, phone=phone, **extra_fields)
if not password:
raise ValueError("Password must be provided.")
user.set_password(password)
user.save(using=self._db)
return user
except IntegrityError as e:
# Handle unique constraints more clearly
if "unique" in str(e).lower():
if email and self.model.objects.filter(email=email).exists():
raise ValueError("A user with this email already exists.")
if phone and self.model.objects.filter(phone=phone).exists():
raise ValueError("A user with this phone number already exists.")
raise
def create_superuser(self, email=None, phone=None, password=None, **extra_fields):
extra_fields.setdefault("is_staff", True)
extra_fields.setdefault("is_superuser", True)
extra_fields.setdefault("is_admin", True)
extra_fields.setdefault("is_active", True)
if not password:
raise ValueError("Superuser must have a password.")
if not email:
raise ValueError("Superuser must have an email address.")
return self.create_user(
email=email, phone=phone, password=password, **extra_fields
)
class User(AbstractUser):
username = None
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
email = models.EmailField(unique=True)
phone = models.CharField(
max_length=10,
unique=True,
null=True,
blank=True,
validators=[
RegexValidator(
regex=r"^\d{10}$",
message="Phone number must be 10 digits.",
)
],
)
is_active = models.BooleanField(default=False)
is_alumni = models.BooleanField(default=True)
is_staff_member = models.BooleanField(default=False)
is_admin = models.BooleanField(default=False)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
last_active = models.DateTimeField(null=True, blank=True)
USERNAME_FIELD = "email"
REQUIRED_FIELDS = ["first_name", "last_name", "phone"]
objects = CustomUserManager()
def __str__(self):
return f"{self.first_name} {self.last_name} ({self.email})"
class Meta:
indexes = [
models.Index(fields=["email"], name="user_email_idx"),
models.Index(fields=["phone"], name="user_phone_idx"),
models.Index(fields=["first_name", "last_name"], name="user_name_idx"),
]
class UserProfile(models.Model):
user = models.OneToOneField(
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="profile"
)
avatar = models.ImageField(upload_to="avatars/", null=True, blank=True)
bio = models.TextField(max_length=500, blank=True)
location = models.CharField(max_length=100, blank=True)
graduation_year = models.PositiveIntegerField(null=True, blank=True)
degree = models.CharField(max_length=100, blank=True)
major = models.CharField(max_length=100, blank=True)
current_company = models.CharField(max_length=100, blank=True)
current_position = models.CharField(max_length=100, blank=True)
linkedin_url = models.URLField(blank=True)
website_url = models.URLField(blank=True)
privacy_level = models.CharField(
max_length=20,
choices=[
("public", "Public"),
("alumni_only", "Alumni Only"),
("private", "Private"),
],
default="alumni_only",
)
notification_preferences = models.JSONField(default=dict)
is_mentor_available = models.BooleanField(default=False)
mentor_skills = models.JSONField(default=list)
is_job_seeking = models.BooleanField(default=False)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
def __str__(self):
return f"{self.user.get_full_name()} - Profile"
class Meta:
indexes = [
models.Index(fields=["graduation_year"], name="profile_grad_year_idx"),
models.Index(fields=["current_company"], name="profile_company_idx"),
models.Index(fields=["is_mentor_available"], name="profile_mentor_idx"),
models.Index(fields=["is_job_seeking"], name="profile_jobseek_idx"),
]
verbose_name = "User Profile"
verbose_name_plural = "User Profiles"
@receiver(post_save, sender=settings.AUTH_USER_MODEL)
def create_user_profile(sender, instance, created, **kwargs):
if created:
UserProfile.objects.create(user=instance)
+45
View File
@@ -0,0 +1,45 @@
from rest_framework import serializers
from django.contrib.auth import get_user_model
from apps.accounts.models import UserProfile
User = get_user_model()
class UserProfileSerializer(serializers.ModelSerializer):
class Meta:
model = UserProfile
exclude = ["id", "created_at", "updated_at"] # optional
read_only_fields = ["user"]
class UserSerializer(serializers.ModelSerializer):
profile = UserProfileSerializer(read_only=True)
password = serializers.CharField(write_only=True, min_length=8)
class Meta:
model = User
fields = [
"id", "first_name", "last_name", "email", "phone",
"is_active", "is_alumni", "is_staff_member", "is_admin",
"created_at", "updated_at", "last_active", "password", "profile"
]
read_only_fields = [
"id", "is_active", "is_alumni", "is_staff_member", "is_admin",
"created_at", "updated_at", "last_active", "profile"
]
def create(self, validated_data):
password = validated_data.pop("password")
user = User.objects.create_user(**validated_data)
user.set_password(password)
user.save()
return user
def update(self, instance, validated_data):
password = validated_data.pop("password", None)
for attr, value in validated_data.items():
setattr(instance, attr, value)
if password:
instance.set_password(password)
instance.save()
return instance
+10
View File
@@ -0,0 +1,10 @@
from rest_framework.routers import DefaultRouter
from apps.accounts.views import UserViewSet, UserProfileViewSet
router = DefaultRouter()
router.register(r"users", UserViewSet)
router.register(r"profiles", UserProfileViewSet)
urlpatterns = [
*router.urls,
]
+43 -2
View File
@@ -1,3 +1,44 @@
from django.shortcuts import render
from rest_framework import viewsets, permissions
from django.contrib.auth import get_user_model
from apps.accounts.models import UserProfile
from apps.accounts.serializers import UserSerializer, UserProfileSerializer
from rest_framework.decorators import action
from rest_framework.response import Response
# Create your views here.
User = get_user_model()
class UserViewSet(viewsets.ModelViewSet):
queryset = User.objects.all()
serializer_class = UserSerializer
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
@action(
detail=False,
methods=["get"],
url_path="me",
permission_classes=[permissions.IsAuthenticated],
)
def me(self, request):
serializer = self.get_serializer(request.user)
return Response(serializer.data)
class UserProfileViewSet(viewsets.ModelViewSet):
queryset = UserProfile.objects.select_related("user").all()
serializer_class = UserProfileSerializer
permission_classes = [permissions.IsAuthenticatedOrReadOnly]
def perform_update(self, serializer):
serializer.save(user=self.request.user)
@action(
detail=False,
methods=["get"],
url_path="me",
permission_classes=[permissions.IsAuthenticated],
)
def my_profile(self, request):
profile = request.user.profile
serializer = self.get_serializer(profile)
return Response(serializer.data)
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class AchievementsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'achievements'
name = 'apps.achievements'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class DashboardConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'dashboard'
name = 'apps.dashboard'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class EventsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'events'
name = 'apps.events'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class ForumConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'forum'
name = 'apps.forum'
View File
Whitespace-only changes.
+3
View File
@@ -0,0 +1,3 @@
from django.contrib import admin
# Register your models here.
+6
View File
@@ -0,0 +1,6 @@
from django.apps import AppConfig
class GroupsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'apps.groups'
View File
Whitespace-only changes.
+3
View File
@@ -0,0 +1,3 @@
from django.db import models
# Create your models here.
+3
View File
@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.
+3
View File
@@ -0,0 +1,3 @@
from django.shortcuts import render
# Create your views here.
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class JobsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'jobs'
name = 'apps.jobs'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class MentorshipConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'mentorship'
name = 'apps.mentorship'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class MessagingConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'messaging'
name = 'apps.messaging'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class NewsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'news'
name = 'apps.news'
+1 -1
View File
@@ -3,4 +3,4 @@ from django.apps import AppConfig
class NotificationsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'notifications'
name = 'apps.notifications'