Handle DeliveredQuantity==0

BulkPrintingAPI/Controllers/BatchesController.cs

@@ -101,15 +101,23 @@ namespace BulkPrintingAPI.Controllers
 
             if (!batch.ReadyForDownload)
             {
-                try
+                if (batch.DeliveredQuantity == 0)
                 {
-                    await Utils.DownloadVouchersAsync(_sftpOptions, _context, _logger, batch);
+                    batch.ReadyForDownload = true;
+                    await _context.SaveChangesAsync();
                 }
-                catch (Exception e)
+                else
                 {
-                    _logger.LogError(string.Format(
-                        "Failed to download vouchers for {0} batchId={1}: {2}",
-                        credentials.ToString(), batch.Id, e.Message));
+                    try
+                    {
+                        await Utils.DownloadVouchersAsync(_sftpOptions, _context, _logger, batch);
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogError(string.Format(
+                            "Failed to download vouchers for {0} batchId={1}: {2}",
+                            credentials.ToString(), batch.Id, e.Message));
+                    }
                 }
             }
 
@@ -154,15 +162,18 @@ namespace BulkPrintingAPI.Controllers
 
             _logger.LogDebug("Saved batchId={0} for {1}", orderResponse.Batch.Id, credentials.ToString());
 
-            try
+            if (!orderResponse.Batch.ReadyForDownload)
             {
-                await Utils.DownloadVouchersAsync(_sftpOptions, _context, _logger, orderResponse.Batch);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(string.Format(
-                    "Failed to download vouchers for {0} batchId={1}: {2}",
-                    credentials.ToString(), orderResponse.Batch.Id, e.Message));
+                try
+                {
+                    await Utils.DownloadVouchersAsync(_sftpOptions, _context, _logger, orderResponse.Batch);
+                }
+                catch (Exception e)
+                {
+                    _logger.LogError(string.Format(
+                        "Failed to download vouchers for {0} batchId={1}: {2}",
+                        credentials.ToString(), orderResponse.Batch.Id, e.Message));
+                }
             }
 
             return Ok(orderResponse);

BulkPrintingAPI/Controllers/Utils.cs

@@ -313,6 +313,9 @@ namespace BulkPrintingAPI.Controllers
         public static async Task DownloadVouchersAsync(SFTPOptions sftpOptions, MAXContext context,
             ILogger logger, Batch batch)
         {
+            if (batch.ReadyForDownload)
+                return;
+
             var remoteFileName = string.Format("{0}_{1}.dat", batch.Account.Id, batch.Id);
             using (var voucherStream = new MemoryStream())
             {

MAXClient/Client.cs

@@ -442,6 +442,8 @@ namespace MAX
             );
 
             var parts = response.Split('|');
+            var deliveredQuantity = ParseInt(parts[4], "Batch.DeliveredQuantity(4)", response);
+
             return new OrderResponse()
             {
                 Batch = new Batch()
@@ -449,7 +451,7 @@ namespace MAX
                     Id = ParseInt(parts[1], "Batch.Id(1)", response),
                     OrderReference = parts[2],
                     RequestedQuantity = ParseInt(parts[3], "Batch.RequestQuantity(3)", response),
-                    DeliveredQuantity = ParseInt(parts[4], "Batch.DeliveredQuantity(4)", response),
+                    DeliveredQuantity = deliveredQuantity,
                     Cost = ParseDecimal(parts[5], "Batch.Cost(5)", response),
                     InternalReference = internalReference,
                     OrderGuid = orderGuid,
@@ -464,7 +466,7 @@ namespace MAX
                     NetworkName = product.Network.Name,
                     OrderDate = DateTimeOffset.UtcNow,
                     OrderedById = _userId,
-                    ReadyForDownload = false
+                    ReadyForDownload = deliveredQuantity == 0
                 },
                 RemainingBalance = ParseDecimal(parts[6], "Batch.RemainingBalance(6)", response)
             };