Merge branch 'dev' into refactor/show-product-updates-conditionnally

server/routers/client/getClient.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db } from "@server/db";
-import { clients, clientSitesAssociationsCache } from "@server/db";
+import { db, olms } from "@server/db";
+import { clients } from "@server/db";
 import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -12,8 +12,8 @@ import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 
 const getClientSchema = z.strictObject({
-        clientId: z.string().transform(stoi).pipe(z.int().positive())
-    });
+    clientId: z.string().transform(stoi).pipe(z.int().positive())
+});
 
 async function query(clientId: number) {
     // Get the client
@@ -21,26 +21,20 @@ async function query(clientId: number) {
         .select()
         .from(clients)
         .where(and(eq(clients.clientId, clientId)))
+        .leftJoin(olms, eq(clients.olmId, olms.olmId))
         .limit(1);
 
     if (!client) {
         return null;
     }
-
-    // Get the siteIds associated with this client
-    const sites = await db
-        .select({ siteId: clientSitesAssociationsCache.siteId })
-        .from(clientSitesAssociationsCache)
-        .where(eq(clientSitesAssociationsCache.clientId, clientId));
-
-    // Add the siteIds to the client object
-    return {
-        ...client,
-        siteIds: sites.map((site) => site.siteId)
-    };
+    return client;
 }
 
-export type GetClientResponse = NonNullable<Awaited<ReturnType<typeof query>>>;
+export type GetClientResponse = NonNullable<
+    Awaited<ReturnType<typeof query>>
+>["clients"] & {
+    olmId: string | null;
+};
 
 registry.registerPath({
     method: "get",
@@ -82,8 +76,13 @@ export async function getClient(
             );
         }
 
+        const data: GetClientResponse = {
+            ...client.clients,
+            olmId: client.olms ? client.olms.olmId : null
+        };
+
         return response<GetClientResponse>(res, {
-            data: client,
+            data,
             success: true,
             error: false,
             message: "Client retrieved successfully",

server/routers/remoteExitNode/types.ts

@@ -6,11 +6,6 @@ export type CreateRemoteExitNodeResponse = {
     secret: string;
 };
 
-export type UpdateRemoteExitNodeResponse = {
-    remoteExitNodeId: string;
-    secret: string;
-}
-
 export type PickRemoteExitNodeDefaultsResponse = {
     remoteExitNodeId: string;
     secret: string;

server/routers/site/getSite.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db } from "@server/db";
+import { db, newts } from "@server/db";
 import { sites } from "@server/db";
 import { eq, and } from "drizzle-orm";
 import response from "@server/lib/response";
@@ -12,15 +12,15 @@ import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 
 const getSiteSchema = z.strictObject({
-        siteId: z
-            .string()
-            .optional()
-            .transform(stoi)
-            .pipe(z.int().positive().optional())
-            .optional(),
-        niceId: z.string().optional(),
-        orgId: z.string().optional()
-    });
+    siteId: z
+        .string()
+        .optional()
+        .transform(stoi)
+        .pipe(z.int().positive().optional())
+        .optional(),
+    niceId: z.string().optional(),
+    orgId: z.string().optional()
+});
 
 async function query(siteId?: number, niceId?: string, orgId?: string) {
     if (siteId) {
@@ -28,6 +28,7 @@ async function query(siteId?: number, niceId?: string, orgId?: string) {
             .select()
             .from(sites)
             .where(eq(sites.siteId, siteId))
+            .leftJoin(newts, eq(sites.siteId, newts.siteId))
             .limit(1);
         return res;
     } else if (niceId && orgId) {
@@ -35,12 +36,15 @@ async function query(siteId?: number, niceId?: string, orgId?: string) {
             .select()
             .from(sites)
             .where(and(eq(sites.niceId, niceId), eq(sites.orgId, orgId)))
+            .leftJoin(newts, eq(sites.siteId, newts.siteId))
             .limit(1);
         return res;
     }
 }
 
-export type GetSiteResponse = NonNullable<Awaited<ReturnType<typeof query>>>;
+export type GetSiteResponse = NonNullable<
+    Awaited<ReturnType<typeof query>>
+>["sites"] & { newtId: string | null };
 
 registry.registerPath({
     method: "get",
@@ -94,8 +98,13 @@ export async function getSite(
             return next(createHttpError(HttpCode.NOT_FOUND, "Site not found"));
         }
 
+        const data: GetSiteResponse = {
+            ...site.sites,
+            newtId: site.newt ? site.newt.newtId : null
+        };
+
         return response<GetSiteResponse>(res, {
-            data: site,
+            data,
             success: true,
             error: false,
             message: "Site retrieved successfully",

server/routers/target/updateTarget.ts

@@ -203,6 +203,12 @@ export async function updateTarget(
             hcHeaders = JSON.stringify(parsedBody.data.hcHeaders);
         }
 
+        // When health check is disabled, reset hcHealth to "unknown"
+        // to prevent previously unhealthy targets from being excluded
+        const hcHealthValue = (parsedBody.data.hcEnabled === false || parsedBody.data.hcEnabled === null) 
+            ? "unknown" 
+            : undefined;
+
         const [updatedHc] = await db
             .update(targetHealthCheck)
             .set({
@@ -220,6 +226,7 @@ export async function updateTarget(
                 hcMethod: parsedBody.data.hcMethod,
                 hcStatus: parsedBody.data.hcStatus,
                 hcTlsServerName: parsedBody.data.hcTlsServerName,
+                ...(hcHealthValue !== undefined && { hcHealth: hcHealthValue })
             })
             .where(eq(targetHealthCheck.targetId, targetId))
             .returning();