From d1e5ae2d85baadf082828e20b6827f7a1a3ddbf7 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Wed, 14 May 2025 14:45:24 +0800
Subject: [PATCH] misc: updated pki collection lst

---
 .../pki-collection/pki-collection-item-dal.ts         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend/src/services/pki-collection/pki-collection-item-dal.ts b/backend/src/services/pki-collection/pki-collection-item-dal.ts
index de896e15c..fadd08d2f 100644
--- a/backend/src/services/pki-collection/pki-collection-item-dal.ts
+++ b/backend/src/services/pki-collection/pki-collection-item-dal.ts
@@ -27,13 +27,13 @@ export const pkiCollectionItemDALFactory = (db: TDbClient) => {
         .select(
           "pki_collection_items.*",
           db.raw(
-            `COALESCE("${TableName.CertificateAuthority}"."notBefore", "${TableName.Certificate}"."notBefore") as "notBefore"`
+            `COALESCE("${TableName.InternalCertificateAuthority}"."notBefore", "${TableName.Certificate}"."notBefore") as "notBefore"`
           ),
           db.raw(
-            `COALESCE("${TableName.CertificateAuthority}"."notAfter", "${TableName.Certificate}"."notAfter") as "notAfter"`
+            `COALESCE("${TableName.InternalCertificateAuthority}"."notAfter", "${TableName.Certificate}"."notAfter") as "notAfter"`
           ),
           db.raw(
-            `COALESCE("${TableName.CertificateAuthority}"."friendlyName", "${TableName.Certificate}"."friendlyName") as "friendlyName"`
+            `COALESCE("${TableName.InternalCertificateAuthority}"."friendlyName", "${TableName.Certificate}"."friendlyName") as "friendlyName"`
           )
         )
         .leftJoin(
@@ -41,6 +41,11 @@ export const pkiCollectionItemDALFactory = (db: TDbClient) => {
           `${TableName.PkiCollectionItem}.caId`,
           `${TableName.CertificateAuthority}.id`
         )
+        .leftJoin(
+          TableName.InternalCertificateAuthority,
+          `${TableName.PkiCollectionItem}.caId`,
+          `${TableName.InternalCertificateAuthority}.certificateAuthorityId`
+        )
         .leftJoin(TableName.Certificate, `${TableName.PkiCollectionItem}.certId`, `${TableName.Certificate}.id`)
         .where((builder) => {
           void builder.where(`${TableName.PkiCollectionItem}.pkiCollectionId`, collectionId);