From d529670a52703bfacb468ac6196567b38b9b1e99 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Fri, 16 Aug 2024 23:14:45 +0800 Subject: [PATCH] misc: addressed failing github actions --- .../20240815045235_add-certificate-template.ts | 12 ++++++------ .../certificate-authority-service.ts | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/db/migrations/20240815045235_add-certificate-template.ts b/backend/src/db/migrations/20240815045235_add-certificate-template.ts index b16c2bd14..7135c24e0 100644 --- a/backend/src/db/migrations/20240815045235_add-certificate-template.ts +++ b/backend/src/db/migrations/20240815045235_add-certificate-template.ts @@ -36,12 +36,6 @@ export async function up(knex: Knex): Promise { } export async function down(knex: Knex): Promise { - const hasCertificateTemplateTable = await knex.schema.hasTable(TableName.CertificateTemplate); - if (hasCertificateTemplateTable) { - await knex.schema.dropTable(TableName.CertificateTemplate); - await dropOnUpdateTrigger(knex, TableName.CertificateTemplate); - } - const doesCertificateTableHaveTemplateId = await knex.schema.hasColumn( TableName.Certificate, "certificateTemplateId" @@ -52,4 +46,10 @@ export async function down(knex: Knex): Promise { t.dropColumn("certificateTemplateId"); }); } + + const hasCertificateTemplateTable = await knex.schema.hasTable(TableName.CertificateTemplate); + if (hasCertificateTemplateTable) { + await knex.schema.dropTable(TableName.CertificateTemplate); + await dropOnUpdateTrigger(knex, TableName.CertificateTemplate); + } } diff --git a/backend/src/services/certificate-authority/certificate-authority-service.ts b/backend/src/services/certificate-authority/certificate-authority-service.ts index 345e2423d..32dbc8fd0 100644 --- a/backend/src/services/certificate-authority/certificate-authority-service.ts +++ b/backend/src/services/certificate-authority/certificate-authority-service.ts @@ -1218,7 +1218,7 @@ export const certificateAuthorityServiceFactory = ({ await certificateDAL.transaction(async (tx) => { const cert = await certificateDAL.create( { - caId: ca.id, + caId: (ca as TCertificateAuthorities).id, caCertId: caCert.id, certificateTemplateId: certificateTemplate?.id, status: CertStatus.ACTIVE, @@ -1474,7 +1474,7 @@ export const certificateAuthorityServiceFactory = ({ await certificateDAL.transaction(async (tx) => { const cert = await certificateDAL.create( { - caId: ca.id, + caId: (ca as TCertificateAuthorities).id, caCertId: caCert.id, certificateTemplateId: certificateTemplate?.id, status: CertStatus.ACTIVE,