From e60c4aa5598ce3a96191fbed8db8675b46f644cd Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Tue, 5 Nov 2024 13:08:03 -0800 Subject: [PATCH 1/9] Add third party liability --- vehicles/src/common/enum/icbc-third-party-liability.enum.ts | 4 ++++ vehicles/src/common/interface/permit.template.interface.ts | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 vehicles/src/common/enum/icbc-third-party-liability.enum.ts diff --git a/vehicles/src/common/enum/icbc-third-party-liability.enum.ts b/vehicles/src/common/enum/icbc-third-party-liability.enum.ts new file mode 100644 index 000000000..6c6f8706b --- /dev/null +++ b/vehicles/src/common/enum/icbc-third-party-liability.enum.ts @@ -0,0 +1,4 @@ +export enum ICBCThirdPartyLiability { + DANGEROUS_GOODS = 'DANGER', + GENERAL_GOODS = 'GENERAL', +} diff --git a/vehicles/src/common/interface/permit.template.interface.ts b/vehicles/src/common/interface/permit.template.interface.ts index 80093aed4..d04822eeb 100644 --- a/vehicles/src/common/interface/permit.template.interface.ts +++ b/vehicles/src/common/interface/permit.template.interface.ts @@ -1,3 +1,5 @@ +import { ICBCThirdPartyLiability } from "../enum/icbc-third-party-liability.enum"; + // Data used to populate a .docx template export interface PermitTemplateData { permitName: string; @@ -35,6 +37,7 @@ export interface PermitData { applicationNotes?: string; permittedCommodity?: PermittedCommodity; permittedRoute?: PermittedRoute; + thirdPartyLiability?: ICBCThirdPartyLiability; } interface VehicleConfiguration { From cf8aa8210bb060060318c4ed1a90b65e62fdda73 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 6 Nov 2024 09:04:29 -0800 Subject: [PATCH 2/9] Some minor corrections --- vehicles/src/common/enum/icbc-third-party-liability.enum.ts | 4 ---- vehicles/src/common/enum/third-party-liability.enum.ts | 4 ++++ vehicles/src/common/interface/permit.template.interface.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 vehicles/src/common/enum/icbc-third-party-liability.enum.ts create mode 100644 vehicles/src/common/enum/third-party-liability.enum.ts diff --git a/vehicles/src/common/enum/icbc-third-party-liability.enum.ts b/vehicles/src/common/enum/icbc-third-party-liability.enum.ts deleted file mode 100644 index 6c6f8706b..000000000 --- a/vehicles/src/common/enum/icbc-third-party-liability.enum.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum ICBCThirdPartyLiability { - DANGEROUS_GOODS = 'DANGER', - GENERAL_GOODS = 'GENERAL', -} diff --git a/vehicles/src/common/enum/third-party-liability.enum.ts b/vehicles/src/common/enum/third-party-liability.enum.ts new file mode 100644 index 000000000..49c30d03f --- /dev/null +++ b/vehicles/src/common/enum/third-party-liability.enum.ts @@ -0,0 +1,4 @@ +export enum ThirdPartyLiability { + DANGEROUS_GOODS = 'DANGEROUS_GOODS', + GENERAL_GOODS = 'GENERAL_GOODS', +} diff --git a/vehicles/src/common/interface/permit.template.interface.ts b/vehicles/src/common/interface/permit.template.interface.ts index d04822eeb..de10d8ccf 100644 --- a/vehicles/src/common/interface/permit.template.interface.ts +++ b/vehicles/src/common/interface/permit.template.interface.ts @@ -1,4 +1,4 @@ -import { ICBCThirdPartyLiability } from "../enum/icbc-third-party-liability.enum"; +import { ThirdPartyLiability } from "../enum/third-party-liability.enum"; // Data used to populate a .docx template export interface PermitTemplateData { @@ -37,7 +37,7 @@ export interface PermitData { applicationNotes?: string; permittedCommodity?: PermittedCommodity; permittedRoute?: PermittedRoute; - thirdPartyLiability?: ICBCThirdPartyLiability; + thirdPartyLiability?: ThirdPartyLiability; } interface VehicleConfiguration { From 16050bc17fa49b4e2fe3af939754965f247a1a17 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 6 Nov 2024 09:05:18 -0800 Subject: [PATCH 3/9] code comment --- vehicles/src/common/enum/third-party-liability.enum.ts | 3 +++ vehicles/src/common/interface/permit.template.interface.ts | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vehicles/src/common/enum/third-party-liability.enum.ts b/vehicles/src/common/enum/third-party-liability.enum.ts index 49c30d03f..66796cfb8 100644 --- a/vehicles/src/common/enum/third-party-liability.enum.ts +++ b/vehicles/src/common/enum/third-party-liability.enum.ts @@ -1,3 +1,6 @@ +/** + * Third Party Liability for Non resident ICBC permits + */ export enum ThirdPartyLiability { DANGEROUS_GOODS = 'DANGEROUS_GOODS', GENERAL_GOODS = 'GENERAL_GOODS', diff --git a/vehicles/src/common/interface/permit.template.interface.ts b/vehicles/src/common/interface/permit.template.interface.ts index de10d8ccf..1e66955ab 100644 --- a/vehicles/src/common/interface/permit.template.interface.ts +++ b/vehicles/src/common/interface/permit.template.interface.ts @@ -1,4 +1,4 @@ -import { ThirdPartyLiability } from "../enum/third-party-liability.enum"; +import { ThirdPartyLiability } from '../enum/third-party-liability.enum'; // Data used to populate a .docx template export interface PermitTemplateData { @@ -37,6 +37,9 @@ export interface PermitData { applicationNotes?: string; permittedCommodity?: PermittedCommodity; permittedRoute?: PermittedRoute; + /** + * Third Party Liability for Non resident ICBC permits + */ thirdPartyLiability?: ThirdPartyLiability; } From aa1f13417601f43a4ddc77feae52915bc8932e95 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 6 Nov 2024 11:27:12 -0800 Subject: [PATCH 4/9] Update Permit Type enum and ddl scripts --- .../versions/revert/v_47_ddl_revert.sql | 20 +++++++++ database/mssql/scripts/versions/v_47_ddl.sql | 43 +++++++++++++++++++ database/mssql/test/versions/v_47_1_test.sql | 6 +++ database/mssql/test/versions/v_47_test.sh | 16 +++++++ vehicles/src/common/enum/permit-type.enum.ts | 2 + 5 files changed, 87 insertions(+) create mode 100644 database/mssql/scripts/versions/revert/v_47_ddl_revert.sql create mode 100644 database/mssql/scripts/versions/v_47_ddl.sql create mode 100644 database/mssql/test/versions/v_47_1_test.sql create mode 100644 database/mssql/test/versions/v_47_test.sh diff --git a/database/mssql/scripts/versions/revert/v_47_ddl_revert.sql b/database/mssql/scripts/versions/revert/v_47_ddl_revert.sql new file mode 100644 index 000000000..d92e75bb8 --- /dev/null +++ b/database/mssql/scripts/versions/revert/v_47_ddl_revert.sql @@ -0,0 +1,20 @@ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +SET NOCOUNT ON +GO + +SET XACT_ABORT ON +GO +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE +BEGIN TRANSACTION +GO + +DELETE FROM [permit].[ORBC_PERMIT_TYPE] WHERE PERMIT_TYPE IN ('QRFR', 'STFR') +GO + +DECLARE @VersionDescription VARCHAR(255) +SET @VersionDescription = 'Reverting adding QRFR and STFR permit types to ORBC_PERMIT_TYPE table' + +INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (46, @VersionDescription, getutcdate()) diff --git a/database/mssql/scripts/versions/v_47_ddl.sql b/database/mssql/scripts/versions/v_47_ddl.sql new file mode 100644 index 000000000..3d7677413 --- /dev/null +++ b/database/mssql/scripts/versions/v_47_ddl.sql @@ -0,0 +1,43 @@ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +SET NOCOUNT ON +GO + +SET XACT_ABORT ON +GO +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE +GO +BEGIN TRANSACTION +GO +IF @@ERROR <> 0 SET NOEXEC ON +GO + +INSERT [permit].[ORBC_PERMIT_TYPE] ([PERMIT_TYPE], [NAME], [CONCURRENCY_CONTROL_NUMBER], [DB_CREATE_USERID], [DB_CREATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [DB_LAST_UPDATE_TIMESTAMP]) VALUES (N'QRFR', N'Non-Resident Quarterly ICBC Basic Insurance (FR)', NULL, N'dbo', CAST(N'2024-11-06T21:30:33.6366667' AS DateTime2), N'dbo', CAST(N'2024-11-06TT21:30:33.6366667' AS DateTime2)) +INSERT [permit].[ORBC_PERMIT_TYPE] ([PERMIT_TYPE], [NAME], [CONCURRENCY_CONTROL_NUMBER], [DB_CREATE_USERID], [DB_CREATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [DB_LAST_UPDATE_TIMESTAMP]) VALUES (N'STFR', N'Non-Resident Single Trip ICBC Basic Insurance (FR)', NULL, N'dbo', CAST(N'2024-11-06T21:30:33.6366667' AS DateTime2), N'dbo', CAST(N'2024-11-06TT21:30:33.6366667' AS DateTime2)) + +IF @@ERROR <> 0 SET NOEXEC ON +GO + + +DECLARE @VersionDescription VARCHAR(255) +SET @VersionDescription = 'Add QRFR and STFR permit types to ORBC_PERMIT_TYPE table' + +INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (46, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate()) +IF @@ERROR <> 0 SET NOEXEC ON +GO + +COMMIT TRANSACTION +GO +IF @@ERROR <> 0 SET NOEXEC ON +GO +DECLARE @Success AS BIT +SET @Success = 1 +SET NOEXEC OFF +IF (@Success = 1) PRINT 'The database update succeeded' +ELSE BEGIN + IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION + PRINT 'The database update failed' +END +GO \ No newline at end of file diff --git a/database/mssql/test/versions/v_47_1_test.sql b/database/mssql/test/versions/v_47_1_test.sql new file mode 100644 index 000000000..33a04ed57 --- /dev/null +++ b/database/mssql/test/versions/v_47_1_test.sql @@ -0,0 +1,6 @@ +SET NOCOUNT ON +IF OBJECT_ID('[$(DB_NAME)].[permit].[ORBC_GL_TYPE]', 'U') IS NOT NULL +AND OBJECT_ID('[$(DB_NAME)].[permit].[ORBC_GL_CODE_TYPE]', 'U') IS NOT NULL + SELECT 1 +ELSE + SELECT 0 diff --git a/database/mssql/test/versions/v_47_test.sh b/database/mssql/test/versions/v_47_test.sh new file mode 100644 index 000000000..e43f1695a --- /dev/null +++ b/database/mssql/test/versions/v_47_test.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Retrieve arguments +source ${SCRIPT_DIR}/utility/getopt.sh +USAGE="-u USER -p PASS -s SERVER -d DATABASE" +parse_options "${USAGE}" ${@} + +# All database tests for database version 47 are run from this shell script. +# TESTS_DIR variable set by the calling test-runner script. + +TEST_47_1_RESULT=$(/opt/mssql-tools/bin/sqlcmd -U ${USER} -P "${PASS}" -S ${SERVER} -v DB_NAME=${DATABASE} -h -1 -i ${TESTS_DIR}/v_47_1_test.sql | xargs) +if [[ $TEST_47_1_RESULT -eq 1 ]]; then + echo "Test 47.1 passed: QRFR and STFR permit types exist." +else + echo "******** Test 47.1 failed: QRFR and STFR permit types do not exist." +fi diff --git a/vehicles/src/common/enum/permit-type.enum.ts b/vehicles/src/common/enum/permit-type.enum.ts index b332c90fb..4fbd1de85 100644 --- a/vehicles/src/common/enum/permit-type.enum.ts +++ b/vehicles/src/common/enum/permit-type.enum.ts @@ -22,6 +22,8 @@ export enum PermitType { SINGLE_TRIP_OVERWEIGHT_OVERSIZE = 'STWS', TERM_AXLE_OVERWEIGHT = 'TRAX', TERM_OVERWEIGHT = 'TROW', + NON_RESIDENT_QUARTERLY_ICBC_BASIC_INSURANCE_FR = 'QRFR', + NON_RESIDENT_SINGLE_TRIP_ICBC_BASIC_INSURANCE_FR = 'STFR', } export enum ExtendedPermitType { From fe411d4412f6fefa5dcb95beb0405cea05de54c5 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 6 Nov 2024 11:47:30 -0800 Subject: [PATCH 5/9] SQL test cases --- database/mssql/scripts/versions/v_47_ddl.sql | 2 +- database/mssql/test/versions/v_47_1_test.sql | 9 ++++----- database/mssql/test/versions/v_47_test.sh | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/database/mssql/scripts/versions/v_47_ddl.sql b/database/mssql/scripts/versions/v_47_ddl.sql index 3d7677413..44268c5db 100644 --- a/database/mssql/scripts/versions/v_47_ddl.sql +++ b/database/mssql/scripts/versions/v_47_ddl.sql @@ -40,4 +40,4 @@ ELSE BEGIN IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION PRINT 'The database update failed' END -GO \ No newline at end of file +GO diff --git a/database/mssql/test/versions/v_47_1_test.sql b/database/mssql/test/versions/v_47_1_test.sql index 33a04ed57..cea31b1dd 100644 --- a/database/mssql/test/versions/v_47_1_test.sql +++ b/database/mssql/test/versions/v_47_1_test.sql @@ -1,6 +1,5 @@ +-- Test that the auth groups have been inserted correctly SET NOCOUNT ON -IF OBJECT_ID('[$(DB_NAME)].[permit].[ORBC_GL_TYPE]', 'U') IS NOT NULL -AND OBJECT_ID('[$(DB_NAME)].[permit].[ORBC_GL_CODE_TYPE]', 'U') IS NOT NULL - SELECT 1 -ELSE - SELECT 0 + +SELECT COUNT(*) FROM $(DB_NAME).[permit].[ORBC_PERMIT_TYPE] +WHERE PERMIT_TYPE IN ('STFR', 'QRFR') \ No newline at end of file diff --git a/database/mssql/test/versions/v_47_test.sh b/database/mssql/test/versions/v_47_test.sh index e43f1695a..11856d3f8 100644 --- a/database/mssql/test/versions/v_47_test.sh +++ b/database/mssql/test/versions/v_47_test.sh @@ -9,7 +9,7 @@ parse_options "${USAGE}" ${@} # TESTS_DIR variable set by the calling test-runner script. TEST_47_1_RESULT=$(/opt/mssql-tools/bin/sqlcmd -U ${USER} -P "${PASS}" -S ${SERVER} -v DB_NAME=${DATABASE} -h -1 -i ${TESTS_DIR}/v_47_1_test.sql | xargs) -if [[ $TEST_47_1_RESULT -eq 1 ]]; then +if [[ $TEST_47_1_RESULT -eq 2 ]]; then echo "Test 47.1 passed: QRFR and STFR permit types exist." else echo "******** Test 47.1 failed: QRFR and STFR permit types do not exist." From b9ec85777c30efcfb6861a39c3addab81917b5a1 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 6 Nov 2024 11:54:10 -0800 Subject: [PATCH 6/9] End of line --- database/mssql/test/versions/v_47_1_test.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/mssql/test/versions/v_47_1_test.sql b/database/mssql/test/versions/v_47_1_test.sql index cea31b1dd..1a7a46339 100644 --- a/database/mssql/test/versions/v_47_1_test.sql +++ b/database/mssql/test/versions/v_47_1_test.sql @@ -2,4 +2,4 @@ SET NOCOUNT ON SELECT COUNT(*) FROM $(DB_NAME).[permit].[ORBC_PERMIT_TYPE] -WHERE PERMIT_TYPE IN ('STFR', 'QRFR') \ No newline at end of file +WHERE PERMIT_TYPE IN ('STFR', 'QRFR') From 06e33f0b33b0956b1e3da4fecba12d255d061c7d Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Fri, 8 Nov 2024 12:23:24 -0800 Subject: [PATCH 7/9] v47 to v48 --- .../revert/{v_47_ddl_revert.sql => v_48_ddl_revert.sql} | 2 +- database/mssql/scripts/versions/{v_47_ddl.sql => v_48_ddl.sql} | 0 .../mssql/test/versions/{v_47_1_test.sql => v_48_1_test.sql} | 0 database/mssql/test/versions/{v_47_test.sh => v_48_test.sh} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename database/mssql/scripts/versions/revert/{v_47_ddl_revert.sql => v_48_ddl_revert.sql} (87%) rename database/mssql/scripts/versions/{v_47_ddl.sql => v_48_ddl.sql} (100%) rename database/mssql/test/versions/{v_47_1_test.sql => v_48_1_test.sql} (100%) rename database/mssql/test/versions/{v_47_test.sh => v_48_test.sh} (100%) diff --git a/database/mssql/scripts/versions/revert/v_47_ddl_revert.sql b/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql similarity index 87% rename from database/mssql/scripts/versions/revert/v_47_ddl_revert.sql rename to database/mssql/scripts/versions/revert/v_48_ddl_revert.sql index d92e75bb8..a971470af 100644 --- a/database/mssql/scripts/versions/revert/v_47_ddl_revert.sql +++ b/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql @@ -17,4 +17,4 @@ GO DECLARE @VersionDescription VARCHAR(255) SET @VersionDescription = 'Reverting adding QRFR and STFR permit types to ORBC_PERMIT_TYPE table' -INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (46, @VersionDescription, getutcdate()) +INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (47, @VersionDescription, getutcdate()) diff --git a/database/mssql/scripts/versions/v_47_ddl.sql b/database/mssql/scripts/versions/v_48_ddl.sql similarity index 100% rename from database/mssql/scripts/versions/v_47_ddl.sql rename to database/mssql/scripts/versions/v_48_ddl.sql diff --git a/database/mssql/test/versions/v_47_1_test.sql b/database/mssql/test/versions/v_48_1_test.sql similarity index 100% rename from database/mssql/test/versions/v_47_1_test.sql rename to database/mssql/test/versions/v_48_1_test.sql diff --git a/database/mssql/test/versions/v_47_test.sh b/database/mssql/test/versions/v_48_test.sh similarity index 100% rename from database/mssql/test/versions/v_47_test.sh rename to database/mssql/test/versions/v_48_test.sh From 96aaaab3e84dca4512f96ae7019c438981e90123 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 8 Nov 2024 13:04:57 -0800 Subject: [PATCH 8/9] Update version numbers in scripts --- .../versions/revert/v_48_ddl_revert.sql | 20 +++++++++++++++++++ database/mssql/scripts/versions/v_48_ddl.sql | 9 +++------ database/mssql/test/versions/v_48_test.sh | 10 +++++----- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql b/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql index a971470af..73fc7ef67 100644 --- a/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql +++ b/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql @@ -14,7 +14,27 @@ GO DELETE FROM [permit].[ORBC_PERMIT_TYPE] WHERE PERMIT_TYPE IN ('QRFR', 'STFR') GO +IF @@ERROR <> 0 SET NOEXEC ON +GO + DECLARE @VersionDescription VARCHAR(255) SET @VersionDescription = 'Reverting adding QRFR and STFR permit types to ORBC_PERMIT_TYPE table' INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [RELEASE_DATE]) VALUES (47, @VersionDescription, getutcdate()) + +IF @@ERROR <> 0 SET NOEXEC ON +GO + +COMMIT TRANSACTION +GO +IF @@ERROR <> 0 SET NOEXEC ON +GO +DECLARE @Success AS BIT +SET @Success = 1 +SET NOEXEC OFF +IF (@Success = 1) PRINT 'The database revert succeeded' +ELSE BEGIN + IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION + PRINT 'The database revert failed' +END +GO \ No newline at end of file diff --git a/database/mssql/scripts/versions/v_48_ddl.sql b/database/mssql/scripts/versions/v_48_ddl.sql index 44268c5db..69b5b811e 100644 --- a/database/mssql/scripts/versions/v_48_ddl.sql +++ b/database/mssql/scripts/versions/v_48_ddl.sql @@ -11,20 +11,17 @@ SET TRANSACTION ISOLATION LEVEL SERIALIZABLE GO BEGIN TRANSACTION GO -IF @@ERROR <> 0 SET NOEXEC ON -GO -INSERT [permit].[ORBC_PERMIT_TYPE] ([PERMIT_TYPE], [NAME], [CONCURRENCY_CONTROL_NUMBER], [DB_CREATE_USERID], [DB_CREATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [DB_LAST_UPDATE_TIMESTAMP]) VALUES (N'QRFR', N'Non-Resident Quarterly ICBC Basic Insurance (FR)', NULL, N'dbo', CAST(N'2024-11-06T21:30:33.6366667' AS DateTime2), N'dbo', CAST(N'2024-11-06TT21:30:33.6366667' AS DateTime2)) -INSERT [permit].[ORBC_PERMIT_TYPE] ([PERMIT_TYPE], [NAME], [CONCURRENCY_CONTROL_NUMBER], [DB_CREATE_USERID], [DB_CREATE_TIMESTAMP], [DB_LAST_UPDATE_USERID], [DB_LAST_UPDATE_TIMESTAMP]) VALUES (N'STFR', N'Non-Resident Single Trip ICBC Basic Insurance (FR)', NULL, N'dbo', CAST(N'2024-11-06T21:30:33.6366667' AS DateTime2), N'dbo', CAST(N'2024-11-06TT21:30:33.6366667' AS DateTime2)) +INSERT [permit].[ORBC_PERMIT_TYPE] ([PERMIT_TYPE], [NAME]) VALUES (N'QRFR', N'Non-Resident Quarterly ICBC Basic Insurance (FR)') +INSERT [permit].[ORBC_PERMIT_TYPE] ([PERMIT_TYPE], [NAME]) VALUES (N'STFR', N'Non-Resident Single Trip ICBC Basic Insurance (FR)') IF @@ERROR <> 0 SET NOEXEC ON GO - DECLARE @VersionDescription VARCHAR(255) SET @VersionDescription = 'Add QRFR and STFR permit types to ORBC_PERMIT_TYPE table' -INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (46, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate()) +INSERT [dbo].[ORBC_SYS_VERSION] ([VERSION_ID], [DESCRIPTION], [UPDATE_SCRIPT], [REVERT_SCRIPT], [RELEASE_DATE]) VALUES (48, @VersionDescription, '$(UPDATE_SCRIPT)', '$(REVERT_SCRIPT)', getutcdate()) IF @@ERROR <> 0 SET NOEXEC ON GO diff --git a/database/mssql/test/versions/v_48_test.sh b/database/mssql/test/versions/v_48_test.sh index 11856d3f8..d9a61389d 100644 --- a/database/mssql/test/versions/v_48_test.sh +++ b/database/mssql/test/versions/v_48_test.sh @@ -5,12 +5,12 @@ source ${SCRIPT_DIR}/utility/getopt.sh USAGE="-u USER -p PASS -s SERVER -d DATABASE" parse_options "${USAGE}" ${@} -# All database tests for database version 47 are run from this shell script. +# All database tests for database version 48 are run from this shell script. # TESTS_DIR variable set by the calling test-runner script. -TEST_47_1_RESULT=$(/opt/mssql-tools/bin/sqlcmd -U ${USER} -P "${PASS}" -S ${SERVER} -v DB_NAME=${DATABASE} -h -1 -i ${TESTS_DIR}/v_47_1_test.sql | xargs) -if [[ $TEST_47_1_RESULT -eq 2 ]]; then - echo "Test 47.1 passed: QRFR and STFR permit types exist." +TEST_48_1_RESULT=$(/opt/mssql-tools/bin/sqlcmd -U ${USER} -P "${PASS}" -S ${SERVER} -v DB_NAME=${DATABASE} -h -1 -i ${TESTS_DIR}/v_48_1_test.sql | xargs) +if [[ $TEST_48_1_RESULT -eq 2 ]]; then + echo "Test 48.1 passed: QRFR and STFR permit types exist." else - echo "******** Test 47.1 failed: QRFR and STFR permit types do not exist." + echo "******** Test 48.1 failed: QRFR and STFR permit types do not exist." fi From f111b94898975c461c4103532f79f998cbaa5f37 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Fri, 8 Nov 2024 13:35:43 -0800 Subject: [PATCH 9/9] Commenting out deete statement --- .../scripts/versions/revert/v_48_ddl_revert.sql | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql b/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql index 73fc7ef67..48ab33189 100644 --- a/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql +++ b/database/mssql/scripts/versions/revert/v_48_ddl_revert.sql @@ -11,8 +11,21 @@ SET TRANSACTION ISOLATION LEVEL SERIALIZABLE BEGIN TRANSACTION GO -DELETE FROM [permit].[ORBC_PERMIT_TYPE] WHERE PERMIT_TYPE IN ('QRFR', 'STFR') -GO +/* +The following DELETE statement is intentionally commented out. +This is because, these permit types are a permanent part of the production db +and there is no expectation that they will be deleted at any point. + +If at all needed, the following query can be executed manually in prod at the team's discretion. + +IMPORTANT: Analyze the impact from foreign key constraints in child tables +before deleting the permit types. + +*/ + +-- DELETE FROM [permit].[ORBC_PERMIT_TYPE] WHERE PERMIT_TYPE IN ('QRFR', 'STFR') +-- GO + IF @@ERROR <> 0 SET NOEXEC ON GO