Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…

…awa-api into venue-CRUD

.github/workflows/pull-request.yml

@@ -28,6 +28,11 @@ jobs:
         with:
           fetch-depth: 2
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/countline.py
@@ -147,6 +152,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+
       - name: Generate Access Token Secret
         run: echo "ACCESS_TOKEN_SECRET=$(openssl rand -hex 32)" >> $GITHUB_ENV
 

.gitignore

@@ -15,6 +15,7 @@ node_modules/**
 
 # Don't upload configuration files
 .env
+.env_test
 
 # Ignore uploads
 image/**

codegen.ts

@@ -30,6 +30,8 @@ const config: CodegenConfig = {
           ActionItemCategory:
             "../models/ActionItemCategory#InterfaceActionItemCategory",
 
+          Advertisement: "../models/Advertisement#InterfaceAdvertisement",
+
           AgendaCategory: "../models/AgendaCategory#InterfaceAgendaCategory",
 
           CheckIn: "../models/CheckIn#InterfaceCheckIn",
@@ -56,6 +58,8 @@ const config: CodegenConfig = {
           Fund: "../models/Fund#InterfaceFund",
           FundraisingCampaign:
             "../models/FundraisingCampaign#InterfaceFundraisingCampaign",
+          FundraisingCampaignPledge:
+            "../models/FundraisingCampaignPledge#InterfaceFundraisingCampaignPledges",
 
           // File: '../models/File#InterfaceFile',
 

package.json

@@ -46,9 +46,9 @@
     "@apollo/server": "^4.10.0",
     "@faker-js/faker": "^8.2.0",
     "@graphql-inspector/cli": "^4.0.3",
-    "@graphql-tools/resolvers-composition": "^7.0.0",
+    "@graphql-tools/resolvers-composition": "^7.0.1",
     "@graphql-tools/schema": "^10.0.0",
-    "@graphql-tools/utils": "^10.0.11",
+    "@graphql-tools/utils": "^10.1.0",
     "@types/graphql-upload": "^16.0.5",
     "@types/yargs": "^17.0.32",
     "axios": "^1.6.7",
@@ -85,9 +85,8 @@
     "nanoid": "^5.0.5",
     "nodemailer": "^6.9.9",
     "pm2": "^5.2.0",
-    "redis": "^4.6.12",
+    "redis": "^4.6.13",
     "rrule": "^2.8.1",
-    "shortid": "^2.2.16",
     "typedoc-plugin-markdown": "^3.17.1",
     "uuid": "^9.0.0",
     "validator": "^13.7.0",
@@ -98,7 +97,7 @@
     "zod-error": "^1.5.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/typescript": "^4.0.4",
     "@graphql-codegen/typescript-resolvers": "^4.0.4",
     "@graphql-eslint/eslint-plugin": "^3.20.1",
@@ -117,7 +116,6 @@
     "@types/morgan": "^1.9.9",
     "@types/node": "^20.11.16",
     "@types/nodemailer": "^6.4.14",
-    "@types/shortid": "^0.0.32",
     "@types/uuid": "^9.0.7",
     "@types/validator": "^13.11.9",
     "@typescript-eslint/eslint-plugin": "^6.21.0",