Skip to content

Merge hotfix release changes to RC #1768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnjuJose011 merged 20 commits into from
Apr 8, 2026
Merged

Merge hotfix release changes to RC #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9637fd2
TD-7057 remove ELFH tables, SP and references
OluwatobiAwe Mar 31, 2026
9948c98
TD-7070 dashboard script optimization
OluwatobiAwe Mar 31, 2026
4c7c019
.
OluwatobiAwe Apr 1, 2026
7ed48d9
TD-7051: LH prod db performance improvement and foreign key dependenc…
Mar 27, 2026
1d0b057
revert adf sp and table
OluwatobiAwe Apr 1, 2026
8816e27
update
OluwatobiAwe Apr 1, 2026
228ee4d
comment cleanup
OluwatobiAwe Apr 1, 2026
dd361b3
merge
OluwatobiAwe Apr 1, 2026
44f7f00
reverted dropped colomns
OluwatobiAwe Apr 1, 2026
8a544cd
.
OluwatobiAwe Apr 1, 2026
8af1a15
JSON_QUERY and OUTER APPLY replacement
OluwatobiAwe Apr 1, 2026
db7f8f7
Merge pull request #1759 from TechnologyEnhancedLearning/Develop/Fixe…
AnjuJose011 Apr 2, 2026
6cc359d
fixed build issue
OluwatobiAwe Apr 2, 2026
19574f6
Merge pull request #1758 from TechnologyEnhancedLearning/Develop/Fixe…
AnjuJose011 Apr 2, 2026
06c7d7a
Reposition join before variable use
OluwatobiAwe Apr 2, 2026
4c13e5d
Merge pull request #1760 from TechnologyEnhancedLearning/Develop/Fixe…
AnjuJose011 Apr 2, 2026
62b3c2c
Added missing section
OluwatobiAwe Apr 2, 2026
e108499
Merge pull request #1761 from TechnologyEnhancedLearning/Develop/Fixe…
AnjuJose011 Apr 2, 2026
ab425d2
query optimization to select a determined Id.
OluwatobiAwe Apr 7, 2026
0d30a33
Merge pull request #1762 from TechnologyEnhancedLearning/Develop/Fixe…
AnjuJose011 Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 13 additions & 144 deletions WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
<Folder Include="Scripts\Post-Deploy\Scripts" />
<Folder Include="Views" />
<Folder Include="Tables\Adf" />
<Folder Include="Stored Procedures\Adf" />
<Folder Include="Stored Procedures\Migration" />
<Folder Include="Tables\Messaging" />
<Folder Include="Stored Procedures\Messaging" />
Expand All @@ -101,9 +100,8 @@
<Folder Include="Triggers" />
<Folder Include="Triggers\external" />
<Folder Include="Stored Procedures\External" />
<Folder Include="Tables\Elfh" />
<Folder Include="Stored Procedures\Elfh" />
<Folder Include="Tables\Databricks" />
<Folder Include="Stored Procedures\Adf" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\learningHub_Data.sql" />
Expand Down Expand Up @@ -206,8 +204,6 @@
<None Include="Scripts\Pre-Deploy\Scripts\TD-2902 Add resource types to Content Server.sql" />
<None Include="Scripts\Post-Deploy\Scripts\TD-6109_Enable_CDC.sql" />
<None Include="Scripts\LH Database Scripts\Move CC resource to a custom catalogue.sql" />
<Build Include="Tables\Elfh\UserReportingUserTBL.sql" />
<Build Include="Tables\Elfh\MergeUserTBL.sql" />
<None Include="Scripts\Pre-Deploy\Scripts\TD-6159-turn-off-cdc.sql" />
<None Include="Scripts\Post-Deploy\Scripts\TD-6159-turn-on-cdc.sql" />
</ItemGroup>
Expand Down Expand Up @@ -325,13 +321,9 @@
<Build Include="Tables\Hub\NotificationTemplate.sql" />
<Build Include="Stored Procedures\Messaging\CreateNotificationForUser.sql" />
<Build Include="Stored Procedures\Messaging\CreateEmailForEmailAddress.sql" />
<Build Include="Schemas\adf.sql" />
<Build Include="Tables\Adf\Staging_Elfh_User.sql" />
<Build Include="Tables\Adf\Staging_Elfh_UserGroup.sql" />
<Build Include="Tables\Adf\Staging_Elfh_UserUserGroup.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUserGroups.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUsers.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUserUserGroups.sql" />
<Build Include="Tables\Adf\Unmapped_UserUserGroup.sql" />
<Build Include="Functions\Hub\fnSplit.sql" />
<Build Include="Functions\Hub\UserIsInRole.sql" />
Expand All @@ -343,7 +335,6 @@
<Build Include="Stored Procedures\Messaging\SetSendStatus.sql" />
<Build Include="Tables\Hub\UserProfile.sql" />
<Build Include="Tables\Adf\Staging_Elfh_UserProfile.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUserProfiles.sql" />
<Build Include="Stored Procedures\Hub\RestrictedCatalogueGetSummary.sql" />
<Build Include="Stored Procedures\Hub\RestrictedCatalogueGetAccessRequests.sql" />
<Build Include="Stored Procedures\Hub\RestrictedCatalogueGetUsers.sql" />
Expand Down Expand Up @@ -472,7 +463,6 @@
<Build Include="Stored Procedures\Activity\ScormActivityLaunch.sql" />
<None Include="Scripts\Post-Deploy\Scripts\RolePermissionForScormTraceWindow.sql" />
<Build Include="Tables\Adf\Staging_ElfhExternalSystemUser.sql" />
<Build Include="Stored Procedures\Adf\UpsertElfhExternalUsers.sql" />
<Build Include="Tables\Hub\BookmarkType.sql" />
<Build Include="Tables\Hub\UserBookmark.sql" />
<Build Include="Tables\Resource\ResourceReferenceEvent.sql" />
Expand Down Expand Up @@ -548,154 +538,33 @@
<Build Include="Stored Procedures\Activity\GetAssessmentActivityCompletionPercentage.sql" />
<Build Include="Tables\Hub\PasswordResetRequests.sql" />
<Build Include="Stored Procedures\External\ExternalSystemUserCreate.sql" />
<Build Include="Schemas\elfh.sql" />
<Build Include="Tables\Elfh\AttributeTBL.sql" />
<Build Include="Tables\Elfh\AttributeTypeTBL.sql" />
<Build Include="Tables\Elfh\CountryTBL.sql" />
<Build Include="Tables\Elfh\DeaneryTBL.sql" />
<Build Include="Tables\Elfh\EmailTemplateTBL.sql" />
<Build Include="Tables\Elfh\EmailTemplateTypeTBL.sql" />
<Build Include="Tables\Elfh\GdcRegister.sql" />
<Build Include="Tables\Elfh\GmcLrmp.sql" />
<Build Include="Tables\Elfh\GradeTBL.sql" />
<Build Include="Tables\Elfh\IpCountryLookupTBL.sql" />
<Build Include="Tables\Elfh\JobRoleTBL.sql" />
<Build Include="Tables\Elfh\Location.sql" />
<Build Include="Tables\Elfh\locationTypeTBL.sql" />
<Build Include="Tables\Elfh\LoginWizardRuleTBL.sql" />
<Build Include="Tables\Elfh\LoginWizardStageActivityTBL.sql" />
<Build Include="Tables\Elfh\loginWizardStageTBL.sql" />
<Build Include="Tables\Elfh\MedicalCouncilTBL.sql" />
<Build Include="Tables\Elfh\RegionTBL.sql" />
<Build Include="Tables\Elfh\SchoolTBL.sql" />
<Build Include="Tables\Elfh\SpecialtyTBL.sql" />
<Build Include="Tables\Elfh\StaffGroupTBL.sql" />
<Build Include="Tables\Elfh\SystemSettingTBL.sql" />
<Build Include="Tables\Elfh\TenantSmtpTBL.sql" />
<Build Include="Tables\Elfh\TenantTBL.sql" />
<Build Include="Tables\Elfh\TenantUrlTBL.sql" />
<Build Include="Tables\Elfh\TermsAndConditionsTBL.sql" />
<Build Include="Tables\Elfh\UserAttributeTBL.sql" />
<Build Include="Tables\Elfh\UserEmploymentTBL.sql" />
<Build Include="Tables\Elfh\UserGroupTypeInputValidationTBL.sql" />
<Build Include="Tables\Elfh\UserHistoryTBL.sql" />
<Build Include="Tables\Elfh\userHistoryTypeTBL.sql" />
<Build Include="Tables\Elfh\UserPasswordValidationTokenTBL.sql" />
<Build Include="Tables\Elfh\UserRoleUpgradeTBL.sql" />
<Build Include="Tables\Elfh\UserTermsAndConditionsTBL.sql" />
<Build Include="Stored Procedures\Elfh\LinkEmploymentRecordToUser.sql" />
<Build Include="Stored Procedures\Elfh\UserDetailForAuthenticationByUserName.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryAttributeSave.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryInsert.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryLoadForLearningHubUser.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryLoadForUser.sql" />
<Build Include="Stored Procedures\Activity\GetUserRecentLearningActivities.sql" />
<Build Include="Stored Procedures\Activity\GetUsersLearningHistory.sql" />
<Build Include="Stored Procedures\Activity\GetUsersLearningHistory_Search.sql" />
<Build Include="Stored Procedures\Resources\GetUsercertificateDetails.sql" />
<Build Include="Stored Procedures\Activity\GetUserInProgressLearningActivities.sql" />
<Build Include="Schemas\elfh.sql" />
<Build Include="Tables\Elfh\AttributeTBL.sql" />
<Build Include="Tables\Elfh\AttributeTypeTBL.sql" />
<Build Include="Tables\Elfh\CountryTBL.sql" />
<Build Include="Tables\Elfh\DeaneryTBL.sql" />
<Build Include="Tables\Elfh\EmailTemplateTBL.sql" />
<Build Include="Tables\Elfh\EmailTemplateTypeTBL.sql" />
<Build Include="Tables\Elfh\GdcRegister.sql" />
<Build Include="Tables\Elfh\GmcLrmp.sql" />
<Build Include="Tables\Elfh\GradeTBL.sql" />
<Build Include="Tables\Elfh\IpCountryLookupTBL.sql" />
<Build Include="Tables\Elfh\JobRoleTBL.sql" />
<Build Include="Tables\Elfh\Location.sql" />
<Build Include="Tables\Elfh\locationTypeTBL.sql" />
<Build Include="Tables\Elfh\LoginWizardRuleTBL.sql" />
<Build Include="Tables\Elfh\LoginWizardStageActivityTBL.sql" />
<Build Include="Tables\Elfh\loginWizardStageTBL.sql" />
<Build Include="Tables\Elfh\MedicalCouncilTBL.sql" />
<Build Include="Tables\Elfh\RegionTBL.sql" />
<Build Include="Tables\Elfh\SchoolTBL.sql" />
<Build Include="Tables\Elfh\SpecialtyTBL.sql" />
<Build Include="Tables\Elfh\StaffGroupTBL.sql" />
<Build Include="Tables\Elfh\SystemSettingTBL.sql" />
<Build Include="Tables\Elfh\TenantSmtpTBL.sql" />
<Build Include="Tables\Elfh\TermsAndConditionsTBL.sql" />
<Build Include="Tables\Elfh\UserAttributeTBL.sql" />
<Build Include="Tables\Elfh\UserEmploymentTBL.sql" />
<Build Include="Tables\Elfh\UserGroupTypeInputValidationTBL.sql" />
<Build Include="Tables\Elfh\UserHistoryTBL.sql" />
<Build Include="Tables\Elfh\userHistoryTypeTBL.sql" />
<Build Include="Tables\Elfh\UserPasswordValidationTokenTBL.sql" />
<Build Include="Tables\Elfh\UserRoleUpgradeTBL.sql" />
<Build Include="Tables\Elfh\UserTermsAndConditionsTBL.sql" />
<Build Include="Stored Procedures\Elfh\LinkEmploymentRecordToUser.sql" />
<Build Include="Stored Procedures\Elfh\UserDetailForAuthenticationByUserName.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryAttributeSave.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryInsert.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryLoadForLearningHubUser.sql" />
<Build Include="Stored Procedures\Elfh\UserHistoryLoadForUser.sql" />
<Build Include="Tables\Elfh\TenantTBL.sql" />
<Build Include="Tables\Elfh\TenantUrlTBL.sql" />
<Build Include="Tables\Elfh\EmploymentReferenceTypeTBL.sql" />
<Build Include="Tables\Elfh\UserEmploymentReferenceTBL.sql" />
<Build Include="Tables\Elfh\UserEmploymentResponsibilityTBL.sql" />
<Build Include="Tables\Elfh\UserAdminLocationTBL.sql" />
<Build Include="Stored Procedures\Hub\GetActiveNotificationCount.sql" />
<Build Include="Stored Procedures\Elfh\GetUserByOpenAthensId.sql" />
<Build Include="Tables\Hierarchy\CatalogueNodeVersionCategory.sql" />
<Build Include="Stored Procedures\Hierarchy\CatalogueNodeVersionCategoryCreate.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeattribute.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeattributeType.sql" />
<Build Include="Stored Procedures\Adf\AdfMergecountry.sql" />
<Build Include="Stored Procedures\Adf\AdfMergedeanery.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeEmailTemplate.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeemailTemplateType.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeEmploymentReferenceType.sql" />
<Build Include="Stored Procedures\Adf\AdfMergegdcRegister.sql" />
<Build Include="Stored Procedures\Adf\AdfMergegmclrmp.sql" />
<Build Include="Stored Procedures\Adf\AdfMergegrade.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeHubUser.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeipCountryLookup.sql" />
<Build Include="Stored Procedures\Adf\AdfMergejobRole.sql" />
<Build Include="Stored Procedures\Adf\AdfMergelocation.sql" />
<Build Include="Stored Procedures\Adf\AdfMergelocationType.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeloginWizardRule.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeloginWizardStage.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeloginWizardStageActivity.sql" />
<Build Include="Stored Procedures\Adf\AdfMergemedicalCouncil.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeMergeUser.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeregion.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeschool.sql" />
<Build Include="Stored Procedures\Adf\AdfMergespecialty.sql" />
<Build Include="Stored Procedures\Adf\AdfMergestaffGroup.sql" />
<Build Include="Stored Procedures\Adf\AdfMergesystemSetting.sql" />
<Build Include="Stored Procedures\Adf\AdfMergetenants.sql" />
<Build Include="Stored Procedures\Adf\AdfMergetenantSmtp.sql" />
<Build Include="Stored Procedures\Adf\AdfMergetenantsUrl.sql" />
<Build Include="Stored Procedures\Adf\AdfMergetermsAndConditions.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserAdminLocation.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserAttribute.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeuserEmployment.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserEmploymentReference.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserEmploymentResponsibility.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserGroupTypeInputValidation.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserHistory.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserHistoryType.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserPasswordValidationToke.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserProfileData.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserReportingUser.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserRoleUpgrade.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeuserTermsAndConditions.sql" />
<Build Include="Stored Procedures\Hierarchy\RemoveCatalogueCategory.sql" />
<None Include="Scripts\Post-Deploy\Scripts\TD-6148-ADFtableData.sql" />
<Build Include="Tables\Adf\ADFSyncMetadata.sql" />
<Build Include="Stored Procedures\Adf\proc_UpdateLastSyncTimeAdf.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserGroupReporter.sql" />
<Build Include="Tables\Databricks\ReportHistory.sql" />
<Build Include="Tables\Elfh\UserGroupReporterTBL.sql" />
<None Include="Scripts\Post-Deploy\Scripts\TD-6625-AddtionalTable-CDC.sql" />
<Build Include="Views\SearchCataloguesView.sql" />
<Build Include="Views\SupersetSearchView.sql" />
<Build Include="Views\SearchResourcesView.sql" />
<None Include="Scripts\Pre-Deploy\Scripts\TD-7057-drop-elfh tables.sql" />
<Build Include="Schemas\adf.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUserGroups.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUserProfiles.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUsers.sql" />
<Build Include="Stored Procedures\Adf\LoadElfhUserUserGroups.sql" />
<Build Include="Stored Procedures\Adf\UpsertElfhExternalUsers.sql" />
<Build Include="Tables\Adf\ADFSyncMetadata.sql" />
<Build Include="Stored Procedures\Adf\proc_UpdateLastSyncTimeAdf.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeUserProfileData.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeHubUser.sql" />
<Build Include="Stored Procedures\Adf\AdfMergeattribute.sql" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
Expand Down
3 changes: 0 additions & 3 deletions WebAPI/LearningHub.Nhs.Database/Schemas/elfh.sql
View file
Open in desktop

This file was deleted.

Loading
Loading