Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pip/django-5.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
EdinsonRequena authored Mar 26, 2024
2 parents 2808e12 + aeea701 commit b2df8b5
Show file tree
Hide file tree
Showing 13 changed files with 132 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ limit-inference-results=2000

# List of plugins (as comma separated values of python module names) to load,
# usually to register additional checkers.
load-plugins=
load-plugins=pylint_django

# Pickle collected data for later comparisons.
persistent=yes
Expand Down
2 changes: 2 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ djangorestframework-simplejwt = "*"
pillow = "*"
pylint = "*"
coverage = "*"
pipfile = "*"
pylint-django = "*"

[dev-packages]

Expand Down
174 changes: 107 additions & 67 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tiktok_clone_back/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

LOCAL_APPS = [
'users',
'videos',
]

DJANGO_APPS = [
Expand Down
2 changes: 1 addition & 1 deletion users/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CustomUserSerializer(serializers.ModelSerializer):
Creates a new User instance based on the validated data.
"""

class Meta: # pylint: disable=too-few-public-methods
class Meta:
model = User
fields = ['id', 'username', 'email',
'password', 'bio', 'profile_picture']
Expand Down
4 changes: 2 additions & 2 deletions users/views/user_profile_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class UserProfileAPIView(APIView):
- delete: Delete a user profile by user ID.
"""

def get(self, request: HttpRequest, userid: int) -> Response: # pylint: disable=unused-argument
def get(self, request: HttpRequest, userid: int) -> Response:
"""
Retrieve a user by their ID.
Expand Down Expand Up @@ -73,7 +73,7 @@ def put(self, request: HttpRequest, userid: int) -> Response:
logger.error(USER_WITH_ID_NOT_FOUND, userid)
return Response({'error': USER_NOT_FOUND_MESSAGE}, status=status.HTTP_404_NOT_FOUND)

def delete(self, request: HttpRequest, userid: int) -> Response: # pylint: disable=unused-argument
def delete(self, request: HttpRequest, userid: int) -> Response:
"""
Deletes a user with the given userid.
Expand Down
Empty file added videos/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions videos/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 videos/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class VideosConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'videos'
Empty file added videos/migrations/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions videos/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.
3 changes: 3 additions & 0 deletions videos/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
3 changes: 3 additions & 0 deletions videos/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.shortcuts import render

# Create your views here.

0 comments on commit b2df8b5

Please sign in to comment.