Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove Profile model and integrate JWT auth #93

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added backend/apps/api/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions backend/apps/api/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
6 changes: 6 additions & 0 deletions backend/apps/api/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class ApiConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'apps.api'
Empty file.
3 changes: 3 additions & 0 deletions backend/apps/api/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.db import models

# Create your models here.
Empty file.
23 changes: 23 additions & 0 deletions backend/apps/api/v1/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from django.urls import include, path
from rest_framework_simplejwt.views import (
TokenObtainPairView,
TokenRefreshView,
TokenVerifyView,
)

urlpatterns = [
path('users/', include('apps.user.api.v1.urls')),
path('quiblets/', include('apps.quiblet.api.v1.urls')),
path('quibs/', include('apps.quib.api.v1.urls')),
# jwt auth
path(
'auth/',
include(
[
path('token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
path('token/verify/', TokenVerifyView.as_view(), name='token_verify'),
]
),
),
]
44 changes: 2 additions & 42 deletions backend/apps/quib/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Generated by Django 5.1.3 on 2024-12-07 04:12
# Generated by Django 5.1.4 on 2024-12-11 02:49

import django.db.models.deletion
import shortuuid.django_fields
from django.db import migrations, models

Expand All @@ -9,10 +8,7 @@ class Migration(migrations.Migration):

initial = True

dependencies = [
('quiblet', '0003_delete_quib'),
('user', '0001_initial'),
]
dependencies = []

operations = [
migrations.CreateModel(
Expand Down Expand Up @@ -44,42 +40,6 @@ class Migration(migrations.Migration):
),
),
('content', models.TextField(verbose_name='content')),
(
'dislikes',
models.ManyToManyField(
blank=True,
related_name='disliked_quibs',
to='user.profile',
verbose_name='dislikes',
),
),
(
'likes',
models.ManyToManyField(
blank=True,
related_name='liked_quibs',
to='user.profile',
verbose_name='likes',
),
),
(
'quibber',
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='quibs',
to='user.profile',
verbose_name='quibber',
),
),
(
'quiblet',
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='quibs',
to='quiblet.quiblet',
verbose_name='quiblet',
),
),
],
options={
'verbose_name': 'Quib',
Expand Down
59 changes: 59 additions & 0 deletions backend/apps/quib/migrations/0002_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Generated by Django 5.1.4 on 2024-12-11 02:49

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
('quib', '0001_initial'),
('quiblet', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AddField(
model_name='quib',
name='dislikes',
field=models.ManyToManyField(
blank=True,
related_name='disliked_quibs',
to=settings.AUTH_USER_MODEL,
verbose_name='dislikes',
),
),
migrations.AddField(
model_name='quib',
name='likes',
field=models.ManyToManyField(
blank=True,
related_name='liked_quibs',
to=settings.AUTH_USER_MODEL,
verbose_name='likes',
),
),
migrations.AddField(
model_name='quib',
name='quibber',
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='quibs',
to=settings.AUTH_USER_MODEL,
verbose_name='quibber',
),
),
migrations.AddField(
model_name='quib',
name='quiblet',
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='quibs',
to='quiblet.quiblet',
verbose_name='quiblet',
),
),
]
8 changes: 4 additions & 4 deletions backend/apps/quib/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.utils.translation import gettext_lazy as _

from apps.quiblet.models import Quiblet
from apps.user.models import Profile
from apps.user.models import CustomUser
from common.mixins import CreatedAtMixin, IsPublicMixin, ShortUUIDIdMixin


Expand All @@ -15,7 +15,7 @@ class Quib(CreatedAtMixin, IsPublicMixin, ShortUUIDIdMixin):
on_delete=models.CASCADE,
)
quibber = models.ForeignKey(
Profile,
CustomUser,
related_name='quibs',
verbose_name=_('quibber'),
on_delete=models.CASCADE,
Expand All @@ -24,10 +24,10 @@ class Quib(CreatedAtMixin, IsPublicMixin, ShortUUIDIdMixin):
slug = models.SlugField(_('slug'), editable=False, max_length=25, blank=True)
content = models.TextField(_('content'))
likes = models.ManyToManyField(
Profile, related_name='liked_quibs', blank=True, verbose_name=_('likes')
CustomUser, related_name='liked_quibs', blank=True, verbose_name=_('likes')
)
dislikes = models.ManyToManyField(
Profile, related_name='disliked_quibs', blank=True, verbose_name=_('dislikes')
CustomUser, related_name='disliked_quibs', blank=True, verbose_name=_('dislikes')
)

def save(self, *args, **kwargs):
Expand Down
38 changes: 1 addition & 37 deletions backend/apps/quiblet/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 5.1.3 on 2024-12-06 15:53
# Generated by Django 5.1.4 on 2024-12-11 02:49

import dynamic_filenames
import shortuuid.django_fields
Expand All @@ -12,42 +12,6 @@ class Migration(migrations.Migration):
dependencies = []

operations = [
migrations.CreateModel(
name='Quib',
fields=[
(
'created_at',
models.DateTimeField(auto_now_add=True, verbose_name='create at'),
),
('is_public', models.BooleanField(default=True, verbose_name='is public')),
(
'id',
shortuuid.django_fields.ShortUUIDField(
alphabet='abcdefghijklmnopqrstuvwxyz0123456789',
editable=False,
length=7,
max_length=7,
prefix='',
primary_key=True,
serialize=False,
verbose_name='id',
),
),
('title', models.CharField(max_length=255, verbose_name='title')),
(
'slug',
models.SlugField(
blank=True, editable=False, max_length=25, verbose_name='slug'
),
),
('content', models.TextField(verbose_name='content')),
],
options={
'verbose_name': 'Quib',
'verbose_name_plural': 'Quibs',
'ordering': ['-created_at'],
},
),
migrations.CreateModel(
name='Quiblet',
fields=[
Expand Down
50 changes: 5 additions & 45 deletions backend/apps/quiblet/migrations/0002_initial.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 5.1.3 on 2024-12-06 15:53
# Generated by Django 5.1.4 on 2024-12-11 02:49

import django.db.models.deletion
import django.db.models.functions.text
from django.conf import settings
from django.db import migrations, models


Expand All @@ -11,47 +11,17 @@ class Migration(migrations.Migration):

dependencies = [
('quiblet', '0001_initial'),
('user', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AddField(
model_name='quib',
name='dislikes',
field=models.ManyToManyField(
blank=True,
related_name='disliked_quibs',
to='user.profile',
verbose_name='dislikes',
),
),
migrations.AddField(
model_name='quib',
name='likes',
field=models.ManyToManyField(
blank=True,
related_name='liked_quibs',
to='user.profile',
verbose_name='likes',
),
),
migrations.AddField(
model_name='quib',
name='quibber',
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='quibs',
to='user.profile',
verbose_name='quibber',
),
),
migrations.AddField(
model_name='quiblet',
name='members',
field=models.ManyToManyField(
blank=True,
related_name='joined_quiblets',
to='user.profile',
to=settings.AUTH_USER_MODEL,
verbose_name='members',
),
),
Expand All @@ -61,20 +31,10 @@ class Migration(migrations.Migration):
field=models.ManyToManyField(
blank=True,
related_name='ranged_quiblets',
to='user.profile',
to=settings.AUTH_USER_MODEL,
verbose_name='rangers',
),
),
migrations.AddField(
model_name='quib',
name='quiblet',
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='quibs',
to='quiblet.quiblet',
verbose_name='quiblet',
),
),
migrations.AddConstraint(
model_name='quiblet',
constraint=models.UniqueConstraint(
Expand Down
16 changes: 0 additions & 16 deletions backend/apps/quiblet/migrations/0003_delete_quib.py

This file was deleted.

6 changes: 3 additions & 3 deletions backend/apps/quiblet/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.utils.translation import gettext_lazy as _
from dynamic_filenames import FilePattern

from apps.user.models import Profile
from apps.user.models import CustomUser
from common.mixins import AvatarMixin, CreatedAtMixin, IsPublicMixin, ShortUUIDIdMixin


Expand All @@ -18,10 +18,10 @@ class Quiblet(AvatarMixin, CreatedAtMixin, IsPublicMixin, ShortUUIDIdMixin):
null=True,
)
members = models.ManyToManyField(
Profile, related_name='joined_quiblets', blank=True, verbose_name=_('members')
CustomUser, related_name='joined_quiblets', blank=True, verbose_name=_('members')
)
rangers = models.ManyToManyField(
Profile, related_name='ranged_quiblets', blank=True, verbose_name=_('rangers')
CustomUser, related_name='ranged_quiblets', blank=True, verbose_name=_('rangers')
)

class Meta: # type: ignore
Expand Down
Loading
Loading