Agrege impresión de Póliza Mercosur

FacuMasino · Aug 26, 2024 · b8dcea9 · b8dcea9
1 parent 6de4ef8
commit b8dcea9
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 53 deletions.
diff --git a/ImprimirPolizas/PolicyDocs.cs b/ImprimirPolizas/PolicyDocs.cs
@@ -12,6 +12,7 @@ public class PolicyDocs
         public string PolicyId { get; set; }
         public string CardId { get; set; }
         public string PaymentCupon { get; set; }
+        public string MercosurPolicy { get; set; }
 
         public string GetIdByOption(ScTools.DownloadOpt opt)
         {
@@ -25,8 +26,10 @@ public string GetIdByOption(ScTools.DownloadOpt opt)
                     return PaymentCupon;
                 case ScTools.DownloadOpt.policyCard:
                     return CardId;
+                case ScTools.DownloadOpt.mercosur:
+                    return MercosurPolicy;
                 default:
-                    return "";
+                    return "0";
             }
         }
     }

diff --git a/ImprimirPolizas/Properties/AssemblyInfo.cs b/ImprimirPolizas/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3")]
-[assembly: AssemblyFileVersion("1.3")]
+[assembly: AssemblyVersion("1.4")]
+[assembly: AssemblyFileVersion("1.4")]
diff --git a/ImprimirPolizas/ScTools.cs b/ImprimirPolizas/ScTools.cs
@@ -31,6 +31,7 @@ public enum DownloadOpt
             paymentReceipt = 5,
             coupons = 6,
             invoice = 7,
+            mercosur = 8,
         }
 
         // Verifica que el servidor este disponible
@@ -168,11 +169,15 @@ CancellationToken cancellationToken
                         };
 
                         client.DownloadFileAsync(
-                            new Uri($"{_baseUrl}getBinaryV2?docId={docId}&opt={(int)opt}"),
+                            new Uri(
+                                $"{_baseUrl}getBinaryV2?docId={docId}&opt={(int)opt}&pcN={pcNumber}"
+                            ),
                             Path.Combine(folderPath, fileName)
                         );
 
-                        Debug.Print($"{_baseUrl}getBinaryV2?docId={docId}&opt={(int)opt}");
+                        Debug.Print(
+                            $"{_baseUrl}getBinaryV2?docId={docId}&opt={(int)opt}&pcN={pcNumber}"
+                        );
 
                         await tcs.Task;
                     }
@@ -231,6 +236,9 @@ public static string GetFileName(string pcNumber, DownloadOpt opt)
                 case DownloadOpt.invoice:
                     fileName += "Factura.pdf";
                     break;
+                case DownloadOpt.mercosur:
+                    fileName += "Mercosur.pdf";
+                    break;
                 default:
                     fileName += ".pdf";
                     break;
@@ -300,6 +308,8 @@ public static string GetOptionName(DownloadOpt opt)
                     return "Cupones de pago";
                 case ScTools.DownloadOpt.invoice:
                     return "Factura";
+                case ScTools.DownloadOpt.mercosur:
+                    return "Mercosur";
                 default:
                     return "Desconocido";
             }
@@ -311,53 +321,48 @@ CancellationToken ctsToken
         )
         {
             PolicyDocs pcDocs = new PolicyDocs();
-
             string baseUrl = $"{_baseUrl}getDocsId?policyNumber={policyNumber}";
+
             try
             {
                 using (HttpClient client = new HttpClient())
                 {
-                    using (HttpResponseMessage res = await client.GetAsync(baseUrl, ctsToken))
-                    {
-                        using (HttpContent content = res.Content)
-                        {
-                            if (res.StatusCode != HttpStatusCode.OK)
-                            {
-                                throw new Exception(
-                                    "Error al obtener los documentos de la póliza."
-                                );
-                            }
-                            var resData = await content.ReadAsStringAsync();
+                    // Realiza la solicitud HTTP asíncrona
+                    HttpResponseMessage response = await client.GetAsync(baseUrl, ctsToken);
 
-                            JObject jsonData = JObject.Parse(resData);
-                            pcDocs.PolicyId = jsonData["Policy"].ToString();
-                            pcDocs.PaymentCupon = jsonData["PaymentCoupon"]?.ToString();
-                            pcDocs.SummaryId = jsonData["PolicySummary"].ToString();
-                            pcDocs.CardId = jsonData["InsuranceCardMandatory"].ToString();
-                            return pcDocs;
-                        }
-                    }
+                    // Maneja la cancelación aquí, si la solicitud se cancela
+                    ctsToken.ThrowIfCancellationRequested();
+
+                    // Asegúrate de manejar la respuesta correctamente
+                    response.EnsureSuccessStatusCode();
+
+                    string responseData = await response.Content.ReadAsStringAsync();
+
+                    JObject jsonData = JObject.Parse(responseData);
+                    pcDocs.PolicyId = jsonData["Policy"]?.ToString();
+                    pcDocs.PaymentCupon = jsonData["PaymentCoupon"]?.ToString();
+                    pcDocs.SummaryId = jsonData["PolicySummary"]?.ToString();
+                    pcDocs.CardId = jsonData["InsuranceCardMandatory"]?.ToString();
+                    pcDocs.MercosurPolicy = jsonData["MercosurPolicy"]?.ToString();
                 }
             }
-            catch (WebException ex) when (ex.Status == WebExceptionStatus.RequestCanceled)
+            catch (OperationCanceledException)
             {
-                throw new OperationCanceledException();
+                // Re-lanzar la excepción OperationCanceledException para indicar que la tarea fue cancelada
+                throw;
             }
-            catch (AggregateException ex)
-                when (ex.InnerException is WebException exWeb
-                    && exWeb.Status == WebExceptionStatus.RequestCanceled
-                )
-            {
-                throw new OperationCanceledException();
-            }
-            catch (TaskCanceledException)
+            catch (HttpRequestException ex) when (ex.InnerException is OperationCanceledException)
             {
-                throw new OperationCanceledException();
+                // Si hay una excepción de tipo HttpRequestException con un InnerException de tipo OperationCanceledException
+                throw new OperationCanceledException("La solicitud fue cancelada.", ex);
             }
             catch (Exception ex)
             {
-                throw ex;
+                // Re-lanzar cualquier otra excepción que no sea específica de cancelación
+                throw new Exception("Error al obtener los documentos de la póliza.", ex);
             }
+
+            return pcDocs;
         }
 
         public static bool IsCarPolicy(string policyNumber)

diff --git a/ImprimirPolizas/frmMain.Designer.cs b/ImprimirPolizas/frmMain.Designer.cs