Remove jobs from table entirely

Author: abrilgzz

Service/GroupMembershipManagement/Hosts/AzureMaintenance/Services/AzureMaintenanceService.cs

@@ -54,8 +54,7 @@ public async Task<List<SyncJob>> GetSyncJobsAsync()
                 SyncStatus.NotOwnerOfDestinationGroup,
                 SyncStatus.SecurityGroupNotFound,
                 SyncStatus.ThresholdExceeded,
-                SyncStatus.SubmissionRejected,
-                SyncStatus.Removed);
+                SyncStatus.SubmissionRejected);
 
             return ApplyJobTriggerFilters(jobs).ToList();
         }

Service/GroupMembershipManagement/Hosts/WebApi/Services.WebApi/RemoveGMMHandler.cs

@@ -1,33 +1,29 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-using Common.DependencyInjection;
-using Microsoft.AspNetCore.JsonPatch;
-using Microsoft.Extensions.Options;
+
 using Models;
 using Repositories.Contracts;
 using Services.Contracts;
 using Services.Messages.Requests;
 using Services.Messages.Responses;
-using Services.WebApi;
 using System.Net;
-using WebApi.Models.DTOs;
+using LogMessage = Models.LogMessage;
 
 namespace Services
 {
     public class RemoveGMMHandler : RequestHandlerBase<RemoveGMMRequest, RemoveGMMResponse>
     {
         private readonly IGraphGroupRepository _graphGroupRepository;
         private readonly IDatabaseSyncJobsRepository _syncJobRepository;
-        private readonly PatchJobHandler _patchJobHandler;
+        private readonly ILoggingRepository _loggingRepository;
 
         public RemoveGMMHandler(ILoggingRepository loggingRepository,
                               IGraphGroupRepository graphGroupRepository,
-                              IDatabaseSyncJobsRepository syncJobRepository,
-                              PatchJobHandler patchJobHandler) : base(loggingRepository)
+                              IDatabaseSyncJobsRepository syncJobRepository) : base(loggingRepository)
         {
             _graphGroupRepository = graphGroupRepository ?? throw new ArgumentNullException(nameof(graphGroupRepository));
             _syncJobRepository = syncJobRepository ?? throw new ArgumentNullException(nameof(syncJobRepository));
-            _patchJobHandler = patchJobHandler ?? throw new ArgumentNullException(nameof(patchJobHandler));
+            _loggingRepository = loggingRepository ?? throw new ArgumentNullException(nameof(loggingRepository));
         }
 
         protected override async Task<RemoveGMMResponse> ExecuteCoreAsync(RemoveGMMRequest request)
@@ -51,25 +47,27 @@ protected override async Task<RemoveGMMResponse> ExecuteCoreAsync(RemoveGMMReque
                 };
             }
 
-            var patchDocument = new JsonPatchDocument<SyncJobPatch>();
-            patchDocument.Replace(e => e.Status, "Removed");
-
-            var patchJobRequest = new PatchJobRequest(true, request.UserIdentity, request.SyncJobId, patchDocument);
-            var patchJobResponse = await _patchJobHandler.ExecuteAsync(patchJobRequest);
+            try
+            {
+                await _syncJobRepository.DeleteSyncJobAsync(syncJob);
 
-            if (patchJobResponse.StatusCode != HttpStatusCode.OK)
+                return new RemoveGMMResponse
+                {
+                    StatusCode = HttpStatusCode.OK
+                };
+            } catch (Exception ex)
             {
+                await _loggingRepository.LogMessageAsync(new LogMessage
+                {
+                    Message = $"Error removing GMM from job:\n{ex.Message}",
+                    RunId = null
+                });
+
                 return new RemoveGMMResponse
                 {
-                    StatusCode = patchJobResponse.StatusCode,
-                    ErrorCode = patchJobResponse.ErrorCode
+                    StatusCode = HttpStatusCode.InternalServerError
                 };
             }
-
-            return new RemoveGMMResponse
-            {
-                StatusCode = HttpStatusCode.OK
-            };
         }
 
     }

Service/GroupMembershipManagement/Hosts/WebApi/WebApi.Tests/JobDetailsControllerTests.cs

@@ -71,6 +71,8 @@ public void Initialize()
                                   return jobs.BuildMock();
                               });
 
+            _syncJobRepository.Setup(x => x.DeleteSyncJobAsync(It.IsAny<SyncJob>()));
+
             _getJobDetailsHandler = new GetJobDetailsHandler(_loggingRepository.Object,
                                                              _syncJobRepository.Object,
                                                              _graphGroupRepository.Object,
@@ -82,8 +84,7 @@ public void Initialize()
 
             _removeGMMHandler = new RemoveGMMHandler(_loggingRepository.Object,
                                                     _graphGroupRepository.Object,
-                                                   _syncJobRepository.Object,
-                                                   _patchJobHandler);
+                                                   _syncJobRepository.Object);
 
             _jobDetailsController = new JobDetailsController(_getJobDetailsHandler, _removeGMMHandler, _patchJobHandler);
         }

Service/GroupMembershipManagement/Hosts/WebApi/WebApi/Configuration/MessageHandlerInjector.cs

@@ -37,7 +37,6 @@ public static IServiceCollection InjectMessageHandlers(this IServiceCollection s
 
             services.AddTransient<IRequestHandler<PatchJobRequest, PatchJobResponse>, PatchJobHandler>();
             services.AddTransient<IRequestHandler<PostJobRequest, PostJobResponse>, PostJobHandler>();
-            services.AddTransient<PatchJobHandler>();
             services.AddTransient<IRequestHandler<RemoveGMMRequest, RemoveGMMResponse>, RemoveGMMHandler>();
 
             return services;

Service/GroupMembershipManagement/Hosts/WebApi/WebApi/Controllers/v1/Jobs/JobsController.cs

@@ -30,7 +30,7 @@ public JobsController(
             _postJobRequestHandler = postJobRequestHandler ?? throw new ArgumentNullException(nameof(postJobRequestHandler));
         }
 
-        [Authorize(Roles = Models.Roles.JOB_CREATOR + "," + Models.Roles.JOB_TENANT_READER)]
+        [Authorize(Roles = Models.Roles.JOB_CREATOR + "," + Models.Roles.JOB_TENANT_READER + "," + Models.Roles.JOB_TENANT_WRITER)]
         [HttpGet()]
         public async Task<ActionResult<IEnumerable<SyncJob>>> GetJobsAsync(ODataQueryOptions<SyncJobModel> queryOptions)
         {

Service/GroupMembershipManagement/Models/SyncStatus.cs

@@ -30,7 +30,6 @@ public enum SyncStatus
         New = 22,
         DeveloperPaused = 23,
         PendingReview = 24,
-        SubmissionRejected = 25,
-        Removed = 26
+        SubmissionRejected = 25
     }
 }

Service/GroupMembershipManagement/Repositories.Contracts/IDatabaseSyncJobsRepository.cs

@@ -23,6 +23,7 @@ public interface IDatabaseSyncJobsRepository
         Task UpdateSyncJobFromNotificationAsync(SyncJob job, SyncStatus status);
         Task UpdateSyncJobsAsync(IEnumerable<SyncJob> jobs, SyncStatus? status = null);
         Task DeleteSyncJobsAsync(IEnumerable<SyncJob> jobs);
+        Task DeleteSyncJobAsync(SyncJob job);
         Task BatchUpdateSyncJobsAsync(List<SyncJob> jobs);
     }
 }