From 812bf9c65263cfb0102415c97027900f0c59af5c Mon Sep 17 00:00:00 2001 From: Zeeshaun Date: Mon, 4 May 2026 15:27:51 +0000 Subject: [PATCH] Updating --- .../appsettings.json | 2 +- .../DirectFileOperationsControllerTest.cs | 4 +- .../overlays/prd/normal/kustomization.yaml | 5 +- .../overlays/qa/normal/kustomization.yaml | 5 +- .../overlays/uat/normal/kustomization.yaml | 5 +- .../Repositories/ActivityRepository.cs | 51 ++++++++++++++++--- .../appsettings.json | 2 +- 7 files changed, 60 insertions(+), 14 deletions(-) diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json index 46f9b03..fe2fae3 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json @@ -106,7 +106,7 @@ "ServiceId": "20" }, { - "ServiceName": "WriteFileService", + "ServiceName": "WriteBinaryFileService", "ServiceId": "21" } ] diff --git a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/DirectFileOperationsControllerTest.cs b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/DirectFileOperationsControllerTest.cs index 3018be6..5d5ad7a 100644 --- a/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/DirectFileOperationsControllerTest.cs +++ b/LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperationsTests/Controllers/DirectFileOperationsControllerTest.cs @@ -60,7 +60,7 @@ public class DirectFileOperationsControllerTest var validRequestResponse = new RequestResponse() { MessageStack = new List(), IsSuccessful = true }; _mockWriteFileService.Setup(service => service.PreQueueValidation(It.IsAny())).Returns(validRequestResponse); _mockDirectFileOperationsService.Setup(service => - service.HandleDirectFileOperationsRequest(It.IsAny(), FileOperationType.WriteFile)) + service.HandleDirectFileOperationsRequest(It.IsAny(), FileOperationType.WriteBinaryFile)) .ReturnsAsync(validRequestResponse) .Verifiable(); @@ -71,7 +71,7 @@ public class DirectFileOperationsControllerTest Assert.Equal(200, okResult.StatusCode); _mockWriteFileService.Verify(service => service.PreQueueValidation(It.IsAny()), Times.Once); _mockDirectFileOperationsService.Verify(service => - service.HandleDirectFileOperationsRequest(It.IsAny(), FileOperationType.WriteFile), Times.Once); + service.HandleDirectFileOperationsRequest(It.IsAny(), FileOperationType.WriteBinaryFile), Times.Once); } [Fact] diff --git a/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/prd/normal/kustomization.yaml b/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/prd/normal/kustomization.yaml index b99cbe1..fae675a 100644 --- a/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/prd/normal/kustomization.yaml +++ b/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/prd/normal/kustomization.yaml @@ -9,4 +9,7 @@ components: patches: - target: kind: VirtualService - path: set_virtual_service.yaml \ No newline at end of file + path: set_virtual_service.yaml + - target: + kind: Deployment + path: set_replicas.yaml diff --git a/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/qa/normal/kustomization.yaml b/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/qa/normal/kustomization.yaml index b99cbe1..fae675a 100644 --- a/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/qa/normal/kustomization.yaml +++ b/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/qa/normal/kustomization.yaml @@ -9,4 +9,7 @@ components: patches: - target: kind: VirtualService - path: set_virtual_service.yaml \ No newline at end of file + path: set_virtual_service.yaml + - target: + kind: Deployment + path: set_replicas.yaml diff --git a/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/uat/normal/kustomization.yaml b/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/uat/normal/kustomization.yaml index b99cbe1..fae675a 100644 --- a/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/uat/normal/kustomization.yaml +++ b/LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/uat/normal/kustomization.yaml @@ -9,4 +9,7 @@ components: patches: - target: kind: VirtualService - path: set_virtual_service.yaml \ No newline at end of file + path: set_virtual_service.yaml + - target: + kind: Deployment + path: set_replicas.yaml diff --git a/LCU.API.Operations.IncentiveAPI/LCU.API.Internal.Operations.IncentiveApiLib/Repositories/ActivityRepository.cs b/LCU.API.Operations.IncentiveAPI/LCU.API.Internal.Operations.IncentiveApiLib/Repositories/ActivityRepository.cs index dc69d0c..4d733b2 100644 --- a/LCU.API.Operations.IncentiveAPI/LCU.API.Internal.Operations.IncentiveApiLib/Repositories/ActivityRepository.cs +++ b/LCU.API.Operations.IncentiveAPI/LCU.API.Internal.Operations.IncentiveApiLib/Repositories/ActivityRepository.cs @@ -369,13 +369,50 @@ public class ActivityRepository : BaseRepository, IActivityRepository if (!string.IsNullOrWhiteSpace(filter.Query)) { var query = filter.Query.ToLower().Trim(); - querySet = querySet.Where(x => - x.Detail.MemberName.ToLower().Contains(query) - || x.Detail.AccountNumber.ToLower().Contains(query) - || x.Detail.SubjectPersonNbr.ToLower().Contains(query) - || x.Detail.SubjectOrgNbr.ToLower().Contains(query) - || x.SourceId.ToLower() == query - || query == x.Id.ToString()); + var hasActivityId = int.TryParse(query, out var activityId); + var sourceIdMatches = _context.Activities + .Where(x => x.SourceId != null && x.SourceId.ToLower() == query) + .Select(x => x.Id); + + var memberNameMatches = _context.Activities + .Where(x => x.Detail != null + && x.Detail.MemberName != null + && x.Detail.MemberName.ToLower().Contains(query)) + .Select(x => x.Id); + + var accountNumberMatches = _context.Activities + .Where(x => x.Detail != null + && x.Detail.AccountNumber != null + && x.Detail.AccountNumber.ToLower().Contains(query)) + .Select(x => x.Id); + + var subjectPersonNbrMatches = _context.Activities + .Where(x => x.Detail != null + && x.Detail.SubjectPersonNbr != null + && x.Detail.SubjectPersonNbr.ToLower().Contains(query)) + .Select(x => x.Id); + + var subjectOrgNbrMatches = _context.Activities + .Where(x => x.Detail != null + && x.Detail.SubjectOrgNbr != null + && x.Detail.SubjectOrgNbr.ToLower().Contains(query)) + .Select(x => x.Id); + + var matchingIds = sourceIdMatches + .Union(memberNameMatches) + .Union(accountNumberMatches) + .Union(subjectPersonNbrMatches) + .Union(subjectOrgNbrMatches); + + if (hasActivityId) + { + matchingIds = matchingIds.Union( + _context.Activities + .Where(x => x.Id == activityId) + .Select(x => x.Id)); + } + + querySet = querySet.Where(x => matchingIds.Contains(x.Id)); } querySet = SortQuerySet(querySet, filter); diff --git a/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/appsettings.json b/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/appsettings.json index ec3f771..3b8ca7b 100644 --- a/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/appsettings.json +++ b/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/LCU.Webapps.Marketing.SPIT/appsettings.json @@ -19,7 +19,7 @@ }, "FileOperationsConfiguration": { "Url": "https://localhost:55007/", - "WriteFile": "/api/DirectFileOperations/WriteFile" + "WriteFile": "/api/DirectFileOperations/WriteBinaryFile" }, "AzureAd": { "TenantId": "63cd1554-2783-4a86-ae50-b9e6c21c9499",