ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-07-15 10:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

jira-15 dashboard API

Browse Source
This commit is contained in:
jain
2023-07-06 12:21:54 +05:30
parent a80f603614
commit cf966a5250
10 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account/serializers.py
View File

@ -87,7 +87,7 @@ class ChangePasswordSerializer(serializers.Serializer):
if self.context.password not in ('', None):
if user.check_password(value):
return value
raise serializers.ValidationError({"details":ERROR_CODE['2015']})
raise serializers.ValidationError(ERROR_CODE['2015'])
def create(self, validated_data):
new_password = validated_data.pop('new_password')
current_password = validated_data.pop('current_password')

2
base/messages.py
View File

@ -81,7 +81,7 @@ SUCCESS_CODE = {
"3015": "Verification code sent on your email.",
"3016": "Send otp on your Email successfully",
"3017": "Profile image update successfully",
"3018": "Created task successfully"
"3018": "Task created successfully"
}
STATUS_CODE_ERROR = {

2
guardian/admin.py
View File

@ -16,7 +16,7 @@ class GuardianAdmin(admin.ModelAdmin):
@admin.register(JuniorTask)
class TaskAdmin(admin.ModelAdmin):
"""Junior Admin"""
list_display = ['task_name', 'task_status', 'junior', 'points']
list_display = ['id', 'task_name', 'task_status', 'junior', 'due_date', 'points', 'created_at', 'updated_at']
def __str__(self):
"""Return email id"""

18
guardian/migrations/0012_alter_juniortask_default_image.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.2 on 2023-07-06 05:12
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('guardian', '0011_juniortask_default_image_juniortask_is_approved_and_more'),
]
operations = [
migrations.AlterField(
model_name='juniortask',
name='default_image',
field=models.URLField(blank=True, default=None, null=True),
),
]

18
guardian/migrations/0013_alter_guardian_image.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 4.2.2 on 2023-07-06 06:40
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('guardian', '0012_alter_juniortask_default_image'),
]
operations = [
migrations.AlterField(
model_name='guardian',
name='image',
field=models.URLField(blank=True, default=None, null=True),
),
]

4
guardian/models.py
View File

@ -16,7 +16,7 @@ class Guardian(models.Model):
phone = models.CharField(max_length=31, null=True, blank=True, default=None)
country_name = models.CharField(max_length=100, null=True, blank=True, default=None)
"""Image info"""
image = models.ImageField(null=True, blank=True, default=None)
image = models.URLField(null=True, blank=True, default=None)
"""Personal info"""
family_name = models.CharField(max_length=50, null=True, blank=True, default=None)
gender = models.CharField(choices=GENDERS, max_length=15, null=True, blank=True, default=None)
@ -50,7 +50,7 @@ class JuniorTask(models.Model):
task_description = models.CharField(max_length=500)
points = models.IntegerField(default=TASK_POINTS)
due_date = models.DateField(auto_now_add=False, null=True, blank=True)
default_image = models.ImageField(null=True, blank=True, default=None)
default_image = models.URLField(null=True, blank=True, default=None)
image = models.URLField(null=True, blank=True, default=None)
junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='junior', verbose_name='Junior')
task_status = models.CharField(choices=TASK_STATUS, max_length=15, default=PENDING)

14
guardian/serializers.py
View File

@ -129,9 +129,9 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
if image:
filename = f"images/{image.name}"
image_url = upload_image_to_alibaba(image, filename)
print("image_url=====>",image_url)
print("image_url=====>",image_url,'===>',type(image_url))
guardian.image = image_url
print("guardian.image=====>", guardian.image)
print("guardian.image=====>", guardian.image,'===>',type(guardian.image))
guardian.save()
return guardian
@ -146,13 +146,11 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
class TaskSerializer(serializers.ModelSerializer):
class Meta(object):
model = JuniorTask
fields = ['task_name','task_description','points', 'due_date', 'junior', 'image']
fields = ['task_name','task_description','points', 'due_date', 'junior', 'default_image']
def create(self, validated_data):
validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last()
images = self.context['image']
validated_data['image'] = images
print("images===>",images)
print("validated_data===>",validated_data)
validated_data['default_image'] = images
# if 'http' in str(images):
# validated_data['image'] = images
# else:
@ -192,8 +190,8 @@ class TaskDetailsSerializer(serializers.ModelSerializer):
junior = JuniorDetailSerializer()
class Meta(object):
model = JuniorTask
fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date', 'image','junior',
'task_status', 'is_active']
fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date','default_image', 'image',
'junior', 'task_status', 'is_active', 'created_at','updated_at']

6
guardian/utils.py
View File

@ -10,5 +10,9 @@ def upload_image_to_alibaba(image, filename):
bucket = oss2.Bucket(auth, settings.ALIYUN_OSS_ENDPOINT, settings.ALIYUN_OSS_BUCKET_NAME)
# Upload the temporary file to Alibaba OSS
bucket.put_object_from_file(filename, temp_file.name)
return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{filename}"
print("filename====>",filename,'===>',type(filename))
new_filename = filename.replace(' ', '%20')
print()
print("filename====>", filename, '===>', type(filename))
return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}"

47
guardian/views.py
View File

@ -2,6 +2,7 @@
"""Third party Django app"""
from rest_framework.permissions import IsAuthenticated
from rest_framework import viewsets, status
from rest_framework.pagination import PageNumberPagination
from django.db.models import Max
"""Import Django app"""
from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer,
@ -64,35 +65,34 @@ class AllTaskListAPIView(viewsets.ModelViewSet):
def list(self, request, *args, **kwargs):
"""Create guardian profile"""
queryset = JuniorTask.objects.filter(guardian__user=request.user)
print("queryset==>",queryset)
serializer = TaskDetailsSerializer(queryset, many=True)
print("serializer.data===>",serializer.data)
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
class TaskListAPIView(viewsets.ModelViewSet):
"""Update guardian profile"""
serializer_class = TaskDetailsSerializer
permission_classes = [IsAuthenticated]
pagination_class = PageNumberPagination
def list(self, request, *args, **kwargs):
"""Create guardian profile"""
print("request.GET.get(status)==>",self.request.GET.get('status'))
status_value = self.request.GET.get('status')
if status_value == 0:
queryset = JuniorTask.objects.filter(guardian__user=request.user)
queryset = JuniorTask.objects.filter(guardian__user=request.user).order_by('created_at')
else:
queryset = JuniorTask.objects.filter(guardian__user=request.user,
task_status=status_value)
print("queryset==>",queryset)
serializer = TaskDetailsSerializer(queryset, many=True)
print("serializer.data===>",serializer.data)
task_status=status_value).order_by('due_date','created_at')
paginator = self.pagination_class()
paginated_queryset = paginator.paginate_queryset(queryset, request)
serializer = TaskDetailsSerializer(paginated_queryset, many=True)
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
class CreateTaskAPIView(viewsets.ModelViewSet):
"""create task for junior"""
serializer_class = TaskSerializer
def create(self, request, *args, **kwargs):
image = request.data['image']
image = request.data['default_image']
data = request.data
if 'https' in str(image):
image_data = image
@ -100,7 +100,7 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
filename = f"images/{image}"
image_url = upload_image_to_alibaba(image, filename)
image_data = image_url
data.pop('image')
data.pop('default_image')
serializer = TaskSerializer(context={"user":request.user, "image":image_data}, data=data)
if serializer.is_valid():
serializer.save()
@ -112,21 +112,17 @@ class SearchTaskListAPIView(viewsets.ModelViewSet):
"""Update guardian profile"""
serializer_class = TaskDetailsSerializer
permission_classes = [IsAuthenticated]
pagination_class = PageNumberPagination
def list(self, request, *args, **kwargs):
"""Create guardian profile"""
due_date = self.request.GET.get('due_date')
print("request.GET.get(status)==>",self.request.GET.get('status'))
if self.request.GET.get('status'):
queryset = JuniorTask.objects.filter(guardian__user=request.user,
task_status=self.request.GET.get('status')).order_by('due_date')
if due_date:
queryset = JuniorTask.objects.filter(guardian__user=request.user,
due_date=due_date).order_by('due_date').order_by('created_at')
print("queryset==>",queryset)
serializer = TaskDetailsSerializer(queryset, many=True)
# print("serializer.data===>",serializer.data)
title = self.request.GET.get('title')
if title:
queryset = JuniorTask.objects.filter(guardian__user=request.user, task_name__icontains=title)\
.order_by('due_date','created_at')
paginator = self.pagination_class()
paginated_queryset = paginator.paginate_queryset(queryset, request)
serializer = TaskDetailsSerializer(paginated_queryset, many=True)
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
@ -144,11 +140,10 @@ class TopJuniorListAPIView(viewsets.ModelViewSet):
junior_ids = [item['junior'] for item in junior_ids_with_total_points]
juniors = Junior.objects.filter(id__in=junior_ids) \
.annotate(max_points=Max('junior_task__points')) \
.order_by('-max_points', 'id')
juniors = Junior.objects.filter(id__in=junior_ids)
serializer = self.get_serializer(juniors, many=True, context={'junior_ids_with_total_points': junior_ids_with_total_points})
serializer = self.get_serializer(juniors, many=True, context={'junior_ids_with_total_points':
junior_ids_with_total_points})
return custom_response(serializer.data, response_status=status.HTTP_200_OK)
#

5
zod_bank/settings.py
View File

@ -92,8 +92,9 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': [
# 'rest_framework.authentication.SessionAuthentication',
'rest_framework.authentication.BasicAuthentication',
'rest_framework_simplejwt.authentication.JWTAuthentication',
]
'rest_framework_simplejwt.authentication.JWTAuthentication',],
'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
'PAGE_SIZE': 5, # Set the default pagination size
}
SIMPLE_JWT = {
'ACCESS_TOKEN_LIFETIME': timedelta(minutes=50),