Merge branch 'dev' of https://github.com/AirHopper/BackEnd

Author: juan-vrrl

src/controllers/terminal.controller.js

@@ -13,7 +13,9 @@ export const createTerminal = async (req, res, next) => {
 // Get all terminals
 export const getAllTerminals = async (req, res, next) => {
   try {
-    const terminals = await terminalService.getAllTerminals();
+    const { airportId } = req.query;
+
+    const terminals = await terminalService.getAllTerminals(airportId);
     res.status(200).json({success:true, message:"Terminals fetched successfully", data: terminals, error: null});
   } catch (error) {
     next(error);

src/controllers/test/terminal.controller.test.js

@@ -17,6 +17,7 @@ import {
       req = {
         body: {},
         params: {},
+        query: {},
       };
       res = {
         status: jest.fn().mockReturnThis(),
@@ -65,10 +66,12 @@ import {
           { id: 1, name: "Terminal 1", type: "Domestic" },
           { id: 2, name: "Terminal 2", type: "International" },
         ];
-        terminalService.getAllTerminals.mockResolvedValue(terminals);
-  
+        req.query.airportId = "123"; // Add query parameter to the existing mock
+        terminalService.getAllTerminals.mockResolvedValue(terminals); // Mock service
+    
         await getAllTerminals(req, res, next);
-  
+    
+        expect(terminalService.getAllTerminals).toHaveBeenCalledWith("123"); // Ensure airportId is passed
         expect(res.status).toHaveBeenCalledWith(200);
         expect(res.json).toHaveBeenCalledWith({
           success: true,
@@ -77,17 +80,20 @@ import {
           error: null,
         });
       });
-  
+    
       test("should handle error when retrieving terminals", async () => {
         const errorMessage = "Failed to fetch terminals";
-        terminalService.getAllTerminals.mockRejectedValue(new Error(errorMessage));
-  
+        req.query.airportId = "123"; // Add query parameter to the existing mock
+        terminalService.getAllTerminals.mockRejectedValue(new Error(errorMessage)); // Mock service
+    
         await getAllTerminals(req, res, next);
-  
+    
+        expect(terminalService.getAllTerminals).toHaveBeenCalledWith("123"); // Ensure airportId is passed
         expect(next).toHaveBeenCalledWith(expect.any(Error));
         expect(next).toHaveBeenCalledWith(expect.objectContaining({ message: errorMessage }));
       });
     });
+    
 
     describe("getTerminalById", () => {
       test("should return a terminal by ID with 200 status", async () => {

src/services/terminal.service.js

@@ -22,11 +22,21 @@ export const createTerminal = async (data) => {
 };
 
 // Get all terminals
-export const getAllTerminals = async () => {
+export const getAllTerminals = async (airportId=null) => {
   try {
+    let where = {};
+
+    if (airportId) {
+      where = {
+        airportId: { contains: airportId },
+      };
+    }
+
     const terminals = await prisma.terminal.findMany({
-      include: { Airport: true }, 
+      where,
+      include: { Airport: true },
     });
+
     return terminals;
   } catch (error) {
     console.error("Error fetching terminals:", error);

src/services/test/terminal.service.test.js

@@ -82,6 +82,40 @@ describe("Terminal Service", () => {
       expect(result).toEqual(terminals);
       expect(prismaMock.terminal.findMany).toHaveBeenCalledWith({
         include: { Airport: true },
+        where: {},
+      });
+    });
+
+    it("should fetch all terminals with search", async () => {
+      const terminals = [
+        {
+          id: 1,
+          name: "Terminal 1",
+          type: "Domestic",
+          airportId: "JFK",
+          Airport: { iataCode: "JFK" },
+        },
+        {
+          id: 2,
+          name: "Terminal 2",
+          type: "International",
+          airportId: "JFK",
+          Airport: { iataCode: "JFK"},
+        },
+      ];
+
+      const airportId = "JFK";
+
+      prismaMock.terminal.findMany.mockResolvedValue(terminals); // Mock Prisma behavior
+
+      const result = await terminalService.getAllTerminals(airportId); // Pass airportId to the service
+
+      expect(result).toEqual(terminals); // Ensure the returned data matches the mock data
+      expect(prismaMock.terminal.findMany).toHaveBeenCalledWith({
+        include: { Airport: true }, // Ensure the query includes related Airport data
+        where: {
+          airportId: { contains: airportId }, // Ensure the query filters by airportId
+        },
       });
     });
 
@@ -116,14 +150,20 @@ describe("Terminal Service", () => {
       expect(result).toEqual(terminal);
       expect(prismaMock.terminal.findUnique).toHaveBeenCalledWith({
         where: { id: 1 },
-        include: { Airport: true, FlightsDeparture: true, FlightsArrival: true },
+        include: {
+          Airport: true,
+          FlightsDeparture: true,
+          FlightsArrival: true,
+        },
       });
     });
 
     it("should throw an error if the terminal is not found", async () => {
       prismaMock.terminal.findUnique.mockResolvedValue(null);
 
-      await expect(terminalService.getTerminalById(1)).rejects.toThrow(AppError);
+      await expect(terminalService.getTerminalById(1)).rejects.toThrow(
+        AppError
+      );
       expect(console.error).toHaveBeenCalledWith(
         "Error fetching terminal:",
         expect.any(Error)