Fix DAL

backend/src/ee/services/pki-acme/pki-acme-order-dal.ts

@@ -1,10 +1,10 @@
 import { Knex } from "knex";
 
 import { TDbClient } from "@app/db";
-import { TableName, TPkiAcmeAuths } from "@app/db/schemas";
+import { TableName } from "@app/db/schemas";
 import { TPkiAcmeOrdersInsert, TPkiAcmeOrdersUpdate } from "@app/db/schemas/pki-acme-orders";
 import { DatabaseError } from "@app/lib/errors";
-import { ormify, selectAllTableCols } from "@app/lib/knex";
+import { ormify, selectAllTableCols, sqlNestRelationships } from "@app/lib/knex";
 
 export type TPkiAcmeOrderDALFactory = ReturnType<typeof pkiAcmeOrderDALFactory>;
 
@@ -53,7 +53,7 @@ export const pkiAcmeOrderDALFactory = (db: TDbClient) => {
 
   const findByAccountAndOrderIdWithAuthorizations = async (accountId: string, orderId: string, tx?: Knex) => {
     try {
-      const order = await (tx || db)(TableName.PkiAcmeOrder)
+      const rows = await (tx || db)(TableName.PkiAcmeOrder)
         .join(TableName.PkiAcmeOrderAuth, `${TableName.PkiAcmeOrderAuth}.orderId`, `${TableName.PkiAcmeOrder}.id`)
         .join(TableName.PkiAcmeAuth, `${TableName.PkiAcmeOrderAuth}.authId`, `${TableName.PkiAcmeAuth}.id`)
         .select(
@@ -61,24 +61,32 @@ export const pkiAcmeOrderDALFactory = (db: TDbClient) => {
           db.ref("id").withSchema(TableName.PkiAcmeAuth).as("authId"),
           db.ref("identifierType").withSchema(TableName.PkiAcmeAuth).as("identifierType"),
           db.ref("identifierValue").withSchema(TableName.PkiAcmeAuth).as("identifierValue"),
-          db.ref("expiresAt").withSchema(TableName.PkiAcmeAuth).as("expiresAt")
+          db.ref("expiresAt").withSchema(TableName.PkiAcmeAuth).as("authExpiresAt")
         )
         .where(`${TableName.PkiAcmeOrder}.id`, orderId)
         .where(`${TableName.PkiAcmeOrder}.accountId`, accountId)
-        .first();
+        .orderBy(`${TableName.PkiAcmeAuth}.identifierValue`, "asc");
 
-      if (!order) {
+      if (rows.length === 0) {
         return null;
       }
-      return {
-        ...order,
-        authorizations: order.authorizations.map((auth: TPkiAcmeAuths) => ({
-          id: auth.id,
-          identifierType: auth.identifierType,
-          identifierValue: auth.identifierValue,
-          expiresAt: auth.expiresAt
-        }))
-      };
+      return sqlNestRelationships({
+        data: rows,
+        key: "id",
+        parentMapper: (row) => row,
+        childrenMapper: [
+          {
+            key: "authId",
+            label: "authorizations" as const,
+            mapper: ({ authId, identifierType, identifierValue, authExpiresAt }) => ({
+              id: authId,
+              identifierType: identifierType,
+              identifierValue: identifierValue,
+              expiresAt: authExpiresAt
+            })
+          }
+        ]
+      })?.[0];
     } catch (error) {
       throw new DatabaseError({ error, name: "Find PKI ACME order by id" });
     }