fix: ลำดับ route events ผิด

Author: wanasart

client/my-app/src/app/components/Layouts/Header.tsx

@@ -39,8 +39,6 @@ export default function Header({ userName = "Admin" }: { userName?: string }) {
         hour12: true,
     }).format(now);
 
-    console.log(me);
-
     return (
         <header
             className="sticky top-0 z-40 w-full bg-[color:var(--color-white)]"

server/src/routes/events.routes.ts

@@ -29,16 +29,16 @@ import * as ctrl from "../controllers/events.controller";
 
 const router = Router();
 
+/* ===================== Global Detection Settings ===================== */
+router.get("/global", ctrl.getGlobalEvents);
+router.get("/:evt_id/global", ctrl.getGlobalEventById);
+router.put("/:evt_id/global", ctrl.updateGlobalEvent);
+
 /* ========================== Events ========================== */
 router.get("/", ctrl.getEvents);
 router.post("/", ctrl.createEvent);
 router.get("/:evt_id", ctrl.getEventById);
 router.put("/:evt_id", ctrl.updateEvent);
 router.patch("/:evt_id", ctrl.softDeleteEvent);
 
-/* ===================== Global Detection Settings ===================== */
-router.get("/global", ctrl.getGlobalEvents);
-router.get("/:evt_id/global", ctrl.getGlobalEventById);
-router.put("/:evt_id/global", ctrl.updateGlobalEvent);
-
 export default router;

server/src/services/events.service.ts

@@ -269,7 +269,7 @@ export async function getGlobalEventById(event_id: number) {
   const { rows } = await pool.query(
     `
     SELECT * FROM v_events_overview
-    WHERE event_id = $1;
+    WHERE event_id = $1
     AND is_use = true;
   `,
     [event_id]