created project folder structure, added apps, added base models

vehicle/apps.py → core/blog/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class VehicleConfig(AppConfig):
+class BlogConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "vehicle"
+    name = "core.blog"

core/blog/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

core/question/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class QuestionConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "core.question"

core/question/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

core/question/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

core/support/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

core/support/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SupportConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "core.support"

core/support/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

core/support/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

core/support/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

core/user/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

user/apps.py → core/user/apps.py

@@ -3,4 +3,4 @@
 
 class UserConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'user'
+    name = 'core.user'

user/models.py → core/user/models.py

@@ -7,14 +7,8 @@
 
 class User(AbstractUser):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    email = models.EmailField(max_length=200, unique=True)
+    email = models.EmailField(max_length=255, unique=True)
 
-    def data(self):
+    def token(self):
         refresh = RefreshToken.for_user(self)
-        return {
-            'refresh_token': f"{refresh}",
-            'access_token': str(refresh.access_token)
-        }
-
-    class Meta:
-        db_table = "user"
+        return {"refresh_token": f"{refresh}", "access_token": str(refresh.access_token)}

core/user/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

user/v1/serializers.py → core/user/v1/serializers.py

@@ -10,7 +10,7 @@
 from rest_framework_simplejwt.exceptions import TokenError
 from rest_framework_simplejwt.tokens import RefreshToken
 
-from user.models import User
+from core.user.models import User
 
 
 class UserLoginSerializer(serializers.ModelSerializer):

core/user/v1/urls.py

@@ -0,0 +1,21 @@
+from django.urls import re_path
+from rest_framework_simplejwt.views import TokenRefreshView
+
+from core.user.v1.views import (
+    UserLoginAPIView,
+    UserRegistrationAPIView,
+    UserLogoutAPIView,
+    UserListAPIView,
+    UserDetailAPIView,
+)
+
+urlpatterns = [
+    # Example with Regex (old version django)
+    re_path(r"^detail/(?P<id>[\w-]+)$", UserDetailAPIView.as_view(), name="user_detail_api"),
+    re_path(r"^detail/(?P<id>[\w-]+)$", UserDetailAPIView.as_view(), name="user_detail_api"),
+    re_path(r"^login$", UserLoginAPIView.as_view(), name="user_login_api"),
+    re_path(r"^list$", UserListAPIView.as_view(), name="user_list_api"),
+    re_path(r"^login/refresh$", TokenRefreshView.as_view(), name="token_refresh"),
+    re_path(r"^register$", UserRegistrationAPIView.as_view(), name="user_create_api"),
+    re_path(r"^logout$", UserLogoutAPIView.as_view(), name="user_logout_api"),
+]

user/v1/api.py → core/user/v1/views.py

@@ -10,8 +10,8 @@
 from rest_framework_jwt.settings import api_settings
 
 from skillforge.constants import BaseResponse
-from user.models import User
-from user.v1.serializers import (
+from core.user.models import User
+from core.user.v1.serializers import (
     UserLoginSerializer, UserRegisterSerializer,
     UserLogoutSerializer, UserListSerializer
 )

user/serializers.py → core/user/v2/serializers.py

@@ -10,7 +10,7 @@
 from rest_framework_simplejwt.exceptions import TokenError
 from rest_framework_simplejwt.tokens import RefreshToken
 
-from user.models import User
+from core.user.models import User
 
 
 class UserLoginSerializer(serializers.ModelSerializer):
@@ -20,7 +20,7 @@ class UserLoginSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = User
-        fields = ["email", "password", "username", "data"]
+        fields = ["email", "password", "username", "token"]
 
     def validate(self, attrs):
         username = attrs.get("username", "")
@@ -33,8 +33,8 @@ def validate(self, attrs):
         if not user:
             raise AuthenticationFailed("Invalid credential, try again")
         user.last_login = datetime.datetime.now()
-        user.save()
-        return {"email": user.email, "username": user.username, "data": user.data}
+        user.save(update_fields=["last_login"])
+        return {"email": user.email, "username": user.username, "data": user.token}
 
 
 class UserDetailSerializer(serializers.ModelSerializer):
@@ -66,7 +66,7 @@ def validate(self, attrs):
         self.token = attrs["refresh"]
         return attrs
 
-    def save(self, **kwargs):
+    def save(self):
         try:
             RefreshToken(self.token).blacklist()
         except TokenError:
@@ -100,13 +100,17 @@ def create(self, validated_data):
         return user
 
 
-class UserForgetPasswordSerializer(serializers.Serializer):
+class UserForgetPasswordSerializer(serializers.ModelSerializer):
     email = serializers.EmailField(required=True)
 
     def validate(self, attrs):
         get_object_or_404(User, email=attrs["email"])
         return attrs
 
+    class Meta:
+        model = User
+        fields = ("email",)
+
 
 class UserResetPasswordSerializer(serializers.ModelSerializer):
     password = serializers.CharField(required=True, validators=[validate_password])

core/user/v2/urls.py

@@ -0,0 +1,20 @@
+from django.urls import re_path
+from rest_framework_simplejwt.views import TokenRefreshView
+
+from core.user.v2.views import (
+    UserLoginAPIView,
+    UserRegistrationAPIView,
+    UserLogoutAPIView,
+    UserListAPIView,
+    UserDetailAPIView,
+)
+
+
+urlpatterns = [
+    re_path(r"^detail/(?P<id>[\w-]+)$", UserDetailAPIView.as_view(), name="v1_user_detail"),
+    re_path(r"^login$", UserLoginAPIView.as_view(), name="v2_user_login"),
+    re_path(r"^list$", UserListAPIView.as_view(), name="v1_user_list"),
+    re_path(r"^register$", UserRegistrationAPIView.as_view(), name="v1_user_create"),
+    re_path(r"^logout$", UserLogoutAPIView.as_view(), name="v1_user_logout"),
+    re_path(r"^login/refresh$", TokenRefreshView.as_view(), name="v1_token_refresh"),
+]

user/views.py → core/user/v2/views.py

@@ -1,14 +1,20 @@
+# Bugra Ahmet Caglar
 from drf_yasg.utils import swagger_auto_schema
 
 from skillforge.generics import StandardResultsSetPagination
 from rest_framework import status
-from rest_framework.permissions import AllowAny, IsAuthenticated
-from rest_framework.generics import CreateAPIView, RetrieveAPIView, ListAPIView
+from rest_framework.permissions import (AllowAny, IsAuthenticated)
+from rest_framework.generics import (
+    CreateAPIView, RetrieveAPIView, ListAPIView
+)
 from rest_framework_jwt.settings import api_settings
 
 from skillforge.constants import BaseResponse
-from user.serializers import *
-from user.models import User
+from core.user.models import User
+from core.user.v1.serializers import (
+    UserLoginSerializer, UserRegisterSerializer,
+    UserLogoutSerializer, UserListSerializer
+)
 
 JWT_PAYLOAD_HANDLER = api_settings.JWT_PAYLOAD_HANDLER
 JWT_ENCODE_HANDLER = api_settings.JWT_ENCODE_HANDLER
@@ -22,26 +28,29 @@ class UserLoginAPIView(CreateAPIView):
     def post(self, request, *args, **kwargs):
         serializer = self.serializer_class(data=request.data)
         serializer.is_valid(raise_exception=True)
-        return BaseResponse(data=serializer.data, status_code=status.HTTP_200_OK).success_data()
+        return BaseResponse(data=serializer.data, status_code=status.HTTP_200_OK).success_with_data()
 
 
 class UserRegistrationAPIView(CreateAPIView):
-    permission_classes = [AllowAny]
     serializer_class = UserRegisterSerializer
+    permission_classes = [AllowAny]
 
     @swagger_auto_schema(operation_summary="Create a new user API")
     def post(self, request, *args, **kwargs):
         serializer = self.serializer_class(data=request.data)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        return BaseResponse(message="User created successfully.", status_code=status.HTTP_201_CREATED).success()
+        return BaseResponse(
+            message="User created successfully.",
+            status_code=status.HTTP_201_CREATED
+        ).success()
 
 
 class UserDetailAPIView(RetrieveAPIView):
     permission_classes = [AllowAny]
     serializer_class = UserListSerializer
     queryset = User.objects.all()
-    lookup_field = "id"
+    lookup_field = 'id'
 
 
 class UserLogoutAPIView(CreateAPIView):
@@ -53,16 +62,21 @@ def post(self, request, *args, **kwargs):
         serializer = self.serializer_class(data=request.data)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        return BaseResponse(message="Successfully logged out.", status_code=status.HTTP_200_OK).success()
+        return BaseResponse(
+            message="Successfully logged out.", status_code=status.HTTP_200_OK
+        ).success()
 
 
 class UserListAPIView(ListAPIView):
     permission_classes = [AllowAny]
     serializer_class = UserListSerializer
     pagination_class = StandardResultsSetPagination
     queryset = User.objects.filter(is_active=True)
-    lookup_field = "id"
+    lookup_field = 'id'
 
     def list(self, request, *args, **kwargs):
         serializer_data = self.serializer_class(self.queryset, many=True).data
-        return BaseResponse(data=serializer_data, status_code=status.HTTP_200_OK).success_data()
+        return BaseResponse(
+            data=serializer_data,
+            status_code=status.HTTP_200_OK
+        ).success_with_data()

core/video/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

core/video/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class VideoConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "core.video"

core/video/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

core/video/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

core/video/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

dev.env

@@ -1,10 +1,11 @@
-SECRET_KEY=django-insecure-(q_xc+d@c4wzz0@80)nraq&7k^^*@yhj-_8h$a5ax!d0zpgfi$
+SECRET_KEY="django-insecure-(q_xc+d@c4wzz0@80)nraq&7k^^*@yhj-_8h$a5ax!d0zpgfi$"
+DEBUG = True
 
 
 # DATABASE
-DB_NAME="skillforge"
-DB_USER="django"
-DB_PASSWORD="django"
+DB_NAME="db"
+DB_USER="postgres"
+DB_PASSWORD="postgres"
 DB_HOST="db"
 DB_PORT="5432"