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

prettier formatting

Author: ashrit-ram-anala

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

@@ -8,6 +8,10 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   prettier-frontend:
     name: Prettier Frontend
@@ -19,6 +23,7 @@ jobs:
         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
@@ -38,10 +43,11 @@ jobs:
           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"
+          git diff --staged --quiet || git commit -m "Auto-format frontend code with Prettier 🤖"
 
       - name: Push changes
-        run: git push
+        run: |
+          git push origin main --force-with-lease
 
   prettier-backend:
     name: Prettier Backend
@@ -53,6 +59,7 @@ jobs:
         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
@@ -72,7 +79,8 @@ jobs:
           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"
+          git diff --staged --quiet || git commit -m "Auto-format backend code with Prettier 🤖"
 
       - name: Push changes
-        run: git push
+        run: |
+          git push origin main --force-with-lease

backend/controllers/organizationController.ts

@@ -92,6 +92,10 @@ export const registerOrganization = async (req: Request, res: Response) => {
       emailVerified: false,
       displayName: name,
     });
+    let organizationTags = [];
+    if (tags) {
+      organizationTags = tags;
+    }
     const newOrg = await prisma.organization.create({
       data: {
         email,
@@ -105,7 +109,7 @@ export const registerOrganization = async (req: Request, res: Response) => {
         state,
         zipCode,
         phoneNumber,
-        tags: tags || [],
+        tags: organizationTags,
         firebaseUid: firebaseUser.uid,
         role: 'MEMBER',
         status: 'PENDING',
@@ -127,7 +131,12 @@ export const getOrganizationById = async (req: AuthenticatedRequest, res: Respon
   try {
     const { id } = req.params;
     const currentUser = req.user;
-    const targetId = id === 'profile' ? currentUser?.id : id;
+    let targetId;
+    if (id === 'profile') {
+      targetId = currentUser?.id;
+    } else {
+      targetId = id;
+    }
     if (!targetId) {
       return res.status(401).json({ error: 'Organization not authenticated' });
     }
@@ -176,7 +185,12 @@ export const updateOrganization = async (req: AuthenticatedRequest, res: Respons
       role,
       status,
     } = req.body;
-    const targetId = id === 'profile' ? currentUser?.id : id;
+    let targetId;
+    if (id === 'profile') {
+      targetId = currentUser?.id;
+    } else {
+      targetId = id;
+    }
 
     if (!targetId) {
       return res.status(401).json({ error: 'Organization not authenticated' });