From 8eaf6c328fb90e54db613e47ac50fa54569c1881 Mon Sep 17 00:00:00 2001 From: ashwin1111 Date: Wed, 29 Nov 2023 11:28:46 +0530 Subject: [PATCH 1/3] Make direct export for QBO GA --- .../migrations/0003_auto_20231129_0557.py | 18 ++++++++++++++++++ apps/integrations/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 apps/integrations/migrations/0003_auto_20231129_0557.py diff --git a/apps/integrations/migrations/0003_auto_20231129_0557.py b/apps/integrations/migrations/0003_auto_20231129_0557.py new file mode 100644 index 00000000..fe1c69fa --- /dev/null +++ b/apps/integrations/migrations/0003_auto_20231129_0557.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.14 on 2023-11-29 05:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('integrations', '0002_auto_20230829_1425'), + ] + + operations = [ + migrations.AlterField( + model_name='integration', + name='is_beta', + field=models.BooleanField(default=True, help_text='Is Beta'), + ), + ] diff --git a/apps/integrations/models.py b/apps/integrations/models.py index a77e835e..ce0ae175 100644 --- a/apps/integrations/models.py +++ b/apps/integrations/models.py @@ -10,7 +10,7 @@ class Integration(models.Model): org_id = models.CharField(max_length=255, help_text='Org Id') type = models.CharField(max_length=255, help_text='Type of Integration', choices=INTEGRATION_TYPE) is_active = models.BooleanField(default=False, help_text='Is Integration Active') - is_beta = models.BooleanField(default=False, help_text='Is Beta') + is_beta = models.BooleanField(default=True, help_text='Is Beta') connected_at = models.DateTimeField(auto_now_add=True, help_text='Connected at datetime') disconnected_at = models.DateTimeField(null=True, help_text='Disconnected at datetime') updated_at = models.DateTimeField(auto_now=True, help_text='Updated at datetime') From cb81b291b7edfe30e729bb05f37f53b6a7385a58 Mon Sep 17 00:00:00 2001 From: ashwin1111 Date: Wed, 29 Nov 2023 11:31:39 +0530 Subject: [PATCH 2/3] fix test --- tests/test_integrations/test_views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_integrations/test_views.py b/tests/test_integrations/test_views.py index fd90a81e..8fa732fd 100644 --- a/tests/test_integrations/test_views.py +++ b/tests/test_integrations/test_views.py @@ -34,7 +34,7 @@ def test_integrations_view_post_accounting(api_client, mocker, access_token): assert response['tpa_name'] == post_integration_accounting['tpa_name'] assert response['type'] == post_integration_accounting['type'] assert response['is_active'] == post_integration_accounting['is_active'] - assert response['is_beta'] == False + assert response['is_beta'] == True assert response['disconnected_at'] == None @@ -67,7 +67,7 @@ def test_integrations_view_post(api_client, mocker, access_token): assert response['tpa_name'] == post_integration_accounting['tpa_name'] assert response['type'] == post_integration_accounting['type'] assert response['is_active'] == post_integration_accounting['is_active'] - assert response['is_beta'] == False + assert response['is_beta'] == True assert response['disconnected_at'] == None response = api_client.post(url, post_integration_hrms) From f82aba7ad3fabcb1e0db8d373a44b663524a5a56 Mon Sep 17 00:00:00 2001 From: ashwin1111 Date: Wed, 29 Nov 2023 11:34:57 +0530 Subject: [PATCH 3/3] fix test and remove docker cache --- .github/workflows/codecov.yml | 2 -- .github/workflows/production_deployment.yml | 2 -- .github/workflows/pytest.yml | 2 -- .github/workflows/staging_deployment.yml | 2 -- tests/test_integrations/test_views.py | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 5528592d..a04be254 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -13,8 +13,6 @@ jobs: environment: CI Environment steps: - uses: actions/checkout@v2 - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - name: Bring up Services and Run Tests run: | docker-compose -f docker-compose-pipeline.yml build diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml index 6b146d07..053eace7 100644 --- a/.github/workflows/production_deployment.yml +++ b/.github/workflows/production_deployment.yml @@ -10,8 +10,6 @@ jobs: environment: Production steps: - uses: actions/checkout@v2 - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - name: push to dockerhub uses: fylein/docker-release-action@master env: diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index a04201a3..989eb762 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -10,8 +10,6 @@ jobs: environment: CI Environment steps: - uses: actions/checkout@v2 - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - name: Bring up Services and Run Tests run: | docker-compose -f docker-compose-pipeline.yml build diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml index e396f459..ac9ed2e9 100644 --- a/.github/workflows/staging_deployment.yml +++ b/.github/workflows/staging_deployment.yml @@ -14,8 +14,6 @@ jobs: environment: Staging steps: - uses: actions/checkout@v2 - - uses: satackey/action-docker-layer-caching@v0.0.11 - continue-on-error: true - name: push to dockerhub uses: fylein/docker-release-action@master env: diff --git a/tests/test_integrations/test_views.py b/tests/test_integrations/test_views.py index 8fa732fd..8dd2ed1b 100644 --- a/tests/test_integrations/test_views.py +++ b/tests/test_integrations/test_views.py @@ -80,7 +80,7 @@ def test_integrations_view_post(api_client, mocker, access_token): assert response['tpa_name'] == post_integration_hrms['tpa_name'] assert response['type'] == post_integration_hrms['type'] assert response['is_active'] == post_integration_hrms['is_active'] - assert response['is_beta'] == False + assert response['is_beta'] == True assert response['disconnected_at'] == None