From 00a7675ff3cafe6af6fdf94ebd8405ba7a7324ee Mon Sep 17 00:00:00 2001 From: Baja-KS Date: Fri, 9 Aug 2024 23:11:42 +0200 Subject: [PATCH 1/4] add deploy --- .github/workflows/merge.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index eb17c08..e82d0d4 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -25,6 +25,7 @@ jobs: name: backend dockerfile: ./backend/Dockerfile image: ghcr.io/${{ github.repository }}-backend + qovery_container_name: pdf-backend runs-on: ubuntu-latest steps: @@ -153,10 +154,10 @@ jobs: --project ${{ vars.PROJECT }} \ --environment $ENVIRONMENT - # qovery service deploy \ - # --organization ${{ vars.ORGANIZATION }} \ - # --project ${{ vars.PROJECT }} \ - # --environment $ENVIRONMENT \ - # --service ${{ matrix.name }} \ - # --tag ${{ env.TAG }} \ - # --watch + qovery container deploy \ + --organization ${{ vars.ORGANIZATION }} \ + --project ${{ vars.PROJECT }} \ + --environment $ENVIRONMENT \ + --container ${{ matrix.qovery_container_name }} \ + --tag ${{ env.TAG }} \ + --watch From f8df30c7528c3649da5d851ef8c21316b1096a52 Mon Sep 17 00:00:00 2001 From: Baja-KS Date: Fri, 9 Aug 2024 23:16:18 +0200 Subject: [PATCH 2/4] add deploy --- .github/workflows/merge.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index e82d0d4..2867974 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -149,15 +149,15 @@ jobs: # Download and install Qovery CLI curl -s https://get.qovery.com | bash - qovery application list \ + qovery container list \ --organization ${{ vars.ORGANIZATION }} \ --project ${{ vars.PROJECT }} \ --environment $ENVIRONMENT - qovery container deploy \ - --organization ${{ vars.ORGANIZATION }} \ - --project ${{ vars.PROJECT }} \ - --environment $ENVIRONMENT \ - --container ${{ matrix.qovery_container_name }} \ - --tag ${{ env.TAG }} \ - --watch + # qovery container deploy \ + # --organization ${{ vars.ORGANIZATION }} \ + # --project ${{ vars.PROJECT }} \ + # --environment $ENVIRONMENT \ + # --container ${{ matrix.qovery_container_name }} \ + # --tag ${{ env.TAG }} \ + # --watch From e879b577b99a0e4942f6d92c6fb8612eba95f690 Mon Sep 17 00:00:00 2001 From: Baja-KS Date: Fri, 9 Aug 2024 23:23:50 +0200 Subject: [PATCH 3/4] add container deploy --- .github/workflows/merge.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 2867974..1e4d061 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -25,7 +25,7 @@ jobs: name: backend dockerfile: ./backend/Dockerfile image: ghcr.io/${{ github.repository }}-backend - qovery_container_name: pdf-backend + qovery_container_name: backend runs-on: ubuntu-latest steps: @@ -154,10 +154,10 @@ jobs: --project ${{ vars.PROJECT }} \ --environment $ENVIRONMENT - # qovery container deploy \ - # --organization ${{ vars.ORGANIZATION }} \ - # --project ${{ vars.PROJECT }} \ - # --environment $ENVIRONMENT \ - # --container ${{ matrix.qovery_container_name }} \ - # --tag ${{ env.TAG }} \ - # --watch + qovery container deploy \ + --organization ${{ vars.ORGANIZATION }} \ + --project ${{ vars.PROJECT }} \ + --environment $ENVIRONMENT \ + --container ${{ matrix.qovery_container_name }} \ + --tag ${{ env.TAG }} \ + --watch From 5d5a0553aee038bd97d24fa048e8acd599fac8ed Mon Sep 17 00:00:00 2001 From: teske00 Date: Thu, 15 Aug 2024 13:26:13 +0200 Subject: [PATCH 4/4] Dynamically filter qa type list based on protocol_major --- .../controllers/governance-action-type.js | 59 ++++++++++++++++++- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/backend/src/api/governance-action-type/controllers/governance-action-type.js b/backend/src/api/governance-action-type/controllers/governance-action-type.js index fc2ad1e..a1a5ee0 100644 --- a/backend/src/api/governance-action-type/controllers/governance-action-type.js +++ b/backend/src/api/governance-action-type/controllers/governance-action-type.js @@ -1,9 +1,62 @@ -'use strict'; +// @ts-nocheck +"use strict"; /** * governance-action-type controller */ -const { createCoreController } = require('@strapi/strapi').factories; +const axios = require("axios"); +const { createCoreController } = require("@strapi/strapi").factories; -module.exports = createCoreController('api::governance-action-type.governance-action-type'); +module.exports = createCoreController( + "api::governance-action-type.governance-action-type", + ({ strapi }) => ({ + async find(ctx) { + const sanitizedQueryParams = await this.sanitizeQuery(ctx); + + try { + const { data } = await axios.get( + `${process.env.GOVTOOL_API_BASE_URL}/epoch/params` + ); + + if (data) { + if (!sanitizedQueryParams.filters) { + sanitizedQueryParams.filters = {}; + } + + if (+data?.protocol_major < 9) { + sanitizedQueryParams.filters = { + ...sanitizedQueryParams.filters, + $and: [ + { + gov_action_type_name: { + $ne: "Treasury", + }, + }, + { + gov_action_type_name: { + $ne: "Info", + }, + }, + ], + }; + } + if (+data?.protocol_major === 9) { + sanitizedQueryParams.filters = { + ...sanitizedQueryParams.filters, + gov_action_type_name: { + $ne: "Treasury", + }, + }; + } + } + } catch (error) {} + + const { results, pagination } = await strapi + .service("api::governance-action-type.governance-action-type") + .find(sanitizedQueryParams); + + return this.transformResponse(results, { pagination }); + }, + }) +);