Merge pull request #184 from PROCOLLAB-github/dev

Dev

Author: yakser

.github/workflows/dev-ci.yml

@@ -0,0 +1,48 @@
+name: 'Deploy dev server'
+
+on:
+  push:
+    branches: 
+      - dev
+
+jobs:
+  deploy:
+      runs-on: ubuntu-latest
+      steps:
+        - name: run on server
+          uses: garygrossgarten/github-action-ssh@release
+          with:
+            host: ${{ secrets.DEV_SERVER_HOST }}
+            username: ${{ secrets.DEV_SERVER_USER }}
+            password: ${{ secrets.DEV_SERVER_PASSWORD }}
+            command: |
+              cd /root/api &&
+              git checkout dev &&
+              git 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 "CLICKUP_API_TOKEN=${{ secrets.CLICKUP_API_TOKEN }}" >> .env &&
+              echo "CLICKUP_SPACE_ID=${{ secrets.CLICKUP_SPACE_ID }}" >> .env &&
+              
+              echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
+              
+              docker-compose -f docker-compose.dev-ci.yml up -d --build --force-recreate

docker-compose.dev-ci.yml

@@ -0,0 +1,19 @@
+version: "3.4"
+services:
+  server:
+    ports:
+      - "8000:8000"
+    build:
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - .env
+    restart: always
+    networks:
+      template-network:
+
+networks:
+  template-network:
+
+volumes:
+  db-volume:

procollab/settings.py

@@ -31,6 +31,7 @@
     "https://procollab.ru",
     "https://www.procollab.ru",
     "https://app.procollab.ru",
+    "https://dev.procollab.ru"
 ]
 
 ALLOWED_HOSTS = [
@@ -41,6 +42,7 @@
     "api.procollab.ru",
     "app.procollab.ru",
     "procollab.ru",
+    "dev.procollab.ru"
 ]
 
 PASSWORD_HASHERS = [

projects/models.py

@@ -73,22 +73,6 @@ def get_short_description(self) -> Optional[str]:
     def get_collaborators_user_list(self) -> list[User]:
         return [collaborator.user for collaborator in self.collaborator_set.all()]
 
-    def save(
-        self, force_insert=False, force_update=False, using=None, update_fields=None
-    ):
-        # if every field is filled, set draft to false
-        if (
-            self.name
-            and self.description
-            and self.region
-            and (self.step is not None)
-            and self.industry
-            and self.presentation_address
-            and self.image_address
-        ):
-            self.draft = False
-        super().save(force_insert, force_update, using, update_fields)
-
     def __str__(self):
         return f"Project<{self.id}> - {self.name}"