Упрощены workflow CI/CD, обновлён PR template и удалена интеграция ClickUp

Toksi86 · Toksi86 · commit 957c6c5c2b55 · 2026-03-27T12:58:44.000+05:00
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,18 +1,20 @@
-# Краткое название
+# Что изменено
 
-## Описание изменений
+Кратко опишите изменения и при необходимости приложите ссылку на задачу.
 
-_Опишите изменения, которые вы внесли в код. Не забывайте указывать номер задачи или ссылку на тикет._
+## Проверка
 
+Укажите, как проверялись изменения.
 
-## Тестирование
+- автоматические проверки
+- ручная проверка
+- шаги для воспроизведения
+- ожидаемый результат
 
-_Опишите, как тестировали свои изменения. Например, какие тесты проходят, а какие нет._
+## Риски и ограничения
 
-## Проверка кода
+Укажите важные ограничения и возможные побочные эффекты.
 
-_Опишите, как проверить ваш код._
-
-## Дополнительная информация
-
-_Здесь вы можете добавить какую-либо дополнительную информацию о своих изменениях._
+- миграции, изменения переменных окружения, feature flags
+- замечания по деплою
+- места, которые требуют повышенного внимания
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,12 +1,32 @@
-name: Django CI
+name: CI
 
 on:
   push:
     branches:
-      - '**'
+      - "**"
 
 jobs:
-  django-test:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+
+      - name: Install lint dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8
+
+      - name: Run flake8
+        run: flake8 $(git ls-files '*.py')
+
+  test:
+    name: Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -45,4 +65,4 @@ jobs:
         env:
           DEBUG: True
           DJANGO_SETTINGS_MODULE: procollab.settings
-          PYTHONUNBUFFERED: 1
+          PYTHONUNBUFFERED: 1
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -1,4 +1,4 @@
-name: 'Deploy dev server'
+name: Deploy Dev
 
 on:
   push:
@@ -8,9 +8,10 @@ on:
 
 jobs:
   deploy:
+      name: Deploy
       runs-on: ubuntu-latest
       steps:
-        - name: run on server
+        - name: Deploy to server
           uses: garygrossgarten/github-action-ssh@release
           with:
             host: ${{ secrets.DEV_SERVER_HOST }}
@@ -41,9 +42,6 @@ jobs:
               echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
               echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
               
-              echo "CLICKUP_API_TOKEN=${{ secrets.CLICKUP_API_TOKEN }}" >> .env &&
-              echo "CLICKUP_SPACE_ID=${{ secrets.CLICKUP_SPACE_ID }}" >> .env &&
-              
               echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
 
               echo "UNISENDER_GO_API_KEY=${{ secrets.UNISENDER_GO_API_KEY }}" >> .env &&
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
diff --git a/.github/workflows/new_deploy.yml b/.github/workflows/new_deploy.yml
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -1,4 +1,4 @@
-name: 'Build and Deploy server'
+name: Release Prod
 
 on:
   release:
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    name: 'Test before deploy'
+    name: Tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -46,7 +46,7 @@ jobs:
           DEBUG: True
 
   build:
-    name: 'Build & Publish'
+    name: Build Image
     runs-on: ubuntu-latest
     needs: [ test ]
     steps:
@@ -86,11 +86,12 @@ jobs:
           cache-to: type=gha,mode=max
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-  run:
+  deploy:
+      name: Deploy
       runs-on: ubuntu-latest
       needs: [ build ]
       steps:
-        - name: run on server
+        - name: Deploy to server
           uses: garygrossgarten/github-action-ssh@release
           with:
             host: ${{ secrets.SERVER_HOST }}
@@ -122,9 +123,6 @@ jobs:
               echo "SELECTEL_CONTAINER_PASSWORD=${{ secrets.SELECTEL_CONTAINER_PASSWORD }}" >> .env &&
               echo "SELECTEL_CONTAINER_USERNAME=${{ secrets.SELECTEL_CONTAINER_USERNAME }}" >> .env &&
               
-              echo "CLICKUP_API_TOKEN=${{ secrets.CLICKUP_API_TOKEN }}" >> .env &&
-              echo "CLICKUP_SPACE_ID=${{ secrets.CLICKUP_SPACE_ID }}" >> .env &&
-              
               echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
 
               echo "UNISENDER_GO_API_KEY=${{ secrets.UNISENDER_GO_API_KEY }}" >> .env &&
diff --git a/partner_programs/views.py b/partner_programs/views.py
@@ -301,7 +301,7 @@ def post(self, request, *args, **kwargs):
                 "birthday": date_to_iso(data.get("birthday", "01-01-1900")),
                 "is_active": True,  # bypass email verification
                 "onboarding_stage": None,  # bypass onboarding
-                "verification_date": timezone.now(),  # bypass ClickUp verification
+                "verification_date": timezone.now(),  # bypass manual verification
                 **{field_name: data.get(field_name, "") for field_name in user_fields},
             },
         )
diff --git a/users/services/verification.py b/users/services/verification.py
diff --git a/users/views.py b/users/views.py
@@ -46,7 +46,6 @@
     VERBOSE_ROLE_TYPES,
     VERBOSE_USER_TYPES,
     VERIFY_EMAIL_REDIRECT_URL,
-    OnboardingStage,
 )
 from users.helpers import check_related_fields_update, force_verify_user, verify_email
 from users.models import LikesOnProject, UserAchievement, UserSkillConfirmation
@@ -76,7 +75,6 @@
 from .pagination import UsersPagination
 from .schema import SKILL_PK_PARAM, USER_PK_PARAM
 from .services.cv_data_prepare import UserCVDataPreparerV2
-from .services.verification import VerificationTasks
 from .tasks import send_mail_cv
 
 User = get_user_model()
@@ -493,13 +491,6 @@ def put(self, request: Request, pk):
                     status=status.HTTP_400_BAD_REQUEST,
                     data={"error": "Wrong onboarding stage number!"},
                 )
-            # if the user was on the last stage and passed it
-            if (
-                request.user.onboarding_stage == OnboardingStage.account_type.value
-                and new_stage == OnboardingStage.completed.value
-            ):
-                VerificationTasks.create(request.user)
-
             request.user.onboarding_stage = new_stage
             request.user.save()
 

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ def post(self, request, args, *kwargs):`
`301`	`301`	`"birthday": date_to_iso(data.get("birthday", "01-01-1900")),`
`302`	`302`	`"is_active": True, # bypass email verification`
`303`	`303`	`"onboarding_stage": None, # bypass onboarding`
`304`		`- "verification_date": timezone.now(), # bypass ClickUp verification`
	`304`	`+ "verification_date": timezone.now(), # bypass manual verification`
`305`	`305`	`**{field_name: data.get(field_name, "") for field_name in user_fields},`
`306`	`306`	`},`
`307`	`307`	`)`