From 2343f9387a39e6272de9e889d459b61085c7bc97 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Mon, 21 Apr 2025 21:04:50 -0500
Subject: [PATCH] refactor(ocme): moved the server port to the app vs ocme

---
 server/index.ts                     | 24 ++++++++++++++++
 server/services/ocme/ocmeService.ts | 43 ++++++++---------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/server/index.ts b/server/index.ts
index d498ac7..14be6d4 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -189,6 +189,7 @@ const port =
         ? process.env.VITE_SERVER_PORT
         : process.env.PROD_PORT;
 
+const ocmeport = process.env.OCME_PORT;
 serve(
     {
         fetch: app.fetch,
@@ -205,4 +206,27 @@ serve(
     }
 );
 
+/**
+ * Only for ocme until we get them switched over to the single port setup.
+ */
+const setting = await db.select().from(settings);
+const isActive = setting.filter((n) => n.name === "ocmeService");
+if (ocmeport && isActive[0]?.value === "1") {
+    serve(
+        {
+            fetch: app.fetch,
+            port: Number(ocmeport),
+            hostname: "0.0.0.0",
+        },
+        (info) => {
+            createLog(
+                "info",
+                "LST",
+                "server",
+                `Ocme section is listening on http://${info.address}:${info.port}`
+            );
+        }
+    );
+}
+
 export type AppRoutes = typeof appRoutes;
diff --git a/server/services/ocme/ocmeService.ts b/server/services/ocme/ocmeService.ts
index 2543193..21f0064 100644
--- a/server/services/ocme/ocmeService.ts
+++ b/server/services/ocme/ocmeService.ts
@@ -16,43 +16,24 @@ import manualTrigger from "./route/triggerCamera.js";
 const app = new OpenAPIHono();
 const port = process.env.OCME_PORT;
 const routes = [
-  getInfo,
-  postRunningNr,
-  postsscc,
-  pickedup,
-  getShipments,
-  cycleCount,
-  manualTrigger,
+    getInfo,
+    postRunningNr,
+    postsscc,
+    pickedup,
+    getShipments,
+    cycleCount,
+    manualTrigger,
 ] as const;
-const setting = await db.select().from(settings);
 
-const isActive = setting.filter((n) => n.name === "ocmeService");
 const appRoutes = routes.forEach((route) => {
-  app.route("/api/v1", route);
+    app.route("/api/v1", route);
 });
 
 app.all("/api/v1/*", (c) => {
-  return c.json({
-    success: false,
-    message: "you have encounted an ocme route that dose not exist.",
-  });
+    return c.json({
+        success: false,
+        message: "you have encounted an ocme route that dose not exist.",
+    });
 });
-if (port && isActive[0]?.value === "1") {
-  serve(
-    {
-      fetch: app.fetch,
-      port: Number(port),
-      hostname: "0.0.0.0",
-    },
-    (info) => {
-      createLog(
-        "info",
-        "LST",
-        "server",
-        `Ocme section is listening on http://${info.address}:${info.port}`
-      );
-    }
-  );
-}
 
 export default app;