From d483e70748a28faaacd02e45613d1010e442c90a Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Tue, 13 May 2025 10:44:28 -0400
Subject: [PATCH] review fixes

---
 ...429203304_certificates-ca-relation-removal.ts | 16 +++++++---------
 .../pki-subscriber/pki-subscriber-service.ts     |  6 ++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/src/db/migrations/20250429203304_certificates-ca-relation-removal.ts b/backend/src/db/migrations/20250429203304_certificates-ca-relation-removal.ts
index 411ef171e..1137b9ab8 100644
--- a/backend/src/db/migrations/20250429203304_certificates-ca-relation-removal.ts
+++ b/backend/src/db/migrations/20250429203304_certificates-ca-relation-removal.ts
@@ -6,22 +6,20 @@ export async function up(knex: Knex): Promise<void> {
   if (await knex.schema.hasTable(TableName.Certificate)) {
     const hasProjectIdColumn = await knex.schema.hasColumn(TableName.Certificate, "projectId");
     if (!hasProjectIdColumn) {
-      await knex.transaction(async (trx) => {
-        await trx.schema.alterTable(TableName.Certificate, (t) => {
-          t.string("projectId", 36).nullable();
-          t.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
-        });
+      await knex.schema.alterTable(TableName.Certificate, (t) => {
+        t.string("projectId", 36).nullable();
+        t.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
+      });
 
-        await trx.raw(`
+      await knex.raw(`
           UPDATE "${TableName.Certificate}" cert
           SET "projectId" = ca."projectId"
           FROM "${TableName.CertificateAuthority}" ca
           WHERE cert."caId" = ca.id
         `);
 
-        await trx.schema.alterTable(TableName.Certificate, (t) => {
-          t.string("projectId").notNullable().alter();
-        });
+      await knex.schema.alterTable(TableName.Certificate, (t) => {
+        t.string("projectId").notNullable().alter();
       });
     }
 
diff --git a/backend/src/services/pki-subscriber/pki-subscriber-service.ts b/backend/src/services/pki-subscriber/pki-subscriber-service.ts
index 5b15786b1..20a2d2551 100644
--- a/backend/src/services/pki-subscriber/pki-subscriber-service.ts
+++ b/backend/src/services/pki-subscriber/pki-subscriber-service.ts
@@ -449,7 +449,8 @@ export const pkiSubscriberServiceFactory = ({
           notBefore: notBeforeDate,
           notAfter: notAfterDate,
           keyUsages: selectedKeyUsages,
-          extendedKeyUsages: subscriber.extendedKeyUsages as CertExtendedKeyUsage[]
+          extendedKeyUsages: subscriber.extendedKeyUsages as CertExtendedKeyUsage[],
+          projectId
         },
         tx
       );
@@ -718,7 +719,8 @@ export const pkiSubscriberServiceFactory = ({
           notBefore: notBeforeDate,
           notAfter: notAfterDate,
           keyUsages: selectedKeyUsages,
-          extendedKeyUsages: selectedExtendedKeyUsages
+          extendedKeyUsages: selectedExtendedKeyUsages,
+          projectId
         },
         tx
       );