From d901d3d25bf0681e41446ea2727d07dec8127f8b Mon Sep 17 00:00:00 2001 From: Jakub K Date: Thu, 7 Mar 2024 23:14:54 +0100 Subject: [PATCH] remove SkillLevels --- jobposting/admin.py | 4 ++-- jobposting/serializers.py | 11 +---------- jobposting/urls.py | 1 - jobposting/views.py | 24 +----------------------- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/jobposting/admin.py b/jobposting/admin.py index d8f8074..798abd5 100644 --- a/jobposting/admin.py +++ b/jobposting/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import SkillLevels, JobListing, CompanyLogo +from .models import JobListing, CompanyLogo, Skill # Register your models here. -admin.site.register(SkillLevels) +admin.site.register(Skill) admin.site.register(JobListing) admin.site.register(CompanyLogo) \ No newline at end of file diff --git a/jobposting/serializers.py b/jobposting/serializers.py index 36757ba..70d0198 100644 --- a/jobposting/serializers.py +++ b/jobposting/serializers.py @@ -1,5 +1,5 @@ from rest_framework import serializers -from jobposting.models import JobListing, SkillLevels, CompanyLogo, Skill +from jobposting.models import JobListing, CompanyLogo, Skill from core.models import MyUser, AnonymousUserData class MyUserSerializer(serializers.ModelSerializer): @@ -13,15 +13,6 @@ class AnonymousUserDataSerializer(serializers.ModelSerializer): fields = ['id', 'contact_email', 'first_name', 'last_name'] -class SkillLevelsSerializer(serializers.ModelSerializer): - skill_id = serializers.SlugRelatedField( - slug_field='skill_name', - queryset=Skill.objects.all(), - ) - # jobposting_id = serializers.PrimaryKeyRelatedField(source='jobposting.id', queryset=JobListing.objects.all()) - class Meta: - model = SkillLevels - fields = ['skill_id', 'skill_level', 'jobposting_id'] class JobListingSerializer(serializers.ModelSerializer): created_by = MyUserSerializer(read_only=True) diff --git a/jobposting/urls.py b/jobposting/urls.py index 51804cc..6fe1d95 100644 --- a/jobposting/urls.py +++ b/jobposting/urls.py @@ -6,7 +6,6 @@ from jobposting import views router = DefaultRouter() router.register(r'users', views.MyUserViewSet) router.register(r'joblistings', views.JobListingViewSet) -router.register(r'skilllevels', views.SkillLevelsViewSet) router.register(r'companylogo', views.CompanyLogoViewSet) router.register(r'skills', views.SkillViewset) diff --git a/jobposting/views.py b/jobposting/views.py index 112b199..b35af05 100644 --- a/jobposting/views.py +++ b/jobposting/views.py @@ -1,6 +1,6 @@ from rest_framework import viewsets, permissions, authentication from rest_framework.response import Response -from jobposting.models import JobListing, SkillLevels, CompanyLogo, Skill +from jobposting.models import JobListing, CompanyLogo, Skill from core.models import MyUser, AnonymousUserData from rest_framework import status from jobposting.permissions import ClientCredentialPermission @@ -57,28 +57,6 @@ class JobListingViewSet(viewsets.ModelViewSet): serializer.save(anonymous_user_data=anonymous_user_data) -class SkillLevelsViewSet(viewsets.ModelViewSet): - # authentication_classes = [OAuth2Authentication, authentication.SessionAuthentication] - # permission_classes = [permissions.IsAuthenticated|TokenHasReadWriteScope] # test only - queryset = SkillLevels.objects.all() - serializer_class = SkillLevelsSerializer - required_scope = ['main'] - authentication_classes = [] - permission_classes = [] - - # # permission_classes = [permissions.IsAuthenticatedOrReadOnly] - - def create(self, request, *args, **kwargs): - data = request.data - print(type(data)) - if isinstance(data, list): # Sprawdzenie, czy dane to lista - serializers = [self.get_serializer(data=item) for item in data] - for serializer in serializers: - serializer.is_valid(raise_exception=True) - self.perform_create(serializer) - return Response([serializer.data for serializer in serializers], status=status.HTTP_201_CREATED) - else: - return super().create(request, *args, **kwargs) class CompanyLogoViewSet(viewsets.ModelViewSet): # authentication_classes = [OAuth2Authentication, authentication.SessionAuthentication]