Merge pull request #168 from cuappdev/ashley/fixing-dev

Fixing Dev

Author: ashleynhs

src/api/controllers/NotifController.ts

@@ -1,5 +1,5 @@
 import { Body, CurrentUser, Delete, Get, JsonController, Param, Params, Post } from 'routing-controllers';
-import { FindTokensRequest, DiscountNotificationRequest, RequestMatchNotificationRequest } from 'src/types';
+import { FindTokensRequest, DiscountNotificationRequest, RequestMatchNotificationRequest } from '../../types';
 import { NotifService } from '../../services/NotifService';
 import { UserModel } from '../../models/UserModel';
 
@@ -67,20 +67,20 @@ export class NotifController {
    * Send a transaction confirmation notification to the buyer
    * POST /notif/transaction-confirmation/:transactionId
    */
-  @Post('transaction-confirmation/:transactionId')
-  async sendTransactionConfirmation(
-    @Param('transactionId') transactionId: string
-  ) {
-    return this.notifService.sendTransactionConfirmationNotification(transactionId);
-  }
+  // @Post('transaction-confirmation/:transactionId')
+  // async sendTransactionConfirmation(
+  //   @Param('transactionId') transactionId: string
+  // ) {
+  //   return this.notifService.sendTransactionConfirmationNotification(transactionId);
+  // }
 
   /**
    * Check for and send all pending transaction confirmation notifications
    * This can be called by a cron job or manually for testing
    * POST /notif/check-pending-transactions
    */
-  @Post('check-pending-transactions')
-  async checkPendingTransactions() {
-    return this.notifService.sendPendingTransactionConfirmations();
-  }
+  // @Post('check-pending-transactions')
+  // async checkPendingTransactions() {
+  //   return this.notifService.sendPendingTransactionConfirmations();
+  // }
 }

src/app.ts

@@ -1,17 +1,22 @@
 // Load environment and Firebase configuration first
-import "dotenv/config";
+import dotenv from "dotenv";
+dotenv.config();
 import "./firebase";
 import "reflect-metadata";
 
 import {
   createExpressServer,
   useContainer as routingUseContainer,
+  ForbiddenError,
+  HttpError,
+  UnauthorizedError,
 } from "routing-controllers";
 import { getManager, useContainer } from "typeorm";
 import { Container } from "typeorm-typedi-extensions";
 import { Express, Request, Response } from "express";
 import * as swaggerUi from "swagger-ui-express";
-import swaggerDocument from "../swagger.json";
+import * as path from "path";
+import { firebaseAdmin as admin } from "./firebase";
 
 import { controllers } from './api/controllers';
 import { middlewares } from './api/middlewares';
@@ -22,48 +27,6 @@ import { ReportService } from './services/ReportService';
 import { reportToString } from './utils/Requests';
 import { startTransactionConfirmationCron } from './cron/transactionCron';
 
-dotenv.config();
-
-const port = process.env.PORT ?? 3000;
-const app: Express = createExpressServer({
-  cors: true,
-  routePrefix: "/api/",
-  controllers: controllers,
-  middlewares: middlewares,
-  defaults: {
-    paramOptions: {
-      required: true, // Make all params required by default
-    },
-  },
-  validation: true,
-  development: process.env.NODE_ENV !== "production",
-  defaultErrorHandler: false,
-  currentUserChecker: FirebaseCurrentUserChecker,
-});
-
-/**
- * Setup Swagger docs
- */
-app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
-console.log(
-  `Swagger documentation available at http://localhost:${port}/api-docs`,
-);
-
-/**
- * Health check endpoint
- */
-app.get("/health", async (_req: Request, res: Response) => {
-  const manager = getManager();
-  try {
-    await manager.query("SELECT 1");
-    res.status(200).json({ status: "healthy", database: "Connected" });
-  } catch (error) {
-    res
-      .status(500)
-      .json({ status: "Error", database: "Not connected", error: error });
-  }
-});
-
 // Setup dependency injection containers
 routingUseContainer(Container);
 useContainer(Container);
@@ -175,6 +138,21 @@ async function main() {
     `Swagger documentation available at http://localhost:${port}/api-docs`,
   );
 
+  /**
+   * Health check endpoint
+   */
+  app.get("/health", async (_req: Request, res: Response) => {
+    const manager = getManager();
+    try {
+      await manager.query("SELECT 1");
+      res.status(200).json({ status: "healthy", database: "Connected" });
+    } catch (error) {
+      res
+        .status(500)
+        .json({ status: "Error", database: "Not connected", error: error });
+    }
+  });
+
   const entityManager = getManager();
   const reportService = new ReportService(entityManager);
   const reportController = new ReportController(reportService);

src/cron/transactionCron.ts

@@ -1,4 +1,4 @@
-import cron from 'node-cron';
+// import cron from 'node-cron';
 import { getManager } from 'typeorm';
 import { NotifService } from '../services/NotifService';
 
@@ -17,23 +17,23 @@ export function startTransactionConfirmationCron() {
     //   *    = every month
     //   *    = every day of week
 
-    cron.schedule('*/15 * * * *', async () => {
-        console.log('[CRON] Checking for pending transaction confirmations...');
+    // cron.schedule('*/15 * * * *', async () => {
+    //     console.log('[CRON] Checking for pending transaction confirmations...');
 
-        try {
-            const entityManager = getManager();
-            const notifService = new NotifService(entityManager);
+    //     try {
+    //         const entityManager = getManager();
+    //         const notifService = new NotifService(entityManager);
 
-            const result = await notifService.sendPendingTransactionConfirmations();
-            console.log('[CRON] Transaction confirmation check complete:', result.message);
+    //         const result = await notifService.sendPendingTransactionConfirmations();
+    //         console.log('[CRON] Transaction confirmation check complete:', result.message);
 
-            if (result.results && result.results.length > 0) {
-                console.log('[CRON] Notifications sent:', result.results);
-            }
-        } catch (error) {
-            console.error('[CRON] Error checking pending transactions:', error);
-        }
-    });
+    //         if (result.results && result.results.length > 0) {
+    //             console.log('[CRON] Notifications sent:', result.results);
+    //         }
+    //     } catch (error) {
+    //         console.error('[CRON] Error checking pending transactions:', error);
+    //     }
+    // });
 
     console.log('[CRON] Transaction confirmation cron job started (runs every 15 minutes)');
 }

src/migrations/1767386999887-AddUserStats 2.ts

@@ -4,7 +4,19 @@ import { NotificationData, FindTokensRequest, DiscountNotificationRequest, Reque
 import Repositories, { TransactionsManager } from '../repositories';
 import { EntityManager } from 'typeorm';
 import { InjectManager } from 'typeorm-typedi-extensions';
-import { getMessaging, Message } from 'firebase-admin/messaging';
+import { firebaseAdmin } from '../firebase';
+
+const getMessaging = () => firebaseAdmin.messaging();
+
+// Message type from firebase-admin
+interface Message {
+  notification?: {
+    title?: string;
+    body?: string;
+  };
+  data?: { [key: string]: string };
+  token: string;
+}
 
 interface NotifPayload {
     title: string;
@@ -140,20 +152,7 @@ export class NotifService {
                 }
             });
         });
-        await this.sendFCMNotifs(notifs, user.firebaseUid);
-        return {
-          message: "Notification sent successfully",
-          httpCode: 200,
-        };
-      } catch (err) {
-        console.log(err);
-        return {
-          message: "Notification not sent",
-          httpCode: 500,
-        };
-      }
-    });
-  }
+    }
 
     public async sendRequestMatchNotification(request: RequestMatchNotificationRequest): Promise<NotifResult> {
         return this.transactions.readWrite(async (transactionalEntityManager) => {
@@ -192,20 +191,7 @@ export class NotifService {
                 }
             });
         });
-        await this.sendFCMNotifs(notifs, request.userId);
-        return {
-          message: "Notification sent successfully",
-          httpCode: 200,
-        };
-      } catch (err) {
-        console.log(err);
-        return {
-          message: "Notification not sent",
-          httpCode: 500,
-        };
-      }
-    });
-  }
+    }
 
   public async getRecentNotifications(userId: string) {
     return this.transactions.readWrite(async (transactionalEntityManager) => {