refactor: add feature management & new featureFlag (#924)

* Add FeatureManagement & fix typos in flags

* use features in ApprovalController.cs

* Make DemoMode into feature flag

* seed data if demo mode is on

* Use FeatureFlag instead of Settings for DemoAllInOne

Author: vpnu

src/TRE-API/Constants/FeatureFlags.cs

@@ -0,0 +1,10 @@
+namespace TRE_API.Constants;
+
+public static class FeatureFlags
+{
+    public const string GenerateAccounts = nameof(GenerateAccounts);
+
+    public const string SqlAndNotGraphQl = nameof(SqlAndNotGraphQl);
+
+    public const string DemoAllInOne = nameof(DemoAllInOne);
+}

src/TRE-API/Controllers/ApprovalController.cs

@@ -5,9 +5,10 @@
 using BL.Models.Enums;
 using Serilog;
 using BL.Services;
+using Microsoft.FeatureManagement;
+using TRE_API.Constants;
 using TRE_API.Repositories.DbContexts;
 using TRE_API.Services;
-using TRE_API.Models;
 
 namespace TRE_API.Controllers
 {
@@ -18,21 +19,20 @@ public class ApprovalController : Controller
         private readonly ApplicationDbContext _DbContext;
         protected readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IKeyCloakService _IKeyCloakService;
-        private readonly Features _Features;
         private readonly IEncDecHelper _encDecHelper;
-
         public IDareSyncHelper _dareSyncHelper { get; set; }
+        private readonly IFeatureManager _features;
 
         public ApprovalController(IDareSyncHelper dareSyncHelper, ApplicationDbContext applicationDbContext,
-            IHttpContextAccessor httpContextAccessor, IKeyCloakService IKeyCloakService, Features Features,
-            IEncDecHelper encDecHelper)
+            IHttpContextAccessor httpContextAccessor, IKeyCloakService IKeyCloakService,
+            IEncDecHelper encDecHelper, IFeatureManager features)
         {
             _dareSyncHelper = dareSyncHelper;
             _DbContext = applicationDbContext;
             _httpContextAccessor = httpContextAccessor;
             _IKeyCloakService = IKeyCloakService;
-            _Features = Features;
             _encDecHelper = encDecHelper;
+            _features = features;
         }
 
         [Authorize(Roles = "dare-tre-admin")]
@@ -219,7 +219,7 @@ public async Task<List<TreProject>> UpdateProjects(List<TreProject> projects)
                     await _DbContext.SaveChangesAsync();
                     await ControllerHelpers.AddTreAuditLog(dbproj, null, treProject.Decision == Decision.Approved,
                         _DbContext, _httpContextAccessor, User);
-                    if (_Features.GenerateAcounts)
+                    if (await _features.IsEnabledAsync(FeatureFlags.GenerateAccounts))
                     {
                         var acc = _DbContext.ProjectAcount.FirstOrDefault(x => x.Name == dbproj.SubmissionProjectName);
 
@@ -267,7 +267,7 @@ public async Task<List<TreMembershipDecision>> UpdateMembershipDecisions(
                     var dbMembership = _DbContext.MembershipDecisions.First(x => x.Id == membershipDecision.Id);
                     if (membershipDecision.Decision != dbMembership.Decision)
                     {
-                        if (_Features.GenerateAcounts)
+                        if (await _features.IsEnabledAsync(FeatureFlags.GenerateAccounts))
                         {
                             var name = dbMembership.Project.SubmissionProjectName + dbMembership.User.Username;
 

src/TRE-API/Controllers/SubmissionController.cs

@@ -1,83 +1,59 @@
-
-using BL.Models.ViewModels;
+using BL.Models.ViewModels;
 using BL.Models;
 using BL.Models.Enums;
 using BL.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Swashbuckle.AspNetCore.Annotations;
 using TRE_API.Attributes;
 using TRE_API.Services;
-using TRE_API.Services.SignalR;
 using Microsoft.AspNetCore.Authorization;
-using System.Data;
 using BL.Models.APISimpleTypeReturns;
-using TRE_API.Repositories.DbContexts;
-using EasyNetQ.Management.Client.Model;
 using BL.Rabbit;
 using EasyNetQ;
-using Newtonsoft.Json;
-using System;
-using Amazon.Runtime.Internal.Transform;
+using Microsoft.FeatureManagement;
 using Serilog;
+using TRE_API.Constants;
 using TRE_API.Models;
-using Minio;
 
 namespace TRE_API.Controllers
 {
-
-
     [ApiController]
     [Route("api/[controller]")]
     public class SubmissionController : Controller
     {
-        private readonly ISignalRService _signalRService;
-        private readonly IDareClientWithoutTokenHelper _dareHelper;
-        private readonly IDataEgressClientWithoutTokenHelper _dataEgressHelper;
         private readonly IHutchClientHelper _hutchHelper;
-        private readonly ApplicationDbContext _dbContext;
         private readonly IBus _rabbit;
         private readonly ISubmissionHelper _subHelper;
         private readonly IMinioSubHelper _minioSubHelper;
         private readonly IMinioTreHelper _minioTreHelper;
         private readonly MinioTRESettings _minioTreSettings;
-        private readonly string _treName;
         private readonly AgentSettings _agentSettings;
+        private readonly IFeatureManager _features;
 
-        public SubmissionController(ISignalRService signalRService, IDareClientWithoutTokenHelper helper,
-            ApplicationDbContext dbContext, 
-            IBus rabbit, 
+        public SubmissionController(
+            IHutchClientHelper hutchHelper,
+            IBus rabbit,
             ISubmissionHelper subHelper,
-            IDataEgressClientWithoutTokenHelper egressHelper, 
-            IHutchClientHelper hutchClientHelper,
             IMinioSubHelper minioSubHelper,
             IMinioTreHelper minioTreHelper,
-            MinioTRESettings minioTreSettings, 
-            IConfiguration config,
-            AgentSettings agentSettings)
+            MinioTRESettings minioTreSettings,
+            AgentSettings agentSettings, IFeatureManager features)
         {
-            _signalRService = signalRService;
-            _dareHelper = helper;
-            _dataEgressHelper = egressHelper;
-            _hutchHelper = hutchClientHelper;
-            _dbContext = dbContext;
+            _hutchHelper = hutchHelper;
             _rabbit = rabbit;
             _subHelper = subHelper;
             _minioTreHelper = minioTreHelper;
             _minioSubHelper = minioSubHelper;
             _minioTreSettings = minioTreSettings;
-            _treName = config["TreName"];
             _agentSettings = agentSettings;
+            _features = features;
         }
 
 
-
-
         [Authorize(Roles = "dare-tre-admin")]
         [HttpGet("IsUserApprovedOnProject")]
         public BoolReturn IsUserApprovedOnProject(int projectId, int userId)
         {
-
             return new BoolReturn()
             {
                 Result = _subHelper.IsUserApprovedOnProject(projectId, userId)
@@ -136,10 +112,11 @@ public IActionResult UpdateStatusForTre(
                 {
                     _subHelper.CloseSubmissionForTre(subDetails.SubId, subDetails.StatusType, "", "");
                 }
+
                 return StatusCode(200, result);
             }
-            catch (Exception ex) {
-                
+            catch (Exception ex)
+            {
                 Log.Error(ex, "{Function} Crash", "UpdateStatusForTre");
                 throw;
             }
@@ -156,7 +133,7 @@ public IActionResult GetOutputBucketInfo(string subId)
             try
             {
                 var outputInfo = _subHelper.GetOutputBucketGuts(subId, true, true);
-                
+
 
                 return StatusCode(200, outputInfo);
             }
@@ -176,7 +153,6 @@ public class OutputBucketInfo
             public bool Secure { get; set; }
         }
 
-        
 
         [Authorize(Roles = "dare-hutch-admin,dare-tre-admin")]
         [HttpPost]
@@ -208,7 +184,7 @@ public IActionResult FilesReadyForReview([FromBody] ReviewFiles review)
         public async Task<IActionResult> EgressResults([FromBody] EgressReview review)
         {
             try
-            {  
+            {
                 Dictionary<string, bool> hutchRes = new Dictionary<string, bool>();
                 ApprovalType approvalStatus;
                 var approvedCount = review.FileResults.Count(x => x.Approved);
@@ -230,22 +206,23 @@ public async Task<IActionResult> EgressResults([FromBody] EgressReview review)
                 foreach (var i in review.FileResults)
                 {
                     hutchRes.Add(i.FileName, i.Approved);
-
                 }
 
                 if (approvalStatus != ApprovalType.FullyApproved)
                 {
                     _subHelper.UpdateStatusForTre(review.SubId.ToString(), StatusType.DataOutApprovalRejected, "");
-                    
 
-                    var StatusResult = _subHelper.CloseSubmissionForTre(review.SubId, StatusType.Failed, "", "");
-                    
+
+                    var statusResult = _subHelper.CloseSubmissionForTre(review.SubId, StatusType.Failed, "", "");
                 }
                 else
                 {
                     _subHelper.UpdateStatusForTre(review.SubId.ToString(), StatusType.DataOutApproved, "");
                 }
-                var realurl = string.IsNullOrWhiteSpace(_minioTreSettings.HutchURLOverride) ? _minioTreSettings.Url : _minioTreSettings.HutchURLOverride;
+
+                var realurl = string.IsNullOrWhiteSpace(_minioTreSettings.HutchURLOverride)
+                    ? _minioTreSettings.Url
+                    : _minioTreSettings.HutchURLOverride;
                 bool secure = !realurl.ToLower().StartsWith("http://");
                 var bucket = _subHelper.GetOutputBucketGutsSub(review.SubId, true);
                 ApprovalResult hutchPayload = new ApprovalResult()
@@ -263,43 +240,46 @@ public async Task<IActionResult> EgressResults([FromBody] EgressReview review)
                     _subHelper.UpdateStatusForTre(review.SubId, StatusType.RequestingHutchDoesFinalPackaging, "");
                 }
 
-                if (_agentSettings.SimulateResults)
+                if (await _features.IsEnabledAsync(FeatureFlags.DemoAllInOne))
                 {
                     var exch = _rabbit.Advanced.ExchangeDeclare(ExchangeConstants.Tre, "topic");
                     var outcome = new FinalOutcome()
                     {
                         File = review.FileResults.First().FileName,
                         SubId = review.SubId
                     };
-                    _rabbit.Advanced.Publish(exch, RoutingConstants.ProcessFinalOutput, false, new Message<FinalOutcome>(outcome));
+                    _rabbit.Advanced.Publish(exch, RoutingConstants.ProcessFinalOutput, false,
+                        new Message<FinalOutcome>(outcome));
                 }
                 else if (_agentSettings.UseTESK == false)
                 {
-                    Log.Information("{Function} Minio url sent {Url} bucket {Bucket}, path {path}", "EgressReview", hutchPayload.Host, hutchPayload.Bucket, hutchPayload.Path);
+                    Log.Information("{Function} Minio url sent {Url} bucket {Bucket}, path {path}", "EgressReview",
+                        hutchPayload.Host, hutchPayload.Bucket, hutchPayload.Path);
                     //Not sure what the return type is
                     var HUTCHres =
                         await _hutchHelper.CallAPI<ApprovalResult, APIReturn>($"/api/jobs/{review.SubId}/approval",
                             hutchPayload);
                 }
                 else
                 {
-                    Log.Information($"EgressResults with review.OutputBucket > {review.OutputBucket} bucket.Bucket > {bucket.Bucket} ");
-                    foreach (var File in review.FileResults)
+                    Log.Information(
+                        $"EgressResults with review.OutputBucket > {review.OutputBucket} bucket.Bucket > {bucket.Bucket} ");
+                    foreach (var file in review.FileResults)
                     {
-                        Log.Information($"EgressResults with File.Approved > {File.Approved} File.FileName > {File.FileName} ");
-                        if (File.Approved)
+                        Log.Information(
+                            $"EgressResults with File.Approved > {file.Approved} File.FileName > {file.FileName} ");
+                        if (file.Approved)
                         {
-                            var source = await _minioTreHelper.GetCopyObject(review.OutputBucket,  File.FileName);
-                            var resultcopy = await _minioSubHelper.CopyObjectToDestination(bucket.Bucket, File.FileName, source);
+                            var source = await _minioTreHelper.GetCopyObject(review.OutputBucket, file.FileName);
+                            var resultcopy =
+                                await _minioSubHelper.CopyObjectToDestination(bucket.Bucket, file.FileName, source);
                         }
                     }
 
                     _subHelper.UpdateStatusForTre(review.SubId, StatusType.Completed, "");
                 }
 
 
-
-
                 return StatusCode(200, new BoolReturn() { Result = true });
             }
             catch (Exception ex)
@@ -310,8 +290,6 @@ await _hutchHelper.CallAPI<ApprovalResult, APIReturn>($"/api/jobs/{review.SubId}
         }
 
 
-
-
         [Authorize(Roles = "dare-hutch-admin,dare-tre-admin")]
         [HttpPost]
         [Route("FinalOutcome")]
@@ -324,7 +302,8 @@ public IActionResult FinalOutcome([FromBody] FinalOutcome outcome)
             {
                 var exch = _rabbit.Advanced.ExchangeDeclare(ExchangeConstants.Tre, "topic");
 
-                _rabbit.Advanced.Publish(exch, RoutingConstants.ProcessFinalOutput, false, new Message<FinalOutcome>(outcome));
+                _rabbit.Advanced.Publish(exch, RoutingConstants.ProcessFinalOutput, false,
+                    new Message<FinalOutcome>(outcome));
 
                 var boolresult = new BoolReturn()
                 {
@@ -340,7 +319,6 @@ public IActionResult FinalOutcome([FromBody] FinalOutcome outcome)
         }
 
 
-
         [HttpPost("SendSubmissionToHUTCH")]
         public IActionResult SendSubmissionToHUTCH(Submission sub)
         {
@@ -374,7 +352,5 @@ public IActionResult SimulateSubmissionProcessing(Submission sub)
                 throw;
             }
         }
-
-
     }
-}
+}