zmiana ci/cd

.drone.yml

@@ -5,9 +5,9 @@ name: default
 steps:
 - name: build
   commands:
-    - docker build --no-cache -t izaac:latest .
+    - docker build --no-cache -t izaac-develop:latest .
-    - docker tag izaac:latest registry.izaac.pl:5000/izaac:latest
+    - docker tag izaac-develop:latest registry.izaac.pl:5000/izaac-develop:latest
-    - docker push registry.izaac.pl:5000/izaac:latest
+    - docker push registry.izaac.pl:5000/izaac-develop:latest
 
 - name: delete
   environment:
@@ -23,4 +23,4 @@ steps:
 
 trigger:
   branch:
-    - master
+    - develop

Dockerfile

@@ -4,7 +4,8 @@ WORKDIR /usr/scr/app
 
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
-
+ENV REACT_CLIENT_ID="rrgNLSEqlcl45RVMQa0LxQLOHOgZ2L7ZlGpXUrCp"
+ENV REACT_CLIENT_SECRET="lKsmraeSmihY8rTQgd8TTGIncUloW7XokR8WLI0oZq8jCJ59guAkopg9ZOUeXFdyrqwuLi6TyXLZJDp1KB8DWEus05ttS3NQHoLvfRoOQtJpQaxzyIo85oykjQn25Keb"
 RUN pip install --upgrade pip
 COPY ./requirements.txt .
 RUN pip install -r requirements.txt

core/admin.py

@@ -1,4 +1,17 @@
 from django.contrib import admin
-from .models import MyUser
+from .models import MyUser, AnonymousUserData
 # Register your models here.
-admin.site.register(MyUser)
+
+class MyUserAdmin(admin.ModelAdmin):
+    list_display = ('email', 'first_name', 'last_name')
+    search_fields = ('email', 'first_name', 'last_name')
+    ordering = ['email']
+
+admin.site.register(MyUser, MyUserAdmin)
+
+class AnonymousUserDataAdmin(admin.ModelAdmin):
+    list_display = ('contact_email', 'first_name', 'last_name')
+    search_fields = ('contact_email', 'first_name', 'last_name')
+    ordering = ['contact_email']
+
+admin.site.register(AnonymousUserData, AnonymousUserDataAdmin)

core/models.py

@@ -33,6 +33,7 @@ class MyUser(AbstractBaseUser, PermissionsMixin):
     is_staff = models.BooleanField(_('staff status'), default=False)
     is_active = models.BooleanField(_('active'), default=True)
     company_name = models.CharField(_('company name'), max_length=100)
+    is_company = models.BooleanField(_('company'), default=False)
 
     objects = MyUserManager()
     USERNAME_FIELD = 'username'

deployment.yml

@@ -14,12 +14,12 @@ spec:
     spec:
       containers:
       - name: izaac-backend
-        image: registry.izaac.pl:5000/izaac:latest
+        image: registry.knck.pl:5000/izaac-develop:latest
         ports:
         - containerPort: 8000
         volumeMounts:
         - name: static-storage
-          mountPath: /usr/scr/app/staticfiles  # Ścieżka, gdzie Django oczekuje plików statycznych
+          mountPath: /usr/scr/app/staticfiles  
         - name: static-media
           mountPath: /usr/scr/app/media
       volumes:

izaac/settings.py

@@ -17,6 +17,9 @@ import os
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
+REACT_CLIENT_ID = os.environ.get("REACT_CLIENT_ID")
+
+REACT_CLIENT_SECRET = os.environ.get("REACT_CLIENT_SECRET")
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
@@ -27,7 +30,7 @@ SECRET_KEY = "django-insecure-ztiqj957k(j*@ms=-^9j+=j7wd+cyo*+9g&hkfh1bji-@#&6(e
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['izaac.izaac.pl', 'localhost', '127.0.0.1',]
+ALLOWED_HOSTS = ['*']
 
 CORS_ALLOW_ALL_ORIGINS = True
 
@@ -40,12 +43,13 @@ CORS_ALLOW_ALL_ORIGINS = True
 # ]
 
 REST_FRAMEWORK = {
-    'DEFAULT_AUTHENTICATION_CLASSES': (
+    'DEFAULT_AUTHENTICATION_CLASSES': [
         'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
-    ),
+        'rest_framework.authentication.SessionAuthentication',
-    'DEFAULT_PERMISSION_CLASSES': (
+    ],
+    'DEFAULT_PERMISSION_CLASSES': [
         'rest_framework.permissions.IsAuthenticated',
-    )
+    ]
 }
 
 OAUTH2_PROVIDER = {

jobposting/admin.py

@@ -1,6 +1,25 @@
 from django.contrib import admin
-from .models import SkillLevels, JobListing, CompanyLogo
+from .models import JobOffer, CompanyLogo, Skill
+
 # Register your models here.
-admin.site.register(SkillLevels)
+
-admin.site.register(JobListing)
+class JobOfferAdmin(admin.ModelAdmin):
-admin.site.register(CompanyLogo)
+    list_display = ('name', 'company_name', 'created_at', 'status', 'status_paid', 'expiration_date')
+    list_filter = ('status', 'status_paid', 'expiration_date')
+    search_fields = ('name', 'company_name', 'content')
+    date_hierarchy = 'created_at'
+    ordering = ['status', 'created_at']
+
+class CompanyLogoAdmin(admin.ModelAdmin):
+    list_display = ('company_name', 'company_logo')
+    search_fields = ('company_name',)
+    ordering = ['company_name']
+
+class SkillAdmin(admin.ModelAdmin):
+    list_display = ('skill_name',)
+    search_fields = ('skill_name',)
+    ordering = ['skill_name']
+
+admin.site.register(JobOffer, JobOfferAdmin,)
+admin.site.register(CompanyLogo, CompanyLogoAdmin)
+admin.site.register(Skill, SkillAdmin)

jobposting/models.py

@@ -7,44 +7,88 @@ from datetime import timedelta
 
 from .helpers import rename_file
 
-class JobListing(models.Model):
+class JobOffer(models.Model):
+
     posting_options = [
         ('M', 'Minimal'),
         ('S', 'Standard'),
         ('P', 'Premium'),
     ]
+
     status_choices = [
         ('A', 'Aktywna'),
         ('C', 'Zakończona'),
         ('W', 'Oczekująca na sprawdzenie'),
         ('R', 'Zarchiwizowana'),
     ]
+
     paid_status = [
         ('P', 'Oplacona'),
         ('N', 'Nieoplacona'),
         ('D', 'Inny status')
     ]
+
+    category_choices = [
+        ('A', 'Budownictwo'),
+        ('B', 'IT'),
+        ('C', 'Elektryka i Elektronika'),
+        ('D', 'Produkcja'),
+        ('E', 'Mechanika i konstrukcje'),
+        ('F', 'Chemia i Biotechnologia'),
+        ('G', 'Biomedyczne'),
+        ('H', 'Automatyka i Robotyka'),
+        ('I', 'Logistyka i Transport'),
+        ('J', 'Sprzedaż'),
+        ('Z', 'Inne')
+    ]
+
+    experience_levels = [
+        ('A', 'Stażysta'),
+        ('B', 'Junior'),
+        ('C', 'Mid'),
+        ('D', 'Senior'),
+        ('E', 'Lead'),
+        ('F', 'Manager'),
+        ('G', 'Inne'),
+    ]
+
+    work_from_home = [
+        ('wfh', 'Praca zdalna'),
+        ('hyb', 'Hybrydowa'),
+        ('off', 'Stacjonarna'),    
+    ]
+    
+    employment_types = [
+        ('B2B', 'Kontrakt B2B'),
+        ('FT', 'Umowa o pracę'),
+        ('MC', 'Umowa zlecenie'),
+        ('CW', 'Umowa o dzieło'),
+        ('INT', 'Staż'),
+    ]
+
     posting_option = models.CharField(max_length=1, choices=posting_options)
     company_name = models.CharField(max_length=255)
     name = models.CharField(max_length=255)
     content = models.TextField()
-    minsalary = models.IntegerField()
+    min_salary = models.IntegerField()
-    maxsalary = models.IntegerField()
+    max_salary = models.IntegerField()
-    requiresalary = models.BooleanField(null=True, default=False)
+    require_salary = models.BooleanField(null=True, default=False)
     webpage = models.CharField(max_length=255)
     localization = models.CharField(max_length=255)
     vat_number = models.CharField(max_length=10)
     created_at = models.DateTimeField(default=timezone.now)
     status = models.CharField(max_length=1, choices=status_choices, default='W')
-    status_paid = models.CharField(max_length=1, choices=paid_status, default='N')
+    status_paid = models.CharField(max_length=1, choices=paid_status, 
-    # category = models.CharField(max_length=255, null=True, blank=True)
+                                   default='N')
+    category = models.CharField(max_length=1, choices=category_choices, 
+                                default='Z')
     expiration_date = models.DateTimeField(null=True, blank=True)
     image = models.CharField(max_length=255, null=True, blank=True)
-    experience_level = models.CharField(max_length=255, null=True, blank=True)
+    experience_level = models.CharField(max_length=255, choices=experience_levels, default='G')
-    employmentType = models.CharField(max_length=255, null=True, blank=True)
+    employment_type = models.CharField(max_length=3, choices=employment_types, default='FT')
-    workFromHome = models.CharField(max_length=255)
+    work_from_home = models.CharField(max_length=3, choices=work_from_home, default='off')
     updated_at = models.DateTimeField(auto_now=True)
-    # skillLevels = models.ManyToManyField('SkillLevels', blank=True)
+    skill_levels = models.JSONField(null=True, blank=True, default=list)
     anonymous_user_data = models.ForeignKey(AnonymousUserData,
                                              null=True,
                                              blank=True,
@@ -65,25 +109,13 @@ class JobListing(models.Model):
     def __str__(self):
         return f"{self.name} at {self.company_name}"
 
+
 class Skill(models.Model):
     skill_name = models.CharField(max_length=255)
     
     def __str__(self):
         return f"{self.skill_name}"
 
-class SkillLevels(models.Model):
-
-    proficiency_choices = [
-        ('N', 'Nice to have'),
-        ('B', 'Podstawowy'),
-        ('M', 'Średnio zaawansowany'),
-        ('A', 'Zaawansowany'),
-        ('E', 'Ekspert'),
-    ]
-
-    skill_id = models.ForeignKey(Skill, on_delete=models.CASCADE)
-    skill_level = models.CharField(max_length=1, choices=proficiency_choices,)
-    jobposting_id = models.ForeignKey(JobListing, on_delete=models.CASCADE)
 
 class CompanyLogo(models.Model):
     company_logo = models.ImageField(upload_to=rename_file)

jobposting/serializers.py

@@ -1,48 +1,61 @@
 from rest_framework import serializers
-from jobposting.models import JobListing, SkillLevels, CompanyLogo, Skill
+from jobposting.models import JobOffer, CompanyLogo, Skill
 from core.models import MyUser, AnonymousUserData
 
+
 class MyUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = MyUser
         fields = ['id', 'email', 'first_name', 'last_name']
 
+
 class AnonymousUserDataSerializer(serializers.ModelSerializer):
     class Meta:
         model = AnonymousUserData
         fields = ['id', 'contact_email', 'first_name', 'last_name']
 
 
-class SkillLevelsSerializer(serializers.ModelSerializer):
+class JobOfferSerializer(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)
     anonymous_user_data = AnonymousUserDataSerializer(read_only=True)
 
     class Meta:
-        model = JobListing
+        model = JobOffer
         fields = [
             'id', 'posting_option',
-            'company_name', 'name', 'content', 'minsalary', 'maxsalary',
+            'company_name', 'name', 'content', 'min_salary', 'max_salary',
-            'localization', 'created_by', 'created_at', 'status', 'status_paid', 
+            'localization', 'created_by', 'created_at', 'status', 
-            'expiration_date', 'experience_level', 'employmentType', 'workFromHome',
+            'status_paid', 'expiration_date', 'experience_level', 
-            'updated_at',  'contact_email', 'first_name', 'last_name', 'anonymous_user_data' 
+            'employment_type', 'work_from_home', 'updated_at', 'skill_levels',
+            'contact_email', 'first_name', 'last_name', 'anonymous_user_data',
+            'category', 'webpage', 'image', 'require_salary', 'vat_number'
         ]
 
+
 class CompanyLogoSerializer(serializers.ModelSerializer):
     class Meta:
         model = CompanyLogo
         fields = ['id', 'company_name','company_logo']
 
+
 class SkillSerializer(serializers.ModelSerializer):
     class Meta:
         model = Skill
         fields = ['id', 'skill_name']
+
+class SlimJobOffersSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = JobOffer
+        fields = ['id', 'company_name', 'name', 'min_salary', 'max_salary',
+                   'localization', 'image', 'posting_option', 'category',
+                   'require_salary' ]
+        
+class MainJobOfferSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = JobOffer
+        fields = [
+            'id', 'company_name', 'name', 'content', 
+            'localization', 'expiration_date', 'experience_level', 
+            'employment_type', 'work_from_home', 'skill_levels',
+            'contact_email', 'category', 'webpage',  
+        ]

jobposting/urls.py

@@ -5,14 +5,20 @@ from jobposting import views
 
 router = DefaultRouter()
 router.register(r'users', views.MyUserViewSet)
-router.register(r'joblistings', views.JobListingViewSet)
+router.register(r'joblistings', views.JobOfferViewSet)
-router.register(r'skilllevels', views.SkillLevelsViewSet)
 router.register(r'companylogo', views.CompanyLogoViewSet)
 router.register(r'skills', views.SkillViewset)
 
+app_name = 'jobposting'
 
-# Twoje urlpatterns
 urlpatterns = [
-    # ...
+     path('', include(router.urls)), # test only
-    path('', include(router.urls)),
+     path('skill/', views.SkillMainView.as_view(), name='skill-list'),
+     path('skill/<int:pk>', views.SkillMainView.as_view(), name='skill-list'),
+     path('joboffers/<int:pk>/', views.JobOfferDetailView.as_view(), 
+          name='joboffer-detail'),
+     path('joboffers/', views.JobOfferCreateView.as_view(), 
+          name='joboffer-create'),
+     path('joboffers_list/', views.JobOfferListView.as_view(),
+         name='joboffer-list'),
     ]

jobposting/views.py

@@ -1,37 +1,47 @@
-from rest_framework import viewsets, permissions
+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 JobOffer, CompanyLogo, Skill
 from core.models import MyUser, AnonymousUserData
 from rest_framework import status
-from jobposting.permissions import ClientCredentialPermission
+
 from oauth2_provider.contrib.rest_framework import TokenHasReadWriteScope, OAuth2Authentication
 from .auth import OAuth2ClientCredentialAuthentication
+from rest_framework.views import APIView
 
+from django.conf import settings
+
+from django.db.models import Q
 
 from jobposting.serializers import (
-    JobListingSerializer,
+    JobOfferSerializer,
-    SkillLevelsSerializer,
     MyUserSerializer,
     CompanyLogoSerializer,
-    SkillSerializer
+    SkillSerializer,
+    SlimJobOffersSerializer,
+    MainJobOfferSerializer
 )
 
+
 class MyUserViewSet(viewsets.ModelViewSet):
-    authentication_classes = [OAuth2Authentication]
+    # authentication_classes = [OAuth2Authentication, authentication.SessionAuthentication]
-    permission_classes = [TokenHasReadWriteScope]
+    # permission_classes = [permissions.IsAuthenticated|TokenHasReadWriteScope]
     queryset = MyUser.objects.all()
     serializer_class = MyUserSerializer
     required_scope  = ['main']
-    # permission_classes = [permissions.IsAuthenticated]
+    authentication_classes = []     ### test only - to be changed 
+    permission_classes = []         ### 
+    # # permission_classes = [permissions.IsAuthenticated]
 
-class JobListingViewSet(viewsets.ModelViewSet):
+
-    authentication_classes = [OAuth2Authentication]
+class JobOfferViewSet(viewsets.ModelViewSet):
-    permission_classes = [TokenHasReadWriteScope] # test only
+    # authentication_classes = [OAuth2Authentication, authentication.SessionAuthentication]
-    queryset = JobListing.objects.all()
+    # permission_classes = [permissions.IsAuthenticated|TokenHasReadWriteScope] # test only
-    serializer_class = JobListingSerializer
+    queryset = JobOffer.objects.all()
+    serializer_class = JobOfferSerializer
     required_scope  = ['main']
-
+    authentication_classes = []
-    # permission_classes = [permissions.IsAuthenticatedOrReadOnly]
+    permission_classes = []
+    # # permission_classes = [permissions.IsAuthenticatedOrReadOnly]
     
     def perform_create(self, serializer):
         if self.request.user.is_authenticated:
@@ -51,38 +61,149 @@ class JobListingViewSet(viewsets.ModelViewSet):
 
             serializer.save(anonymous_user_data=anonymous_user_data)
 
-class SkillLevelsViewSet(viewsets.ModelViewSet):
-    authentication_classes = [OAuth2Authentication]
-    permission_classes = [TokenHasReadWriteScope] # test only
-    queryset = SkillLevels.objects.all()
-    serializer_class = SkillLevelsSerializer
-    required_scope  = ['main']
-
-    # 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_classes = [OAuth2Authentication, authentication.SessionAuthentication]
-    permission_classes = [TokenHasReadWriteScope]
+    # permission_classes = [permissions.IsAuthenticated|TokenHasReadWriteScope]
     queryset = CompanyLogo.objects.all()
     serializer_class = CompanyLogoSerializer
     required_scope  = ['main']
+    authentication_classes = []
+    permission_classes = []
+
+
+class JobOfferListView(APIView):
+    authentication_classes = []
+    permission_classes = []
+
+    def get(self, request, format=None):
+        filters = {
+                'min_salary__gte': request.query_params.get('min_salary', None),
+                'max_salary__lte': request.query_params.get('max_salary', None),
+                'localization': request.query_params.get('localization', None),
+                'category': request.query_params.get('category', None),
+                'experience_level': request.query_params.get('experience_level', None),
+                'employment_type': request.query_params.get('employment_type', None),
+                'work_from_home': request.query_params.get('work_from_home', None),
+            }
+
+            # remove None values
+        filters = {k: v for k, v in filters.items() if v is not None}
+
+        job_offers = JobOffer.objects.filter(**filters)  
+        serializer = SlimJobOffersSerializer(job_offers, many=True)
+        return Response(serializer.data)
     
 
 class SkillViewset(viewsets.ModelViewSet):
-    authentication_classes = [OAuth2Authentication]
+    # authentication_classes = [OAuth2Authentication, authentication.SessionAuthentication]
-    permission_classes = [TokenHasReadWriteScope]
+    # permission_classes = [permissions.IsAuthenticated|TokenHasReadWriteScope]
     queryset = Skill.objects.all()
     serializer_class = SkillSerializer
     required_scope  = ['main']
+    authentication_classes = []
+    permission_classes = []
+    
+
+class SkillMainView(APIView):
+    authentication_classes = []
+    permission_classes = []
+
+    def get_object(self, pk):
+        try:
+            return Skill.objects.get(pk=pk)
+        except Skill.DoesNotExist:
+            return Response({'error': 'Not Found'}, status=status.HTTP_404_NOT_FOUND)
+        
+    def get(self, request, pk=None, format=None):
+        if pk:
+            skill = self.get_object(pk)
+            serializer = SkillSerializer(skill)
+        else:
+            skill = Skill.objects.all()
+            serializer = SkillSerializer(skill, many=True)
+        return Response(serializer.data)
+    
+    def post(self, request, format=None):
+        serializer = SkillSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    
+    def put(self, request, pk, format=None):
+        skill = self.get_object(pk)
+        serializer = SkillSerializer(skill, data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    def delete(self, request, pk, format=None):
+        skill = self.get_object(pk)
+        skill.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+    
+
+class JobOfferDetailView(APIView):
+    authentication_classes = []
+    permission_classes = []
+
+    def get_object(self, pk):
+        try:
+            return JobOffer.objects.get(pk=pk)
+        except JobOffer.DoesNotExist:
+            return Response({'error': 'Not Found'}, status=status.HTTP_404_NOT_FOUND)
+
+    def get(self, request, pk, format=None):
+        job_offer = self.get_object(pk)
+        serializer = MainJobOfferSerializer(job_offer,)
+        return Response(serializer.data)
+
+    def put(self, request, pk, format=None):
+        job_offer = self.get_object(pk)
+        serializer = JobOfferSerializer(job_offer, data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    
+    def delete(self, request, pk, format=None):
+        job_listing = self.get_object(pk)
+        job_listing.delete()
+        return Response(status=status.HTTP_204_NO_CONTENT)
+    
+    def patch(self, request, pk, format=None):
+        job_offer = self.get_object(pk)
+        serializer = JobOfferSerializer(job_offer, data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    
+class JobOfferCreateView(APIView):
+    authentication_classes = []
+    permission_classes = []
+
+    def post(self, request, format=None):
+        serializer = JobOfferSerializer(data=request.data)
+        if serializer.is_valid():
+            if request.user.is_authenticated:
+                serializer.save(created_by=request.user)
+            else:
+                # Pobieranie danych z formularza
+                first_name = request.data.get('first_name')
+                last_name = request.data.get('last_name')
+                contact_email = request.data.get('contact_email')
+
+                # Tworzenie rekordu AnonymousUserData
+                anonymous_user_data = AnonymousUserData.objects.create(
+                    first_name=first_name, 
+                    last_name=last_name, 
+                    contact_email=contact_email
+                )
+
+                serializer.save(anonymous_user_data=anonymous_user_data)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+