feat: add qbd di flag (#215)

* feat: add qbd di flag * rename docker-compose * fix failing tests * remove qbd di flag from serializer
fylein · Oct 14, 2024 · ce423b0 · ce423b0
1 parent 590dd48
commit ce423b0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -15,9 +15,9 @@ jobs:
       - uses: actions/checkout@v2 
       - name: Bring up Services and Run Tests
         run: |
-          docker-compose -f docker-compose-pipeline.yml build
-          docker-compose -f docker-compose-pipeline.yml up -d
-          docker-compose -f docker-compose-pipeline.yml exec -T api pytest tests/ --cov --cov-report=xml --cov-fail-under=94
+          docker compose -f docker-compose-pipeline.yml build
+          docker compose -f docker-compose-pipeline.yml up -d
+          docker compose -f docker-compose-pipeline.yml exec -T api pytest tests/ --cov --cov-report=xml --cov-fail-under=94
           echo "STATUS=$(cat pytest-coverage.txt | grep 'Required test' | awk '{ print $1 }')" >> $GITHUB_ENV
           echo "FAILED=$(cat test-reports/report.xml | awk -F'=' '{print $5}' | awk -F' ' '{gsub(/"/, "", $1); print $1}')" >> $GITHUB_ENV
       - name: Upload coverage reports to Codecov with GitHub Action

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -12,9 +12,9 @@ jobs:
       - uses: actions/checkout@v2
       - name: Bring up Services and Run Tests
         run: |
-          docker-compose -f docker-compose-pipeline.yml build
-          docker-compose -f docker-compose-pipeline.yml up -d
-          docker-compose -f docker-compose-pipeline.yml exec -T api pytest tests/ --cov --cov-report=xml --junit-xml=test-reports/report.xml --cov-fail-under=60
+          docker compose -f docker-compose-pipeline.yml build
+          docker compose -f docker-compose-pipeline.yml up -d
+          docker compose -f docker-compose-pipeline.yml exec -T api pytest tests/ --cov --cov-report=xml --junit-xml=test-reports/report.xml --cov-fail-under=60
           echo "STATUS=$(cat pytest-coverage.txt | grep 'Required test' | awk '{ print $1 }')" >> $GITHUB_ENV
           echo "FAILED=$(cat test-reports/report.xml | awk -F'=' '{print $5}' | awk -F' ' '{gsub(/"/, "", $1); print $1}')" >> $GITHUB_ENV
       - name: Upload coverage reports to Codecov with GitHub Action

diff --git a/apps/orgs/models.py b/apps/orgs/models.py
@@ -21,8 +21,9 @@ class Org(models.Model):
     allow_travelperk = models.BooleanField(default=True, help_text='Allow Travelperk')
     allow_gusto = models.BooleanField(default=False, help_text='Allow Gusto')
     allow_dynamics = models.BooleanField(default=False, help_text='Allow Dynamics')
+    allow_qbd_direct_integration = models.BooleanField(default=False, help_text='Allow QBD Direct Integration')
     created_at = models.DateTimeField(auto_now_add=True, help_text='Created at datetime')
-    updated_at =  models.DateTimeField(auto_now=True, help_text='Updated at datetime')
+    updated_at = models.DateTimeField(auto_now=True, help_text='Updated at datetime')
 
     class Meta:
         db_table = 'orgs'

diff --git a/tests/test_orgs/fixtures.py b/tests/test_orgs/fixtures.py
@@ -55,6 +55,7 @@
       "allow_travelperk": False,
       "allow_gusto": False,
       "allow_dynamics": False,
+      "allow_qbd_direct_integration": False,
       "user":[
          2
       ]