Updating

LCU.API.Internal.FileOperations/LCU.Api.Internal.FileOperations/appsettings.json

@@ -106,7 +106,7 @@
               "ServiceId": "20"
             },
             {
-              "ServiceName": "WriteFileService",
+              "ServiceName": "WriteBinaryFileService",
               "ServiceId": "21"
             }
           ]

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<string>(), IsSuccessful = true };
         _mockWriteFileService.Setup(service => service.PreQueueValidation(It.IsAny<WriteFileRequest>())).Returns(validRequestResponse);
         _mockDirectFileOperationsService.Setup(service =>
-                                               service.HandleDirectFileOperationsRequest(It.IsAny<WriteFileRequest>(), FileOperationType.WriteFile))
+                                               service.HandleDirectFileOperationsRequest(It.IsAny<WriteFileRequest>(), FileOperationType.WriteBinaryFile))
                                         .ReturnsAsync(validRequestResponse)
                                         .Verifiable();
 
@@ -71,7 +71,7 @@ public class DirectFileOperationsControllerTest
         Assert.Equal(200, okResult.StatusCode);
         _mockWriteFileService.Verify(service => service.PreQueueValidation(It.IsAny<WriteFileRequest>()), Times.Once);
         _mockDirectFileOperationsService.Verify(service =>
-            service.HandleDirectFileOperationsRequest(It.IsAny<WriteFileRequest>(), FileOperationType.WriteFile), Times.Once);
+            service.HandleDirectFileOperationsRequest(It.IsAny<WriteFileRequest>(), FileOperationType.WriteBinaryFile), Times.Once);
     }
 
     [Fact]

LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/prd/normal/kustomization.yaml

@@ -10,3 +10,6 @@ patches:
   - target:
       kind: VirtualService
     path: set_virtual_service.yaml
+  - target:
+      kind: Deployment
+    path: set_replicas.yaml

LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/qa/normal/kustomization.yaml

@@ -10,3 +10,6 @@ patches:
   - target:
       kind: VirtualService
     path: set_virtual_service.yaml
+  - target:
+      kind: Deployment
+    path: set_replicas.yaml

LCU.API.Internal.MemberPreferencesApi/kustomize/overlays/uat/normal/kustomization.yaml

@@ -10,3 +10,6 @@ patches:
   - target:
       kind: VirtualService
     path: set_virtual_service.yaml
+  - target:
+      kind: Deployment
+    path: set_replicas.yaml

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 =>
+            var hasActivityId = int.TryParse(query, out var activityId);
-                x.Detail.MemberName.ToLower().Contains(query)
+            var sourceIdMatches = _context.Activities
-                || x.Detail.AccountNumber.ToLower().Contains(query)
+                .Where(x => x.SourceId != null && x.SourceId.ToLower() == query)
-                || x.Detail.SubjectPersonNbr.ToLower().Contains(query)
+                .Select(x => x.Id);
-                || x.Detail.SubjectOrgNbr.ToLower().Contains(query)
+
-                || x.SourceId.ToLower() == query
+            var memberNameMatches = _context.Activities
-                || query == x.Id.ToString());
+                .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);

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",