feature/61-filter-nonprofits

.eslintrc.json

@@ -1,37 +1,40 @@
 {
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "ecmaVersion": 2020,
-      "sourceType": "module"
-    },
-    "plugins": ["@typescript-eslint"],
-    "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended",
-      "prettier"
-    ],
-    "ignorePatterns": [
-      "node_modules/**",
-      "*.config.mts",
-      "prisma/**",
-      "legacy**",
-      "generated/**"
-    ],
-    "rules": {
-      "@typescript-eslint/no-unused-expressions": [
-        "error",
-        { "allowShortCircuit": true, "allowTernary": true, "allowTaggedTemplates": true }
-      ]
-    },
-    "overrides": [
-        {
-            "files": ["tests/**/*.ts", "tests/**/*.js"],
-            "rules": {
-            "@typescript-eslint/no-require-imports": "off",
-            "@typescript-eslint/no-unused-expressions": "off"
-            }
-        }
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module"
+  },
+  "plugins": ["@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ],
+  "ignorePatterns": [
+    "node_modules/**",
+    "*.config.mts",
+    "prisma/**",
+    "legacy**",
+    "generated/**"
+  ],
+  "rules": {
+    "@typescript-eslint/no-unused-expressions": [
+      "error",
+      {
+        "allowShortCircuit": true,
+        "allowTernary": true,
+        "allowTaggedTemplates": true
+      }
     ]
-  }
-
+  },
+  "overrides": [
+    {
+      "files": ["tests/**/*.ts", "tests/**/*.js"],
+      "rules": {
+        "@typescript-eslint/no-require-imports": "off",
+        "@typescript-eslint/no-unused-expressions": "off"
+      }
+    }
+  ]
+}

.github/workflows/ci.yml

@@ -60,4 +60,4 @@ jobs:
 
       - name: Stop test database
         if: always()
-        run: docker compose down -v
+        run: docker compose down -v

.github/workflows/develop_operations-api.yml

@@ -1,49 +1,49 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-
-name: Build and deploy Node.js app to Azure Web App - operations-api
-
-on:
-  push:
-    branches:
-      - develop
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read #This is required for actions/checkout
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node.js version
-        uses: actions/setup-node@v3
-        with:
-          node-version: '24.x'
-
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v4
-        with:
-          name: node-app
-          path: .
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v4
-        with:
-          name: node-app
-      
-      - name: 'Deploy to Azure Web App'
-        id: deploy-to-webapp
-        uses: azure/webapps-deploy@v3
-        with:
-          app-name: 'operations-api'
-          slot-name: 'Production'
-          package: .
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_FD3F1E6E02E34288BF14598390887468 }}
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Node.js app to Azure Web App - operations-api
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js version
+        uses: actions/setup-node@v3
+        with:
+          node-version: '24.x'
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: node-app
+          path: .
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: node-app
+
+      - name: 'Deploy to Azure Web App'
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'operations-api'
+          slot-name: 'Production'
+          package: .
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_FD3F1E6E02E34288BF14598390887468 }}

README.md

@@ -230,8 +230,8 @@ Command to enter in terminal to access tables:
 
 - docker compose exec -T test-db psql -U postgres -d test_db
 - \dt
-- SQL commands such as (SELECT * FROM volunteers;)
+- SQL commands such as (SELECT \* FROM volunteers;)
 
 To pause test, insert this: await new Promise(() => {});
 
-It helps you see when data is created in the local database!
+It helps you see when data is created in the local database!

docker-compose.yml

@@ -7,12 +7,12 @@ services:
       POSTGRES_PASSWORD: test_password
       POSTGRES_DB: test_db
     ports:
-      - "5433:5432"  # Map to port 5433 to avoid conflicts with local PostgreSQL
+      - '5433:5432' # Map to port 5433 to avoid conflicts with local PostgreSQL
     volumes:
       - test-db-data:/var/lib/postgresql/data
-      - ./db-init:/docker-entrypoint-initdb.d  # Initialization scripts
+      - ./db-init:/docker-entrypoint-initdb.d # Initialization scripts
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -d test_db"]
+      test: ['CMD-SHELL', 'pg_isready -U postgres -d test_db']
       interval: 5s
       timeout: 5s
       retries: 5

src/api/graphql/resolvers/nonprofits.resolvers.ts

@@ -6,32 +6,71 @@ import {
   getNonprofitsWithFilters,
   updateNonprofit,
   updateNonprofitSchema,
+  getChapterIdsByNames,
 } from '../../../core';
 import { GraphQLError } from 'graphql';
 import { z } from 'zod';
 import type {
   StatusType,
   NonprofitSortOption,
 } from '../../../core/services/nonprofits.service';
+import { prisma } from '../../../config/database';
+import { status_type } from '@prisma/client';
 
-// Infer TypeScript types directly from your Zod schemas
 type CreateNonprofitInput = z.infer<typeof createNonprofitSchema>;
 type UpdateNonprofitInput = z.infer<typeof updateNonprofitSchema>;
 
 interface NonprofitsQueryArgs {
-  chapterIds?: string[];
+  chapterNames?: string[];
   statuses?: StatusType[];
   sort?: NonprofitSortOption[];
 }
 
+interface GetNonprofitsWithFiltersArgs {
+  statuses?: StatusType[];
+  sort?: NonprofitSortOption[];
+  chapterIds?: string[];
+}
+
+interface NonprofitParent {
+  nonprofit_id: string;
+}
+
+interface ChapterRow {
+  project_status: status_type;
+  chapter_id: string | null;
+  chapters: { chapter_id: string; name: string } | null;
+}
+
 export const nonprofitResolvers = {
   Query: {
-    nonprofits: (
+    nonprofits: async (
       _parent: unknown,
-      { chapterIds, statuses, sort }: NonprofitsQueryArgs
+      { chapterNames, statuses, sort }: NonprofitsQueryArgs
     ) => {
-      return getNonprofitsWithFilters({ chapterIds, statuses, sort });
+      let resolvedChapterIds: string[] | undefined;
+
+      if (chapterNames?.length) {
+        resolvedChapterIds = await getChapterIdsByNames(chapterNames);
+        if (!resolvedChapterIds.length) return [];
+      }
+
+      const serviceArgs: GetNonprofitsWithFiltersArgs = {
+        statuses,
+        sort,
+        ...(resolvedChapterIds?.length
+          ? { chapterIds: resolvedChapterIds }
+          : {}),
+      };
+
+      const nonprofits = await getNonprofitsWithFilters(serviceArgs);
+
+      return nonprofits.map((np) => ({
+        ...np,
+        chapters: [],
+      }));
     },
+
     nonprofit: async (_parent: unknown, { id }: { id: string }) => {
       const nonprofit = await getNonprofitById(id);
       if (!nonprofit) {
@@ -45,9 +84,58 @@ export const nonprofitResolvers = {
           { code: 'NOT_FOUND' }
         );
       }
-      return nonprofit;
+
+      return {
+        ...nonprofit,
+        chapters: [],
+      };
     },
   },
+
+  Nonprofit: {
+    chapters: async (parent: NonprofitParent) => {
+      const rows = (await prisma.nonprofit_chapter_project.findMany({
+        where: { nonprofit_id: parent.nonprofit_id },
+        select: {
+          project_status: true,
+          chapter_id: true,
+          chapters: {
+            select: {
+              chapter_id: true,
+              name: true,
+            },
+          },
+        },
+        orderBy: { created_at: 'desc' },
+      })) as ChapterRow[];
+
+      if (!rows.length) return [];
+
+      const rowsWithChapter = rows.filter(
+        (
+          r
+        ): r is ChapterRow & {
+          chapters: { chapter_id: string; name: string };
+        } => r.chapters !== null
+      );
+
+      const seen = new Set<string>();
+      const deduped = rowsWithChapter.filter((r) => {
+        const id = r.chapters.chapter_id;
+        if (seen.has(id)) return false;
+        seen.add(id);
+        return true;
+      });
+
+      return deduped.map((r) => ({
+        chapter_id: r.chapters.chapter_id,
+        chapter_name: r.chapters.name,
+        project_status:
+          r.project_status === status_type.ACTIVE ? 'ACTIVE' : 'INACTIVE',
+      }));
+    },
+  },
+
   Mutation: {
     createNonprofit: (
       _parent: unknown,
@@ -56,6 +144,7 @@ export const nonprofitResolvers = {
       const validatedInput = createNonprofitSchema.parse(input);
       return createNonprofit(validatedInput);
     },
+
     updateNonprofit: (
       _parent: unknown,
       {
@@ -66,6 +155,7 @@ export const nonprofitResolvers = {
       const validatedInput = updateNonprofitSchema.parse(input);
       return updateNonprofit(nonprofit_id, validatedInput);
     },
+
     deleteNonprofit: (_parent: unknown, { id }: { id: string }) => {
       return deleteNonprofit(id);
     },

src/api/graphql/schemas/nonprofits.schema.ts

@@ -6,6 +6,12 @@ export const nonprofitSchemaString = `
     STATUS
   }
 
+  type NonprofitChapterInfo {
+    chapter_id: ID!
+    chapter_name: String!
+    project_status: StatusType!
+  }
+
   type Nonprofit {
     nonprofit_id: ID!
     name: String!
@@ -16,14 +22,16 @@ export const nonprofitSchemaString = `
     created_at: String!
     updated_at: String!
     status: StatusType!
+    chapters: [NonprofitChapterInfo!]!
   }
 
   type Query {
     nonprofits(
-      chapterIds: [ID!]
+      chapterNames: [String!]
       statuses: [StatusType!]
       sort: [NonprofitSortOption!]
     ): [Nonprofit!]!
+
     nonprofit(id: ID!): Nonprofit
   }