Merging Staging to Prod (Update CI)

.github/workflows/main-pipeline.yml

@@ -55,7 +55,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: givethio
+          POSTGRES_DB: qacc
           PGDATA: /var/lib/postgresql/data/pgdata
         options: >-
           --health-cmd pg_isready
@@ -119,7 +119,8 @@ jobs:
           SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }}
           SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }}
           MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }}
-
+          PRIVADO_VERIFIER_NETWORK_ID: ${{ secrets.PRIVADO_VERIFIER_NETWORK_ID }}
+
   publish:
     needs: test
     runs-on: ubuntu-latest

.github/workflows/staging-deploy-only.yml

@@ -0,0 +1,23 @@
+name: staging-deploy-only
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH and Redeploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.STAGING_HOST }}
+          username: ${{ secrets.STAGING_USERNAME }}
+          key: ${{ secrets.STAGING_PRIVATE_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            cd QAcc-BE
+            git checkout staging
+            git pull
+            docker compose -f docker-compose-staging.yml pull
+            docker compose -f docker-compose-staging.yml up --force-recreate -d
+            docker image prune -a --force

.github/workflows/staging-inverter-sync.yml

@@ -0,0 +1,23 @@
+name: Run Inverter Sync Script
+
+on:
+  schedule:
+    - cron: '0 0 * * 1' # Runs at midnight every Monday
+  workflow_dispatch: # This allows manual triggering
+
+jobs:
+  run-script:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: SSH into Server and Run Inverter Sync Script
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.STAGING_HOST }}
+          username: ${{ secrets.STAGING_USERNAME }}
+          key: ${{ secrets.STAGING_PRIVATE_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            cd QAcc-BE
+            docker compose -f docker-compose-staging.yml exec qacc-be npm run sync:inverter:production
+            docker compose -f docker-compose-staging.yml logs qacc-be

.github/workflows/staging-pipeline.yml

@@ -55,7 +55,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: givethio
+          POSTGRES_DB: qacc
           PGDATA: /var/lib/postgresql/data/pgdata
         options: >-
           --health-cmd pg_isready
@@ -119,6 +119,7 @@ jobs:
           SOLANA_DEVNET_NODE_RPC_URL: ${{ secrets.SOLANA_DEVNET_NODE_RPC_URL }}
           SOLANA_MAINNET_NODE_RPC_URL: ${{ secrets.SOLANA_MAINNET_NODE_RPC_URL }}
           MPETH_GRAPHQL_PRICES_URL: ${{ secrets.MPETH_GRAPHQL_PRICES_URL }}
+          PRIVADO_VERIFIER_NETWORK_ID: ${{ secrets.PRIVADO_VERIFIER_NETWORK_ID }}
 
   publish:
     needs: test
@@ -161,4 +162,4 @@ jobs:
             git pull
             docker compose -f docker-compose-staging.yml pull
             docker compose -f docker-compose-staging.yml up -d
-            docker image prune -a --force
+            docker image prune -a --force

Caddyfile

@@ -1,10 +1,3 @@
 {$MY_URL} {
-    route {
-        @allowed {
-            path /*
-            remote_ip {$IP_WHITELIST}
-        }
-        reverse_proxy @allowed qacc-be:4000
-        respond 403
-    }
+    reverse_proxy qacc-be:4000
 }

README.md

@@ -1,6 +1,5 @@
 # Impact Graph
 
-
 ---
 
 ### Build status
@@ -42,12 +41,12 @@ Edit the config/development.env file in your favorite code editor and the enviro
 
 [Create a database](https://medium.com/coding-blocks/creating-user-database-and-adding-access-on-postgresql-8bfcd2f4a91e) (we recommend Postgres) on your computer or server, we currently support for MySQL, MariaDB, Postgres, MongoDB and SQLite.
 Or if you want, you can run the docker-compose like this:
-`docker-compose -f docker-compose-local-postgres-redis.yml up -d`
+`docker-compose -f docker-compose-local.yml --profile database up -d`
 and put these to your `development.env`
 
 ```
 TYPEORM_DATABASE_TYPE=postgres
-TYPEORM_DATABASE_NAME=givethio
+TYPEORM_DATABASE_NAME=qacc
 TYPEORM_DATABASE_USER=postgres
 TYPEORM_DATABASE_PASSWORD=postgres
 TYPEORM_DATABASE_HOST=localhost

config/example.env

@@ -271,3 +271,21 @@ ZKEVM_MAINNET_NODE_HTTP_URL=
 ZKEVM_CARDONA_NODE_HTTP_URL=
 
 ENDAOMENT_ADMIN_WALLET_ADDRESS=0xfE3524e04E4e564F9935D34bB5e80c5CaB07F5b4
+
+ABC_LAUNCH_DB_CONNECTION_URL=
+
+QACC_NETWORK_ID=
+QACC_DONATION_TOKEN_ADDRESS=
+QACC_DONATION_TOKEN_SYMBOL=
+QACC_DONATION_TOKEN_NAME=
+QACC_DONATION_TOKEN_DECIMALS=
+QACC_EARLY_ACCESS_ROUND_FINISH_TIMESTAMP=
+ABC_LAUNCHER_ADAPTER=
+
+QACC_FETCH_ROUND_TOKEN_PRICE_CRONJOB_EXPRESSION
+
+PRIVADO_VERIFIER_NETWORK_ID=
+PRIVADO_VERIFIER_CONTRACT_ADDRESS=
+PRIVADO_REQUEST_ID=
+
+INVERTER_GRAPHQL_ENDPOINT=

config/test.env

@@ -3,7 +3,7 @@ MAILER_JWT_SECRET=00000000000000000000000000000000000000000000000000000000000000
 JWT_MAX_AGE=7d
 
 TYPEORM_DATABASE_TYPE=postgres
-TYPEORM_DATABASE_NAME=givethio
+TYPEORM_DATABASE_NAME=qacc
 TYPEORM_DATABASE_USER=postgres
 TYPEORM_DATABASE_PASSWORD=postgres
 TYPEORM_DATABASE_HOST=localhost
@@ -40,7 +40,7 @@ ETHERSCAN_ROPSTEN_API_URL=https://api-ropsten.etherscan.io/api
 ETHERSCAN_GOERLI_API_URL=https://api-goerli.etherscan.io/api
 POLYGON_SCAN_API_URL=https://api.polygonscan.com/api
 OPTIMISTIC_SCAN_API_URL=https://api-optimistic.etherscan.io/api
-OPTIMISTIC_SEPOLIA_SCAN_API_URL=https://api-sepolia-optimistic.etherscan.io/api
+OPTIMISTIC_SEPOLIA_SCAN_API_URL=https://sepolia.optimism.io/
 CELO_SCAN_API_URL=https://api.celoscan.io/api
 CELO_ALFAJORES_SCAN_API_URL=https://api-alfajores.celoscan.io/api
 ARBITRUM_SCAN_API_URL=https://api.arbiscan.io/api
@@ -220,3 +220,14 @@ ZKEVM_MAINNET_NODE_HTTP_URL=https://polygon-zkevm.drpc.org
 ZKEVM_CARDONA_NODE_HTTP_URL=https://rpc.cardona.zkevm-rpc.com
 
 ENDAOMENT_ADMIN_WALLET_ADDRESS=0xfE3524e04E4e564F9935D34bB5e80c5CaB07F5b4
+
+ABC_LAUNCH_API_SECRET=
+ABC_LAUNCH_API_URL=
+ABC_LAUNCH_DATA_SOURCE=
+
+PRIVADO_REQUEST_ID=111
+PRIVADO_VERIFIER_NETWORK_ID=2442
+
+INVERTER_GRAPHQL_ENDPOINT=https://indexer.bigdevenergy.link/a414bf3/v1/graphql
+
+QACC_NETWORK_ID=11155420

docker-compose-local.yml

@@ -2,6 +2,8 @@ services:
   qacc-be:
     container_name: qacc-be
     build: .
+    profiles:
+      - server
     command: npm run start:docker:locally
     environment:
       - ENVIRONMENT=local
@@ -11,12 +13,18 @@ services:
       - ./config:/usr/src/app/config
       - ./config:/usr/src/app/build/config
       - ./logs:/usr/src/app/logs
+    networks:
+      - qacc
     ports:
-      - "4001:4000"
+      - '4001:4000'
 
   qacc-postgres:
     container_name: qacc-postgres
     image: postgres:16
+    profiles:
+      - server
+      - database
+      - local
     restart: always
     environment:
       - POSTGRES_DB=qacc
@@ -25,20 +33,52 @@ services:
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes:
       - db-data:/var/lib/postgresql/data
+    networks:
+      - qacc
     ports:
-      - "5432:5432"
+      - '5442:5432'
+
+  qacc-postgres-test:
+    container_name: qacc-postgres-test
+    image: postgres:16
+    profiles:
+      - test
+      - database
+    restart: always
+    environment:
+      - POSTGRES_DB=qacc
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - PGDATA=/var/lib/postgresql/data/pgdata
+    volumes:
+      - db-data-test:/var/lib/postgresql/data
+    networks:
+      - qacc
+    ports:
+      - '5443:5432'
 
   qacc-redis:
     container_name: qacc-redis
     image: redis:7-alpine
+    profiles:
+      - server
+      - local
     environment:
       - REDIS_ALLOW_EMPTY_PASSWORD=yes
     restart: always
     volumes:
       - redis-data:/data
+    networks:
+      - qacc
     ports:
-      - "6379:6379"
+      - '6379:6379'
 
 volumes:
   db-data:
-  redis-data:
+  db-data-test:
+  redis-data:
+
+networks:
+  qacc:
+    name: qacc-be
+    external: true

docker-compose-production.yml

@@ -54,4 +54,6 @@ volumes:
   caddy_data:
 
 networks:
-  qacc:
+  qacc:
+    name: qacc-be_qacc
+    external: true

docker-compose-staging.yml

@@ -54,4 +54,6 @@ volumes:
   caddy_data:
 
 networks:
-  qacc:
+  qacc:
+    name: qacc-be_qacc
+    external: true

migration/1717646612482-ProjectActualMatchingView_V16.ts

@@ -180,5 +180,11 @@ export class ProjectActualMatchingViewV161717646612482
     `);
   }
 
-  public async down(_queryRunner: QueryRunner): Promise<void> {}
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `
+            DROP MATERIALIZED VIEW project_actual_matching_view;
+          `,
+    );
+  }
 }

migration/1724143752405-EmailVerification.ts

@@ -0,0 +1,45 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class EmailVerification1724143752405 implements MigrationInterface {
+  name = 'EmailVerification1724143752405';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "user_email_verification" ("id" SERIAL NOT NULL, "userId" integer NOT NULL, "emailVerificationCode" text, "emailVerificationCodeExpiredAt" TIMESTAMP WITH TIME ZONE, CONSTRAINT "PK_8ad3e54beb79f46d33950e9d487" PRIMARY KEY ("id"))`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "emailConfirmed" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "emailConfirmationSent" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "emailConfirmationSentAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "emailConfirmedAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "project" ADD "teaser" character varying`,
+    );
+    await queryRunner.query(`ALTER TABLE "project" ADD "teamMembers" jsonb`);
+    await queryRunner.query(`ALTER TABLE "project" ADD "abc" jsonb`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "abc"`);
+    await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "teamMembers"`);
+    await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "teaser"`);
+    await queryRunner.query(
+      `ALTER TABLE "user" DROP COLUMN "emailConfirmedAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" DROP COLUMN "emailConfirmationSentAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" DROP COLUMN "emailConfirmationSent"`,
+    );
+    await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "emailConfirmed"`);
+    await queryRunner.query(`DROP TABLE "user_email_verification"`);
+  }
+}

migration/1724231548035-ProjectIcon.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ProjectIcon1724231548035 implements MigrationInterface {
+  name = 'ProjectIcon1724231548035';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "project" ADD "icon" character varying`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "project_update" ADD "icon" character varying`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "project_update" DROP COLUMN "icon"`);
+    await queryRunner.query(`ALTER TABLE "project" DROP COLUMN "icon"`);
+  }
+}