Merge branch 'dev'

Author: yakser

.env.example

@@ -12,4 +12,9 @@ DATABASE_NAME=
 DATABASE_USER=
 DATABASE_PASSWORD=
 DATABASE_HOST=
-DATABASE_PORT=
+DATABASE_PORT=
+
+SELECTEL_ACCOUNT_ID=
+SELECTEL_CONTAINER_NAME=
+SELECTEL_CONTAINER_PASSWORD=
+SELECTEL_CONTAINER_USERNAME=

.github/workflows/lints.yml

@@ -26,4 +26,4 @@ jobs:
         pip install flake8
     - name: Analysing the code with flake8
       run: |
-        flake8 $(git ls-files '*.py')
+        flake8 $(git ls-files '*.py')

.github/workflows/release-ci.yml

@@ -88,37 +88,43 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-  deploy:
-    runs-on: ubuntu-latest
-    needs: [ build ]
-    steps:
-      - 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
-            docker-compose -f docker-compose.prod-ci.yml -p prod pull
-
-            rm -f .env &&
-            touch .env &&
-
-            echo "DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }}" >> .env &&
-
-            echo "DATABASE_NAME=${{ secrets.DATABASE_NAME }}" >> .env &&
-            echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env &&
-            echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env &&
-            echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env &&
-            echo "DATABASE_PORT=${{ secrets.DATABASE_PORT }}" >> .env &&
-
-            echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
-            echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
-            echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
-            echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
-
-            echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env 
-
-            docker-compose -f docker-compose.prod-ci.yml -p prod up -d
+    run:
+      runs-on: ubuntu-latest
+      needs: [ build ]
+      steps:
+        - 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
+              docker-compose -f docker-compose.prod-ci.yml -p prod pull
+              
+              rm -f .env &&
+              touch .env &&
+              
+              echo "DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }}" >> .env &&
+              
+              echo "DATABASE_NAME=${{ secrets.DATABASE_NAME }}" >> .env &&
+              echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env &&
+              echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env &&
+              echo "DATABASE_HOST=${{ secrets.DATABASE_HOST }}" >> .env &&
+              echo "DATABASE_PORT=${{ secrets.DATABASE_PORT }}" >> .env &&
+              
+              echo "EMAIL_USER=${{ secrets.EMAIL_USER }}" >> .env &&
+              echo "EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}" >> .env &&
+              echo "EMAIL_HOST=${{ secrets.EMAIL_HOST }}" >> .env &&
+              echo "EMAIL_PORT=${{ secrets.EMAIL_PORT }}" >> .env &&
+
+              echo "SELECTEL_ACCOUNT_ID=${{ secrets.SELECTEL_ACCOUNT_ID }}" >> .env &&
+              echo "SELECTEL_CONTAINER_NAME=${{ secrets.SELECTEL_CONTAINER_NAME }}" >> .env &&
+              echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
+              echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
+
+              
+              echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env 
+              
+              docker-compose -f docker-compose.prod-ci.yml -p prod up -d
 

.gitignore

@@ -135,4 +135,5 @@ dmypy.json
 
 cache
 
-static
+static
+staticfiles

README.md

@@ -4,7 +4,7 @@
 
 ### Clone project
 
-📌 `git clone https://github.com/Yakser/procollab-backend.git`
+📌 `git clone https://github.com/procollab-github/api.git`
 
 ### Create virtual environment
 
@@ -31,4 +31,10 @@ To install pre-commit simply run inside the shell:
 
 ```bash
 pre-commit install
-```
+```
+
+To run it on all of your files, do
+
+```bash
+pre-commit run --all-files
+```

core/permissions.py

@@ -12,29 +12,6 @@ def has_permission(self, request, view) -> bool:
         return False
 
 
-class IsProjectLeaderForVacancyResponse(BasePermission):
-    def has_object_permission(self, request, view, obj):
-        if obj.vacancy.project.leader == request.user:
-            return True
-        return False
-
-
-class IsProjectLeaderOrReadOnly(BasePermission):
-    """
-    Allows access to update only to project leader.
-    """
-
-    def has_permission(self, request, view) -> bool:
-        if request.method in SAFE_METHODS or (request.user and request.user.id):
-            return True
-        return False
-
-    def has_object_permission(self, request, view, obj):
-        if request.method in SAFE_METHODS or (obj.leader == request.user):
-            return True
-        return False
-
-
 class IsOwnerOrReadOnly(BasePermission):
     """
     Allows access to update only to himself.

files/__init__.py

@@ -0,0 +1,13 @@
+from django.contrib import admin
+
+from files.models import UserFile
+
+
+@admin.register(UserFile)
+class UserFileAdmin(admin.ModelAdmin):
+    list_display = (
+        "link",
+        "user",
+        "datetime_uploaded",
+    )
+    list_display_links = ("link",)

files/admin.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class FilesConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "files"

files/apps.py

@@ -0,0 +1,2 @@
+class SelectelUploadError(Exception):
+    pass