From 8ef79585d772e451046678d34feff66a6246bb80 Mon Sep 17 00:00:00 2001 From: devinleighsmith <41091511+devinleighsmith@users.noreply.github.com> Date: Thu, 4 Aug 2022 15:39:33 -0700 Subject: [PATCH] correct hardcoded query. (#1848) * correct hardcoded query. * bump uat version. * increment hotfix version. --- backend/api/Pims.Api.csproj | 4 +- .../LISDB_PIMS/LIS_DB_to_PIMS_DATASET_1.dtsx | 221 +++++++++--------- ...TI_LEGACY_LISDB_PIMS_DATA_MIGRATION.dtproj | 10 +- frontend/package.json | 2 +- 4 files changed, 121 insertions(+), 116 deletions(-) diff --git a/backend/api/Pims.Api.csproj b/backend/api/Pims.Api.csproj index 03d80855f5..4e047372b0 100644 --- a/backend/api/Pims.Api.csproj +++ b/backend/api/Pims.Api.csproj @@ -2,8 +2,8 @@ 0ef6255f-9ea0-49ec-8c65-c172304b4926 - 2.1.0-32.25 - 2.1.0.32 + 2.1.1-32.26 + 2.1.1.32 true 16BC0468-78F6-4C91-87DA-7403C919E646 diff --git a/etl/LISDB_PIMS/LISDB_PIMS/LIS_DB_to_PIMS_DATASET_1.dtsx b/etl/LISDB_PIMS/LISDB_PIMS/LIS_DB_to_PIMS_DATASET_1.dtsx index a4db8e4c29..f54f5915c8 100644 --- a/etl/LISDB_PIMS/LISDB_PIMS/LIS_DB_to_PIMS_DATASET_1.dtsx +++ b/etl/LISDB_PIMS/LISDB_PIMS/LIS_DB_to_PIMS_DATASET_1.dtsx @@ -7,13 +7,13 @@ DTS:CreatorName="MSI\fiera" DTS:DTSID="{4B2E793E-3853-46F6-8F50-5A21D250C1A9}" DTS:ExecutableType="Microsoft.Package" - DTS:LastModifiedProductVersion="15.0.2000.180" + DTS:LastModifiedProductVersion="15.0.2000.170" DTS:LocaleID="4105" DTS:ObjectName="Package1" DTS:PackageType="5" DTS:ProtectionLevel="0" - DTS:VersionBuild="378" - DTS:VersionGUID="{22F6DDB9-5D32-43CC-AAE8-5A922302C2E5}"> + DTS:VersionBuild="379" + DTS:VersionGUID="{FFB91B37-632E-4425-936A-7C438D56EF9C}"> 8 @@ -26,7 +26,7 @@ + DTS:ConnectionString="Data Source=sqltst2012.th.gov.bc.ca;Initial Catalog=LIS_Tst;Provider=SQLOLEDB.1;Integrated Security=SSPI;Application Name=SSIS-Package1-{A0A05C25-9FB9-4C46-960C-C299B79C75CA}sqltst2012.th.gov.bc.ca.LIS_Tst;" /> - - + DTS:ConnectionString="Data Source=localhost,5433;User ID=admin;Initial Catalog=pims;Provider=SQLNCLI11.1;Persist Security Info=True;Auto Translate=False;" /> @@ -10090,109 +10086,109 @@ FROM t_leasing l JOIN t_fileSubLookup fsl ON l.FileSubLookup_Id=fsl.FileSubLooku startId="Package\Main Flow 1\LOAD LEASES\Amount to Currency.Outputs[Data Conversion Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\OTHER for no match 2.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\OTHER for PURPOSE CODE.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\OTHER for no match.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Handle "Nominal".Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\PSFile_No_Null.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Replace Nulls.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\TFA_File_Number_null.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Get PID.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Audit Trail.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\MOTI NAME LOOKUP TAG.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\PMT_FRQ_TP, PRGRM_TP, LS_NTS.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Handle Remaining Not Null.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Derived Column.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Set expired bit.Outputs[Derived Column Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\TFA_File_Number.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\MOTI NAME ID from PIMS PERSON.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\PSFile_No.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Lookup Purpose Code.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Lookup Category Code.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\PIMS_LEASE_PURPOSE_TYPE.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\LEASE_CATEGORY_TYPE.Outputs[Lookup Match Output]" /> + startId="Package\Main Flow 1\LOAD LEASES\Union All.Outputs[Union All Output 1]" /> + startId="Package\Main Flow 1\LOAD LEASES\Union All 1.Outputs[Union All Output 1]" /> + startId="Package\Main Flow 1\LOAD LEASES\Union All 3.Outputs[Union All Output 1]" /> dataType="System.String" description="The SQL command to be executed." name="SqlCommand" - UITypeEditor="Microsoft.DataTransformationServices.Controls.ModalMultilineStringEditor, Microsoft.DataTransformationServices.Controls, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">SELECT l.Start_Date,l.Expiry_Date,cast(l.lease_id as bigint) LeaseID, fs.PID -FROM LIS_DEV.dbo.t_leasing l -JOIN LIS_DEV.dbo.t_fileSubLookup fsl ON l.FileSubLookup_Id=fsl.FileSubLookup_Id -JOIN LIS_DEV.dbo.t_fileSub fs ON fsl.FileSubLookup_Id = fs.FileSubLookup_Id + UITypeEditor="Microsoft.DataTransformationServices.Controls.ModalMultilineStringEditor, Microsoft.DataTransformationServices.Controls, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">SELECT l.Insurance_Start_Date Start_Date,l.Insurance_End_Date Expiry_Date,cast(l.lease_id as bigint) LeaseID, fs.PID +FROM dbo.t_leasing l +JOIN dbo.t_fileSubLookup fsl ON l.FileSubLookup_Id=fsl.FileSubLookup_Id +JOIN dbo.t_fileSub fs ON fsl.FileSubLookup_Id = fs.FileSubLookup_Id +where l.Insurance_Start_Date is not null or l.Insurance_End_Date is not null + + + + DataSourceViewID + + + diff --git a/etl/LISDB_PIMS/LISDB_PIMS/MOTI_LEGACY_LISDB_PIMS_DATA_MIGRATION.dtproj b/etl/LISDB_PIMS/LISDB_PIMS/MOTI_LEGACY_LISDB_PIMS_DATA_MIGRATION.dtproj index 1b033c4f35..84b0f2ede2 100644 --- a/etl/LISDB_PIMS/LISDB_PIMS/MOTI_LEGACY_LISDB_PIMS_DATA_MIGRATION.dtproj +++ b/etl/LISDB_PIMS/LISDB_PIMS/MOTI_LEGACY_LISDB_PIMS_DATA_MIGRATION.dtproj @@ -1,7 +1,7 @@  Project - 15.0.2000.180 + 15.0.2000.170 9.0.1.0 $base64$PFNvdXJjZUNvbnRyb2xJbmZvIHhtbG5zOnhzZD0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zOmRkbDI9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDAzL2VuZ2luZS8yIiB4bWxuczpkZGwyXzI9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDAzL2VuZ2luZS8yLzIiIHhtbG5zOmRkbDEwMF8xMDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDA4L2VuZ2luZS8xMDAvMTAwIiB4bWxuczpkZGwyMDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDEwL2VuZ2luZS8yMDAiIHhtbG5zOmRkbDIwMF8yMDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDEwL2VuZ2luZS8yMDAvMjAwIiB4bWxuczpkZGwzMDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDExL2VuZ2luZS8zMDAiIHhtbG5zOmRkbDMwMF8zMDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDExL2VuZ2luZS8zMDAvMzAwIiB4bWxuczpkZGw0MDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDEyL2VuZ2luZS80MDAiIHhtbG5zOmRkbDQwMF80MDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDEyL2VuZ2luZS80MDAvNDAwIiB4bWxuczpkZGw1MDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDEzL2VuZ2luZS81MDAiIHhtbG5zOmRkbDUwMF81MDA9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vYW5hbHlzaXNzZXJ2aWNlcy8yMDEzL2VuZ2luZS81MDAvNTAwIiB4bWxuczpkd2Q9Imh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vRGF0YVdhcmVob3VzZS9EZXNpZ25lci8xLjAiPg0KICA8RW5hYmxlZD5mYWxzZTwvRW5hYmxlZD4NCiAgPFByb2plY3ROYW1lPjwvUHJvamVjdE5hbWU+DQogIDxBdXhQYXRoPjwvQXV4UGF0aD4NCiAgPExvY2FsUGF0aD48L0xvY2FsUGF0aD4NCiAgPFByb3ZpZGVyPjwvUHJvdmlkZXI+DQo8L1NvdXJjZUNvbnRyb2xJbmZvPg== @@ -41,10 +41,10 @@ Package1 1 0 - 378 + 379 - {22F6DDB9-5D32-43CC-AAE8-5A922302C2E5} + {FFB91B37-632E-4425-936A-7C438D56EF9C} 8 @@ -77,7 +77,7 @@ 0 0 0 - Data Source=sqldevtst.th.gov.bc.ca;Initial Catalog=LIS_Tst;Provider=SQLOLEDB.1;Integrated Security=SSPI;Application Name=SSIS-Package1-{A0A05C25-9FB9-4C46-960C-C299B79C75CA}sqltst2012.th.gov.bc.ca.LIS_Tst; + Data Source=sqltst2012.th.gov.bc.ca;Initial Catalog=LIS_Tst;Provider=SQLOLEDB.1;Integrated Security=SSPI;Application Name=SSIS-Package1-{A0A05C25-9FB9-4C46-960C-C299B79C75CA}sqltst2012.th.gov.bc.ca.LIS_Tst; 18 @@ -181,7 +181,7 @@ 0 0 0 - sqldevtst.th.gov.bc.ca + sqltst2012.th.gov.bc.ca 18 diff --git a/frontend/package.json b/frontend/package.json index 6dc18d81e7..92794cb6f0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "2.1.0-32.25", + "version": "2.1.1-32.26", "private": true, "dependencies": { "@bcgov/bc-sans": "1.0.1",