Skip to content

Commit

Permalink
Merge pull request #4881 from bcgov/test-shiva-4707-marshal
Browse files Browse the repository at this point in the history
Test shiva 4707 marshal - Remove Master Data ENUM Identifier and use Data labelling
  • Loading branch information
divyav-aot authored Dec 12, 2023
2 parents 1091827 + 12cfdab commit 0f25791
Show file tree
Hide file tree
Showing 69 changed files with 2,074 additions and 563 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
DTS:LocaleID="1033"
DTS:ObjectName="ApplicantRequestMappings"
DTS:PackageType="5"
DTS:VersionBuild="64"
DTS:VersionGUID="{E74162C7-CB89-4371-98DA-C1E08F361BDA}">
DTS:VersionBuild="65"
DTS:VersionGUID="{9F68B623-DB01-4BE6-99AD-D0EF1C647FB7}">
<DTS:Property
DTS:Name="PackageFormatVersion">8</DTS:Property>
<DTS:Variables>
Expand Down Expand Up @@ -62,7 +62,7 @@
<DTS:ObjectData>
<SQLTask:SqlTaskData
SQLTask:Connection="{FA877C17-9970-459F-BFAC-AC1E9E4433B6}"
SQLTask:SqlStatementSource="SELECT &#x9;&#x9;&#x9;&#x9; (SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = requestTypes.iLabelID and terminology.tiLocaleID = 1) as requestType, &#x9;&#x9;&#x9;&#x9; convert(varchar, requests.sdtRequestedDate,120) as receivedDate, &#x9;&#x9;&#x9;&#x9; requests.vcDescription as requestdescription, &#x9;&#x9;&#x9;&#x9; convert(varchar,requests.sdtRqtDescFromdate,120) as reqDescriptionFromDate, &#x9;&#x9;&#x9;&#x9; convert(varchar,requests.sdtRqtDescTodate,120) as reqDescriptionToDate, &#x9;&#x9;&#x9;&#x9; (SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = deliveryModes.iLabelID and terminology.tiLocaleID = 1) as deliveryMode, &#x9;&#x9;&#x9;&#x9; (SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = receivedModes.iLabelID and terminology.tiLocaleID = 1) as receivedMode,&#x9;&#x9;&#x9;&#x9; &#x9;&#x9;&#x9;&#x9; requesterTypes.vcDescription as category, &#x9;&#x9;&#x9;&#x9;requests.vcVisibleRequestID as filenumber FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesterTypes requesterTypes WITH (NOLOCK) ON requests.tiRequesterCategoryID = requesterTypes.tiRequesterTypeID &#x9;&#x9;&#x9;&#x9; LEFT OUTER JOIN tblRequestStatuses requeststatuses WITH (NOLOCK) on requests.irequeststatusid = requeststatuses.irequeststatusid LEFT OUTER JOIN tblReceivedModes receivedModes WITH (NOLOCK) ON requests.tiReceivedType = receivedModes.tiReceivedModeID LEFT OUTER JOIN tblDeliveryModes deliveryModes WITH (NOLOCK) ON requests.tiDeliveryType = deliveryModes.tiDeliveryModeID LEFT OUTER JOIN tblRequestTypes requestTypes WITH (NOLOCK) ON requests.tiRequestTypeID = requestTypes.tiRequestTypeID WHERE vcVisibleRequestID IN ('CFD-2022-20261', 'CFD-2021-14313','CFD-2021-12866' , 'CFD-2021-12905', 'CFD-2021-12651') AND &#x9;&#x9;&#x9;&#x9; &#x9;&#x9;&#x9;&#x9; office.OFFICE_CODE = 'CFD' &#x9;&#x9;&#x9;&#x9; &#x9;&#x9;&#x9;&#x9;AND requests.vcRequestStatus NOT IN ('Closed') GROUP BY requests.vcVisibleRequestID,requests.vcRequestStatus,requeststatuses.vcRequestStatus,requests.sdtReceivedDate, requests.sdtTargetDate, requests.sdtOriginalTargetDate, requests.vcDescription, requests.sdtRqtDescFromdate, requests.sdtRqtDescTodate, requests.sdtRequestedDate, office.OFFICE_CODE, requesterTypes.vcDescription, receivedModes.iLabelID, deliveryModes.iLabelID, requests.iRequestID, requestTypes.iLabelID, requests.vcVisibleRequestID, requests.tiOfficeID, office.OFFICE_ID"
SQLTask:SqlStatementSource="SELECT &#x9;(SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = requestTypes.iLabelID and terminology.tiLocaleID = 1) as requestType, &#x9;convert(varchar, requests.sdtRequestedDate,120) as receivedDate, &#x9;requests.vcDescription as requestdescription, &#x9;&#x9; convert(varchar,ISNULL(requests.sdtRqtDescFromdate,''),120) as reqDescriptionFromDate, &#x9;convert(varchar,ISNULL(requests.sdtRqtDescTodate,''),120) as reqDescriptionToDate, &#x9;(SELECT terminology.vcTerminology from tblTerminologyLookup terminology WHERE terminology.iLabelID = deliveryModes.iLabelID and terminology.tiLocaleID = 1) as deliveryMode, &#x9;ISNULL((SELECT REPLACE(terminology.vcTerminology,'-','') from tblTerminologyLookup terminology WHERE terminology.iLabelID = receivedModes.iLabelID and terminology.tiLocaleID = 1),'Email') as receivedMode, &#x9;requesterTypes.vcDescription as category, &#x9;requests.vcVisibleRequestID as filenumber FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesterTypes requesterTypes WITH (NOLOCK) ON requests.tiRequesterCategoryID = requesterTypes.tiRequesterTypeID LEFT OUTER JOIN tblRequestStatuses requeststatuses WITH (NOLOCK) on requests.irequeststatusid = requeststatuses.irequeststatusid LEFT OUTER JOIN tblReceivedModes receivedModes WITH (NOLOCK) ON requests.tiReceivedType = receivedModes.tiReceivedModeID LEFT OUTER JOIN tblDeliveryModes deliveryModes WITH (NOLOCK) ON requests.tiDeliveryType = deliveryModes.tiDeliveryModeID LEFT OUTER JOIN tblRequestTypes requestTypes WITH (NOLOCK) ON requests.tiRequestTypeID = requestTypes.tiRequestTypeID WHERE vcVisibleRequestID IN ('CFD-2020-03214','CFD-2020-03700','CFD-2021-10406','CFD-2021-10681','CFD-2021-10702','CFD-2021-10798','CFD-2021-10822','CFD-2021-11012','CFD-2021-11041','CFD-2021-11178','CFD-2021-11197','CFD-2021-11211','CFD-2021-11289','CFD-2021-11430','CFD-2021-11528','CFD-2021-11544','CFD-2021-11548','CFD-2021-11646','CFD-2021-11660','CFD-2021-11669','CFD-2021-11682','CFD-2021-11852','CFD-2021-11857','CFD-2021-11941','CFD-2021-11993','CFD-2021-12019','CFD-2021-12022','CFD-2021-12026','CFD-2021-12033','CFD-2021-12044','CFD-2021-12061','CFD-2021-12062','CFD-2021-12120','CFD-2021-12125','CFD-2021-12167','CFD-2021-12170','CFD-2021-12362','CFD-2021-12371','CFD-2021-12405','CFD-2021-12408','CFD-2021-12457','CFD-2021-12520','CFD-2021-12544','CFD-2021-12573','CFD-2021-12592','CFD-2021-12699','CFD-2021-12705','CFD-2021-12828','CFD-2021-12851','CFD-2021-12866','CFD-2021-12869','CFD-2021-12871','CFD-2021-12879','CFD-2021-12905','CFD-2021-12919','CFD-2021-12949','CFD-2021-12968','CFD-2021-12990','CFD-2021-12997','CFD-2021-13018','CFD-2021-13021','CFD-2021-13081','CFD-2021-13088','CFD-2021-13116','CFD-2021-13124','CFD-2021-13135','CFD-2021-13183','CFD-2021-13289','CFD-2021-13298','CFD-2021-13300','CFD-2021-13308','CFD-2021-13406','CFD-2021-13410','CFD-2021-13411','CFD-2021-13414','CFD-2021-13421','CFD-2021-13505','CFD-2021-13532','CFD-2021-13545','CFD-2021-13581','CFD-2021-13589','CFD-2021-13631','CFD-2021-13633','CFD-2021-13640','CFD-2021-13678','CFD-2021-13683','CFD-2021-13741','CFD-2021-13778','CFD-2021-13780','CFD-2021-13795','CFD-2021-13798','CFD-2021-13834','CFD-2021-13856','CFD-2021-13927','CFD-2021-13935','CFD-2021-13965','CFD-2021-13984','CFD-2021-14015','CFD-2021-14016','CFD-2021-14019','CFD-2021-14023','CFD-2021-14031','CFD-2021-14065','CFD-2021-14081','CFD-2021-14084','CFD-2021-14129','CFD-2021-14189','CFD-2021-14213','CFD-2021-14221','CFD-2021-14248','CFD-2021-14313','CFD-2021-14314','CFD-2021-14317','CFD-2021-14340','CFD-2021-14366','CFD-2021-14381','CFD-2021-14415','CFD-2021-14435','CFD-2021-14467') AND office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed','Completed') GROUP BY requests.vcVisibleRequestID,requests.vcRequestStatus,requeststatuses.vcRequestStatus,requests.sdtReceivedDate, requests.sdtTargetDate, requests.sdtOriginalTargetDate, requests.vcDescription, requests.sdtRqtDescFromdate, requests.sdtRqtDescTodate, requests.sdtRequestedDate, office.OFFICE_CODE, requesterTypes.vcDescription, receivedModes.iLabelID, deliveryModes.iLabelID,requests.iRequestID, requestTypes.iLabelID, requests.vcVisibleRequestID, requests.tiOfficeID, office.OFFICE_ID"
SQLTask:ResultType="ResultSetType_Rowset" xmlns:SQLTask="www.microsoft.com/sqlserver/dts/tasks/sqltask">
<SQLTask:ResultBinding
SQLTask:ResultName="0"
Expand Down Expand Up @@ -166,7 +166,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="EST_Applicant"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="1">
DTS:ThreadHint="0">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -200,7 +200,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="Execute SQL Task"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="0">
DTS:ThreadHint="2">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -261,12 +261,12 @@
DTS:LocaleID="-1"
DTS:ObjectName="EST_getrequestapplicantid"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="1">
DTS:ThreadHint="0">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
SQLTask:Connection="{18EF9DFD-37E1-484D-9BC1-BFE418845E48}"
SQLTask:SqlStatementSource="SELECT foirequestapplicantid FROM public.&quot;FOIRequestApplicants&quot; WHERE migrationreference IS NOT NULL and &#xA;position(migrationreference in ? )&gt;0 and firstname = ? and lastname=?"
SQLTask:SqlStatementSource="SELECT foirequestapplicantid FROM public.&quot;FOIRequestApplicants&quot; WHERE migrationreference IS NOT NULL and &#xA;position(? in migrationreference )&gt;0 and firstname = ? and lastname=?"
SQLTask:ResultType="ResultSetType_SingleRow" xmlns:SQLTask="www.microsoft.com/sqlserver/dts/tasks/sqltask">
<SQLTask:ResultBinding
SQLTask:ResultName="1"
Expand Down Expand Up @@ -301,7 +301,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="insertapplicantrequestmapping_behalf"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="1">
DTS:ThreadHint="0">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -343,7 +343,7 @@
DTS:LocaleID="-1"
DTS:ObjectName="insertapplicantrequestmapping_mainapplicant"
DTS:TaskContact="Execute SQL Task; Microsoft Corporation; SQL Server 2019; © 2019 Microsoft Corporation; All Rights Reserved;http://www.microsoft.com/sql/support/default.asp;1"
DTS:ThreadHint="2">
DTS:ThreadHint="1">
<DTS:Variables />
<DTS:ObjectData>
<SQLTask:SqlTaskData
Expand Down Expand Up @@ -464,27 +464,27 @@
<GraphLayout
Capacity="16" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph" xmlns:mssgle="clr-namespace:Microsoft.SqlServer.Graph.LayoutEngine;assembly=Microsoft.SqlServer.Graph" xmlns:assembly="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mssgm="clr-namespace:Microsoft.SqlServer.Graph.Model;assembly=Microsoft.SqlServer.Graph">
<NodeLayout
Size="170,42"
Size="169.6,41.6"
Id="Package\Execute SQL Task"
TopLeft="485,133" />
<NodeLayout
Size="179,42"
Size="179.2,41.6"
Id="Package\Foreach Loop Container\EST_Applicant"
TopLeft="303,39" />
<NodeLayout
Size="170,42"
Size="169.6,41.6"
Id="Package\Foreach Loop Container\Execute SQL Task"
TopLeft="59,39" />
<NodeLayout
Size="170,42"
Size="169.6,41.6"
Id="Package\Foreach Loop Container\forach_applicantsonrequest\EST_getrequestapplicantid"
TopLeft="172,28" />
<NodeLayout
Size="229,42"
Size="228.8,41.6"
Id="Package\Foreach Loop Container\forach_applicantsonrequest\insertapplicantrequestmapping_behalf"
TopLeft="302,106" />
<NodeLayout
Size="229,42"
Size="228.8,41.6"
Id="Package\Foreach Loop Container\forach_applicantsonrequest\insertapplicantrequestmapping_mainapplicant"
TopLeft="32,110" />
<EdgeLayout
Expand Down Expand Up @@ -562,8 +562,8 @@
<ContainerLayout
HeaderHeight="43"
IsExpanded="True"
PanelSize="551,244"
Size="551,287"
PanelSize="551.2,244"
Size="551.2,287.2"
Id="Package\Foreach Loop Container\forach_applicantsonrequest"
TopLeft="227,162" />
<EdgeLayout
Expand Down Expand Up @@ -603,8 +603,8 @@
<ContainerLayout
HeaderHeight="43"
IsExpanded="True"
PanelSize="783,504"
Size="783,547"
PanelSize="783.2,504"
Size="783.2,547.2"
Id="Package\Foreach Loop Container"
TopLeft="359,293" />
<EdgeLayout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
DTS:LocaleID="1033"
DTS:ObjectName="FOIApplicants"
DTS:PackageType="5"
DTS:VersionBuild="10"
DTS:VersionGUID="{80687E87-9503-4FF7-AB79-273F8A8AA4EF}">
DTS:VersionBuild="12"
DTS:VersionGUID="{57B2A59C-BDE3-4612-A3C1-13569FD94C0F}">
<DTS:Property
DTS:Name="PackageFormatVersion">8</DTS:Property>
<DTS:Variables>
Expand All @@ -25,7 +25,7 @@
DTS:Namespace="User"
DTS:ObjectName="applicantqueryparam">
<DTS:VariableValue
DTS:DataType="8">SELECT firstname,lastname,middleName,requesterid,CONVERT(varchar(MAX),'01-01-1900',120) as birthDate,businessName, GETDATE() as createdAt, 'cfdmigration' as createdBy,STRING_AGG(CAST(requestid as nvarchar(max)),', ') as requests ,MainApplicant FROM ( SELECT requesters.vcEmailID as email, requesters.iRequesterID as requesterid, requesters.vcFirstName as firstName, requesters.vcLastName as lastName, requesters.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, requesters.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 1 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters requesters WITH (NOLOCK) ON requests.iRequesterID = requesters.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON requesters.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') UNION ALL SELECT onbehalf.vcEmailID as email, onbehalf.iRequesterID as requesterid, onbehalf.vcFirstName as firstName, onbehalf.vcLastName as lastName, onbehalf.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, onbehalf.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 0 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters onbehalf WITH (NOLOCK) ON requests.iOnBehalfOf = onbehalf.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON onbehalf.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') and onbehalf.vcFirstName is NOT NULL ) AS T GROUP BY T.email,T.requesterid,T.firstname,T.lastname,T.middleName,T.requesterid,T.birthDate,T.businessName,T.MainApplicant ORDER BY T.firstname ASC</DTS:VariableValue>
DTS:DataType="8">SELECT firstname, lastname, middleName, requesterid, CONVERT(varchar(MAX),birthDate,120) as birthDate, businessName, GETDATE() as createdAt, 'cfdmigration' as createdBy, STRING_AGG(CAST(requestid as nvarchar(max)),', ') as requests , MainApplicant FROM ( SELECT requesters.vcEmailID as email, requesters.iRequesterID as requesterid, requesters.vcFirstName as firstName, requesters.vcLastName as lastName, requesters.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, requesters.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 1 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters requesters WITH (NOLOCK) ON requests.iRequesterID = requesters.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON requesters.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') UNION ALL SELECT onbehalf.vcEmailID as email, onbehalf.iRequesterID as requesterid, onbehalf.vcFirstName as firstName, onbehalf.vcLastName as lastName, onbehalf.vcMiddleName as middleName, requestorfields.CUSTOMFIELD35 as birthDate, onbehalf.vcCompany as businessName, requests.vcVisibleRequestID as requestid, 0 as MainApplicant FROM tblRequests requests WITH (NOLOCK) LEFT OUTER JOIN EC_OFFICE office WITH (NOLOCK) ON requests.tiOfficeID = office.OFFICE_ID LEFT OUTER JOIN tblRequesters onbehalf WITH (NOLOCK) ON requests.iOnBehalfOf = onbehalf.iRequesterID LEFT OUTER JOIN dbo.TBLREQUESTERCUSTOMFIELDS requestorfields WITH (NOLOCK) ON onbehalf.iRequesterID = requestorfields.IREQUESTERID WHERE office.OFFICE_CODE = 'CFD' AND requests.vcRequestStatus NOT IN ('Closed') AND requests.vcVisibleRequestID IN ('CFD-2021-12651','CFD-2023-30193') and onbehalf.vcFirstName is NOT NULL ) AS T GROUP BY T.email,T.requesterid,T.firstname,T.lastname,T.middleName,T.requesterid,T.birthDate,T.businessName,T.MainApplicant ORDER BY T.firstname ASC</DTS:VariableValue>
</DTS:Variable>
</DTS:Variables>
<DTS:Executables>
Expand Down Expand Up @@ -591,7 +591,7 @@
<GraphLayout
Capacity="4" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph">
<NodeLayout
Size="155,42"
Size="155.2,41.6"
Id="Package\Data Flow Task"
TopLeft="367,74" />
</GraphLayout>
Expand All @@ -603,13 +603,13 @@
<GraphLayout
Capacity="4" xmlns="clr-namespace:Microsoft.SqlServer.IntegrationServices.Designer.Model.Serialization;assembly=Microsoft.SqlServer.IntegrationServices.Graph" xmlns:mssgle="clr-namespace:Microsoft.SqlServer.Graph.LayoutEngine;assembly=Microsoft.SqlServer.Graph" xmlns:assembly="http://schemas.microsoft.com/winfx/2006/xaml">
<NodeLayout
Size="169,42"
Id="Package\Data Flow Task\ODBC Destination"
TopLeft="328,201" />
<NodeLayout
Size="157,42"
Size="156.8,41.6"
Id="Package\Data Flow Task\OLE DB Source"
TopLeft="327,37" />
<NodeLayout
Size="168.8,41.6"
Id="Package\Data Flow Task\ODBC Destination"
TopLeft="328,201" />
<EdgeLayout
Id="Package\Data Flow Task.Paths[OLE DB Source Output]"
TopLeft="409,79">
Expand Down
Loading

0 comments on commit 0f25791

Please sign in to comment.