Merge pull request #605 from TransactionProcessing/codacy/high_fixes

fix some more isssues

Author: StuartFerguson

FileProcessor.BusinessLogic/EventHandling/FileDomainEventHandler.cs

@@ -65,8 +65,6 @@ public async Task<Result> Handle(IDomainEvent domainEvent,
             return await this.HandleSpecificDomainEvent((dynamic)domainEvent, cancellationToken);
         }
 
-        //private static Int32 TransactionNumber = 0;
-
         /// <summary>
         /// Handles the specific domain event.
         /// </summary>

FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs

@@ -310,7 +310,7 @@ public async Task<Result> ProcessTransactionForFileLine(FileCommands.ProcessTran
             // need to now parse the line (based on the file format), this builds the metadata
             Dictionary<String, String> transactionMetadata = this.ParseFileLine(fileLine.LineData, fileProfile.FileFormatHandler);
 
-            if (transactionMetadata == null)
+            if (transactionMetadata.Any() == false)
             {
                 // Line failed to parse so record this
                 fileAggregate.RecordFileLineAsRejected(fileLine.LineNumber, "Invalid Format");
@@ -566,7 +566,7 @@ private Dictionary<String, String> ParseFileLine(String domainEventFileLine,
         catch (InvalidDataException iex)
         {
             Logger.LogWarning(iex.Message);
-            return null;
+            return new Dictionary<String, String>();
         }
     }
 

FileProcessor.Client/FileProcessorClient.cs

@@ -59,8 +59,6 @@ public async Task<Result<FileDetails>> GetFile(String accessToken,
                                                Guid estateId,
                                                Guid fileId,
                                                CancellationToken cancellationToken) {
-            FileDetails response = null;
-
             String requestUri = this.BuildRequestUrl($"/api/files/{fileId}?estateId={estateId}");
 
             try {
@@ -81,16 +79,14 @@ public async Task<Result<FileDetails>> GetFile(String accessToken,
                     HandleResponseContent<FileDetails>(result.Data);
 
                 // call was successful so now deserialise the body to the response object
-                response = responseData.Data;
+                return Result.Success(responseData.Data);
             }
             catch (Exception ex) {
                 // An exception has occurred, add some additional information to the message
                 Exception exception = new Exception($"Error getting file with Id {fileId}.", ex);
 
                 throw exception;
             }
-
-            return Result.Success(response);
         }
 
         /// <summary>
@@ -107,8 +103,6 @@ public async Task<Result<FileImportLog>> GetFileImportLog(String accessToken,
                                                           Guid estateId,
                                                           Guid? merchantId,
                                                           CancellationToken cancellationToken) {
-            FileImportLog response = null;
-
             String requestUri = this.BuildRequestUrl($"/api/fileImportLogs/{fileImportLogId}?estateId={estateId}");
 
             if (merchantId.HasValue) {
@@ -133,16 +127,14 @@ public async Task<Result<FileImportLog>> GetFileImportLog(String accessToken,
                     HandleResponseContent<FileImportLog>(result.Data);
 
                 // call was successful so now deserialise the body to the response object
-                response = responseData.Data;
+                return Result.Success(responseData.Data);
             }
             catch (Exception ex) {
                 // An exception has occurred, add some additional information to the message
                 Exception exception = new Exception("Error getting file import log.", ex);
 
                 throw exception;
             }
-
-            return Result.Success(response);
         }
 
         /// <summary>
@@ -161,8 +153,6 @@ public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToke
                                                                DateTime endDateTime,
                                                                Guid? merchantId,
                                                                CancellationToken cancellationToken) {
-            FileImportLogList response = null;
-
             String requestUri =
                 this.BuildRequestUrl(
                     $"/api/fileImportLogs?estateId={estateId}&startDateTime={startDateTime.Date:yyyy-MM-dd}&endDateTime={endDateTime.Date:yyyy-MM-dd}");
@@ -188,16 +178,14 @@ public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToke
                     HandleResponseContent<FileImportLogList>(result.Data);
 
                 // call was successful so now deserialise the body to the response object
-                response = responseData.Data;
+                return Result.Success(responseData.Data);
             }
             catch (Exception ex) {
                 // An exception has occurred, add some additional information to the message
                 Exception exception = new Exception("Error getting list of file import logs.", ex);
 
                 throw exception;
             }
-
-            return Result.Success(response);
         }
 
         /// <summary>
@@ -214,7 +202,6 @@ public async Task<Result<Guid>> UploadFile(String accessToken,
                                                    Byte[] fileData,
                                                    UploadFileRequest uploadFileRequest,
                                                    CancellationToken cancellationToken) {
-            Guid response = Guid.Empty;
             try {
                 String requestUri = this.BuildRequestUrl("/api/files");
 
@@ -246,16 +233,14 @@ public async Task<Result<Guid>> UploadFile(String accessToken,
                     HandleResponseContent<Guid>(result.Data);
 
                 // call was successful so now deserialise the body to the response object
-                response = responseData.Data;
+                return Result.Success(responseData.Data);
             }
             catch (Exception ex) {
                 // An exception has occurred, add some additional information to the message
                 Exception exception = new Exception($"Error uploading file {fileName}.", ex);
 
                 throw exception;
             }
-
-            return Result.Success(response);
         }
 
         /// <summary>

FileProcessor/Bootstrapper/ClientRegistry.cs

@@ -24,7 +24,6 @@ public ClientRegistry() {
         this.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
         this.RegisterHttpClient<ITransactionProcessorClient, TransactionProcessorClient>();
 
-        //this.AddSingleton<Func<String, String>>(container => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; });
         Func<String, String> resolver(IServiceProvider container) => serviceName => { return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; };
 
         this.AddSingleton<Func<String, String>>(resolver);

FileProcessor/Bootstrapper/MiddlewareRegistry.cs

@@ -55,9 +55,7 @@ public MiddlewareRegistry()
                                                               }
                                                 });
                                    // add a custom operation filter which sets default values
-                                   //c.OperationFilter<SwaggerDefaultValues>();
-                                   //c.ExampleFilters();
-
+                                   
                                    //Locate the XML files being generated by ASP.NET...
                                    var directory = new DirectoryInfo(AppContext.BaseDirectory);
                                    var xmlFiles = directory.GetFiles("*.xml");
@@ -69,7 +67,6 @@ public MiddlewareRegistry()
                                    }
                                });
 
-            //services.AddSwaggerExamplesFromAssemblyOf<SwaggerJsonConverter>();
 
             this.AddAuthentication(options =>
                                    {

FileProcessor/Common/Extensions.cs

@@ -58,6 +58,9 @@ public static IServiceCollection AddInSecureEventStoreClient(
             case TraceEventType.Verbose:
                 Logger.LogDebug(logMessage);
                 break;
+            default:
+                Logger.LogInformation(logMessage);
+                break;
         }
     };
 
@@ -102,9 +105,7 @@ public static void PreWarm(this IApplicationBuilder applicationBuilder){
                                                                                     };
 
         Func<String, Int32, ISubscriptionRepository> subscriptionRepositoryResolver = Startup.Container.GetInstance<Func<String, Int32, ISubscriptionRepository>>();
-
-        EventStoreClientSettings eventStoreClientSettings = EventStoreClientSettings.Create(eventStoreConnectionString);
-
+        
         applicationBuilder.ConfigureSubscriptionService(subscriptionWorkersRoot,
                                                         eventStoreConnectionString,
                                                         eventHandlerResolvers,