Merge pull request #5 from ChangePlusPlusVandy/setup/dev-setup

prettier formatting check

Author: ashrit-ram-anala

.github/workflows/prettier-auto-format.yml

@@ -1,86 +1,36 @@
-name: Prettier Auto-Format
+name: Format Check
 
 on:
   push:
-    branches:
-      - main
+    branches: ["*"]
   pull_request:
-    branches:
-      - main
-
-permissions:
-  contents: write
-  pull-requests: write
+    branches: ["main"]
 
 jobs:
-  prettier-frontend:
-    name: Prettier Frontend
+  format-check:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repository
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-          ref: ${{ github.head_ref || github.ref_name }}
 
-      - name: Set up Node.js
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      - name: Install dependencies
+      - name: Install frontend dependencies
         working-directory: ./frontend
         run: npm install
 
-      - name: Run Prettier and Format Code
-        working-directory: ./frontend
-        run: npm run format
-
-      - name: Commit formatting changes
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
-          git diff --staged --quiet || git commit -m "Auto-format frontend code with Prettier 🤖"
-
-      - name: Push changes
-        run: |
-          git push origin main --force-with-lease
-
-  prettier-backend:
-    name: Prettier Backend
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-          ref: ${{ github.head_ref || github.ref_name }}
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install dependencies
+      - name: Install backend dependencies
         working-directory: ./backend
         run: npm install
 
-      - name: Run Prettier and Format Code
-        working-directory: ./backend
-        run: npm run format
-
-      - name: Commit formatting changes
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
-          git diff --staged --quiet || git commit -m "Auto-format backend code with Prettier 🤖"
+      - name: Check frontend formatting
+        working-directory: ./frontend
+        run: npm run format:check
 
-      - name: Push changes
-        run: |
-          git push origin main --force-with-lease
+      - name: Check backend formatting
+        working-directory: ./backend
+        run: npm run format:check

backend/__tests__/controllers/organizationController.test.ts

@@ -164,10 +164,7 @@ describe('OrganizationController', () => {
 
       expect(prismaMock.organization.findFirst).toHaveBeenCalledWith({
         where: {
-          OR: [
-            { email: 'neworg@nonprofit.org' },
-            { name: 'New Community Services' }
-          ],
+          OR: [{ email: 'neworg@nonprofit.org' }, { name: 'New Community Services' }],
         },
       });
 
@@ -199,11 +196,13 @@ describe('OrganizationController', () => {
       });
 
       expect(res.status).toHaveBeenCalledWith(201);
-      expect(res.json).toHaveBeenCalledWith(expect.objectContaining({
-        email: 'neworg@nonprofit.org',
-        name: 'New Community Services',
-        status: 'PENDING',
-      }));
+      expect(res.json).toHaveBeenCalledWith(
+        expect.objectContaining({
+          email: 'neworg@nonprofit.org',
+          name: 'New Community Services',
+          status: 'PENDING',
+        })
+      );
     });
 
     it('should reject registration with missing required fields - POST /api/organizations/register', async () => {
@@ -219,7 +218,7 @@ describe('OrganizationController', () => {
 
       expect(res.status).toHaveBeenCalledWith(400);
       expect(res.json).toHaveBeenCalledWith({
-        error: 'Email, password, name, and contact person are required'
+        error: 'Email, password, name, and contact person are required',
       });
     });
 
@@ -240,7 +239,7 @@ describe('OrganizationController', () => {
 
       expect(res.status).toHaveBeenCalledWith(400);
       expect(res.json).toHaveBeenCalledWith({
-        error: 'Organization with this email or name already exists'
+        error: 'Organization with this email or name already exists',
       });
     });
   });
@@ -413,7 +412,7 @@ describe('OrganizationController', () => {
         where: { id: 'org123' },
         data: expect.objectContaining({
           email: 'newemail@nonprofit.org',
-          }),
+        }),
       });
 
       expect(res.json).toHaveBeenCalled();
@@ -574,6 +573,4 @@ describe('OrganizationController', () => {
       expect(res.json).toHaveBeenCalledWith({ error: 'Organization not found' });
     });
   });
-
-
-});
+});

backend/controllers/organizationController.ts

@@ -76,7 +76,9 @@ export const registerOrganization = async (req: Request, res: Response) => {
     } = req.body;
 
     if (!email || !password || !name || !contactPerson) {
-      return res.status(400).json({ error: 'Email, password, name, and contact person are required' });
+      return res
+        .status(400)
+        .json({ error: 'Email, password, name, and contact person are required' });
     }
     const existingOrg = await prisma.organization.findFirst({
       where: {

backend/types/index.ts

@@ -80,6 +80,6 @@ export interface UpdateOrganizationInput {
   contactPerson?: string;
   contactTitle?: string;
   tags?: string[];
-  role?: OrganizationRole; 
+  role?: OrganizationRole;
   status?: OrganizationStatus;
-}
+}