Delete voucher files from the FTP server after a successful import.

BulkPrintingAPI/Controllers/BatchesController.cs

@@ -86,7 +86,7 @@ namespace BulkPrintingAPI.Controllers
 
             if (!batch.ReadyForDownload)
             {
-                await Utils.DownloadVouchersAsync(_ftpOptions, _context, batch);
+                await Utils.DownloadVouchersAsync(_ftpOptions, _context, _logger, batch);
             }
 
             return Ok(batch);
@@ -130,7 +130,7 @@ namespace BulkPrintingAPI.Controllers
 
             try
             {
-                await Utils.DownloadVouchersAsync(_ftpOptions, _context, orderResponse.Batch);
+                await Utils.DownloadVouchersAsync(_ftpOptions, _context, _logger, orderResponse.Batch);
             }
             catch (Exception e)
             {

BulkPrintingAPI/Controllers/Utils.cs

@@ -306,7 +306,7 @@ namespace BulkPrintingAPI.Controllers
         }
 
         public static async Task DownloadVouchersAsync(FTPOptions ftpOptions, MAXContext context,
-            Batch batch)
+            ILogger logger, Batch batch)
         {
             var remoteFileName = string.Format("{0}_{1}.dat", batch.Account.Id, batch.Id);
             using (var voucherStream = new MemoryStream())
@@ -324,34 +324,43 @@ namespace BulkPrintingAPI.Controllers
                     {
                         await downloadStream.CopyToAsync(voucherStream).ConfigureAwait(false);
                     }
-                }
 
-                voucherStream.Position = 0;
-                using (var streamReader = new StreamReader(voucherStream))
-                {
-                    while (streamReader.Peek() >= 0)
+                    voucherStream.Position = 0;
+                    using (var streamReader = new StreamReader(voucherStream))
                     {
-                        var line = streamReader.ReadLine();
-                        var parts = line.Split('|');
+                        while (streamReader.Peek() >= 0)
+                        {
+                            var line = streamReader.ReadLine();
+                            var parts = line.Split('|');
 
-                        VoucherSanityCheck(batch, decimal.Parse(parts[4]), int.Parse(parts[5]),
-                            parts[7]);
+                            VoucherSanityCheck(batch, decimal.Parse(parts[4]), int.Parse(parts[5]),
+                                parts[7]);
 
-                        context.Add(new Voucher()
-                        {
-                            Id = int.Parse(parts[0]),
-                            ExpiryDate = DateTime.Parse(parts[1]),
-                            Serial = parts[2],
-                            EncryptedPIN = parts[3],
-                            SequenceNumber = int.Parse(parts[6]),
-                            Batch = batch
-                        });
+                            context.Add(new Voucher()
+                            {
+                                Id = int.Parse(parts[0]),
+                                ExpiryDate = DateTime.Parse(parts[1]),
+                                Serial = parts[2],
+                                EncryptedPIN = parts[3],
+                                SequenceNumber = int.Parse(parts[6]),
+                                Batch = batch
+                            });
+                        }
+                    }
+
+                    batch.ReadyForDownload = true;
+                    await context.SaveChangesAsync().ConfigureAwait(false);
+
+                    try
+                    {
+                        await ftp.DeleteFileAsync(remoteFileName).ConfigureAwait(false);
+                    }
+                    catch (Exception e)
+                    {
+                        logger.LogWarning("Failed to delete file on FTP server: {0}: {1}", remoteFileName, e.Message);
                     }
                 }
             }
-
-            batch.ReadyForDownload = true;
-            await context.SaveChangesAsync().ConfigureAwait(false);
         }
     }
 }