Merge pull request #3 from PROCOLLAB-github/dev

Dev

Author: yeezy-na-izi

.github/workflows/release-ci.yml

@@ -1,3 +1,4 @@
+
 name: 'Build and Deploy server'
 
 on:
@@ -87,15 +88,15 @@ jobs:
           cache-to: type=gha,mode=max
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
+         
       - name: run on server
         uses: garygrossgarten/github-action-ssh@release
         with:
           host: ${{ secrets.SERVER_HOST }}
           username: ${{ secrets.SERVER_USER }}
           password: ${{ secrets.SERVER_PASSWORD }}
           command: |
-            cd /home/app/procollab-backend &&
+            cd /home/app/procollab-backend
             docker-compose -f docker-compose.prod-ci.yml -p prod pull
 
             rm -f .env &&
@@ -114,6 +115,7 @@ jobs:
             echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
             echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
 
-            echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
+            echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env 
+            
+            docker-compose -f docker-compose.prod-ci.yml -p prod up -d
 
-            docker-compose -f docker-compose.prod-ci.yml -p prod up -d

industries/permissions.py

@@ -0,0 +1,19 @@
+from rest_framework.permissions import BasePermission
+
+from core.constants import SAFE_METHODS
+
+
+class IndustryPermission(BasePermission):
+    """
+    Allows access to update only to staff users.
+    """
+
+    def has_permission(self, request, view) -> bool:
+        if request.method in SAFE_METHODS or request.user and request.user.is_staff:
+            return True
+        return False
+
+    def has_object_permission(self, request, view, obj) -> bool:
+        if request.method in SAFE_METHODS or request.user and request.user.is_staff:
+            return True
+        return False

industries/tests.py

@@ -103,5 +103,6 @@ def _user_create(self):
         user_id = response.data["id"]
         user = CustomUser.objects.get(id=user_id)
         user.is_active = True
+        user.is_staff = True
         user.save()
         return user

industries/views.py

@@ -1,18 +1,17 @@
 from rest_framework import generics
 
+from core.permissions import IsStaffOrReadOnly
 from industries.models import Industry
 from industries.serializers import IndustrySerializer
 
 
 class IndustryList(generics.ListCreateAPIView):
     queryset = Industry.objects.all()
     serializer_class = IndustrySerializer
-    # TODO check permissions using JWT
-    # permission_classes = [permissions.IsAuthenticatedOrReadOnly]
+    permission_classes = [IsStaffOrReadOnly]
 
 
 class IndustryDetail(generics.RetrieveUpdateDestroyAPIView):
     queryset = Industry.objects.all()
     serializer_class = IndustrySerializer
-    # TODO check permissions using JWT
-    # permission_classes = [permissions.IsAuthenticatedOrReadOnly]
+    permission_classes = [IsStaffOrReadOnly]

metrics/__init__.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class MetricsConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "metrics"
+    verbose_name = "Метрики"

metrics/admin.py

@@ -0,0 +1,10 @@
+from django.urls import path
+
+
+from metrics.views import MetricsView
+
+app_name = "metrics"
+
+urlpatterns = [
+    path("", MetricsView.as_view()),
+]