Add reference code to support windows services

mabaega · Sep 3, 2024 · 9a560aa · 9a560aa
1 parent ad0837d
commit 9a560aa
Show file tree

Hide file tree

Showing 22 changed files with 88 additions and 95 deletions.
diff --git a/Zatca.EGS/Controllers/DisclaimerController.cs b/Zatca.EGS/Controllers/DisclaimerController.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
 
 namespace Zatca.EGS.Controllers
 {

diff --git a/Zatca.EGS/Controllers/HomeController.cs b/Zatca.EGS/Controllers/HomeController.cs
@@ -1,4 +1,4 @@
- using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
 using Zatca.EGS.Models;
 

diff --git a/Zatca.EGS/Controllers/RelayController.cs b/Zatca.EGS/Controllers/RelayController.cs
@@ -1,13 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
-using Zatca.EGS.Models;
-using Zatca.eInvoice.Models;
-using Zatca.EGS.Helpers;
-using System.Text;
-using Zatca.eInvoice;
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
+using System.Text;
 using System.Xml.Serialization;
-using Newtonsoft.Json.Linq;
+using Zatca.EGS.Helpers;
+using Zatca.EGS.Models;
+using Zatca.eInvoice;
+using Zatca.eInvoice.Models;
 
 namespace Zatca.EGS.Controllers
 {
@@ -417,9 +416,9 @@ public async Task<IActionResult> Reporting([FromForm] ApprovedInvoice model)
                             }
 
                             bool updateBusinessData = await ZatcaReference.UpdateReferenceFolder(_certInfo.ApiEndpoint, _certInfo.ApiSecret, model.ICV.ToString(), model.InvoiceHash);
-                            
+
                             Console.WriteLine(updateBusinessData);
-                            
+
                             if (updateBusinessData)
                             {
                                 string sanitizedReference = new(model.Reference.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c).ToArray());

diff --git a/Zatca.EGS/Controllers/WizardController.cs b/Zatca.EGS/Controllers/WizardController.cs
@@ -1,15 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.IO.Compression;
 using System.Net.Http.Headers;
+using System.Net.Mime;
 using System.Text;
-using Zatca.eInvoice.Models;
+using Zatca.EGS.Helpers;
 using Zatca.EGS.Models;
-using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice;
-using Zatca.EGS.Helpers;
-using Newtonsoft.Json.Linq;
-using System.IO.Compression;
-using System.Net.Mime;
+using Zatca.eInvoice.Helpers;
+using Zatca.eInvoice.Models;
 
 namespace Zatca.EGS.Controllers
 {
@@ -164,13 +164,13 @@ public async Task<IActionResult> GenerateCustomFieldAsync([FromBody] AccessToken
                             string fullPath = $"{ApiUrl}{apiPath}/{key}";
 
                             string nameValue = dataObject.Value<string>("Name");
-                            if (nameValue == null) 
+                            if (nameValue == null)
                             {
                                 nameValue = dataObject.Value<string>("Description");
                             }
 
                             var responseMessage = await SendDataToApi(fullPath, jsonPayload, apiKey);
-                            
+
                             result.AppendLine(nameValue + " " + responseMessage);
 
                             await Task.Delay(100); // Use Task.Delay for async delay
@@ -446,7 +446,7 @@ public async Task<string> PostComplianceCheck(string ComplianceCheckUrl, string
 
                 return null;
             }
-            catch 
+            catch
             {
                 //Console.WriteLine(ex.Message);
                 return null;

diff --git a/Zatca.EGS/Helpers/ComplianceTest.cs b/Zatca.EGS/Helpers/ComplianceTest.cs
@@ -1,8 +1,8 @@
 using System.Text;
+using Zatca.EGS.Models;
 using Zatca.eInvoice;
 using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice.Models;
-using Zatca.EGS.Models;
 
 namespace Zatca.EGS.Helpers
 {
@@ -167,7 +167,8 @@ public string GetRequestApi(string InvRefNumber, string billRefNum, InvoiceType
                         LatestDeliveryDate = DateTime.UtcNow.ToString("yyyy-MM-dd"),
                     },
 
-                    PaymentMeans = new PaymentMeans { 
+                    PaymentMeans = new PaymentMeans
+                    {
                         PaymentMeansCode = "10",
                         InstructionNote = invType == InvoiceType.TaxInvoiceCreditNote || invType == InvoiceType.TaxInvoiceDebitNote ? "Instruction Note for Debit or Credit" : null
                     },
@@ -329,7 +330,7 @@ public string GetRequestApi(string InvRefNumber, string billRefNum, InvoiceType
                 }
 
             }
-            catch 
+            catch
             {
                 //Console.WriteLine($"Error creating RequestApi: {ex.Message}");
                 throw;

diff --git a/Zatca.EGS/Helpers/DocumentFormatter.cs b/Zatca.EGS/Helpers/DocumentFormatter.cs
@@ -1,9 +1,9 @@
-using System.Text;
-using System.Xml.Linq;
-using System.Xml;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
 using System.Globalization;
+using System.Text;
+using System.Xml;
+using System.Xml.Linq;
 
 namespace Zatca.EGS.Helpers
 {

diff --git a/Zatca.EGS/Helpers/RellayToInvoiceMapper.cs b/Zatca.EGS/Helpers/RellayToInvoiceMapper.cs
@@ -1,8 +1,7 @@
 using Microsoft.VisualBasic;
+using Zatca.EGS.Models;
 using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice.Models;
-using Zatca.EGS.Models;
-using Newtonsoft.Json.Linq;
 using static Zatca.EGS.Helpers.VATInfoHelper;
 
 namespace Zatca.EGS.Helpers
@@ -38,8 +37,8 @@ public Invoice GenerateInvoiceObject()
                 invoiceType = 381;
             }
 
-            string invoiceSubType =  JsonParser.FindStringByGuid(_relayData.InvoiceJson, ManagerCustomField.InvoiceSubTypeGuid, "RefInvoice") ?? "0200000";
-            
+            string invoiceSubType = JsonParser.FindStringByGuid(_relayData.InvoiceJson, ManagerCustomField.InvoiceSubTypeGuid, "RefInvoice") ?? "0200000";
+
             Invoice invoice = new()
             {
                 ProfileID = "reporting:1.0",
@@ -196,8 +195,8 @@ private AccountingCustomerParty CreateAccountingCustomerParty()
         private PaymentMeans CreatePaymentMeans()
         {
             var paymentMeansCode = 30;
-            string paymentMeans =  JsonParser.FindStringByGuid(_relayData.InvoiceJson, ManagerCustomField.PaymentMeansCodeGuid, "RefInvoice");
-            string instructionNote =  JsonParser.FindStringByGuid(_relayData.InvoiceJson, ManagerCustomField.InstructionNoteGuid, "RefInvoice");
+            string paymentMeans = JsonParser.FindStringByGuid(_relayData.InvoiceJson, ManagerCustomField.PaymentMeansCodeGuid, "RefInvoice");
+            string instructionNote = JsonParser.FindStringByGuid(_relayData.InvoiceJson, ManagerCustomField.InstructionNoteGuid, "RefInvoice");
 
             if (paymentMeans != null)
             {
@@ -263,7 +262,7 @@ private List<InvoiceLine> CreateInvoiceLines()
                     invoiceLine.Item.ClassifiedTaxCategory = new ClassifiedTaxCategory
                     {
                         Percent = rate,
-                        ID = new ID("UN/ECE 5305", "6",vatInfo.CategoryID),
+                        ID = new ID("UN/ECE 5305", "6", vatInfo.CategoryID),
                         TaxScheme = new TaxScheme
                         {
                             ID = new ID("UN/ECE 5153", "6", "VAT")
@@ -361,7 +360,7 @@ private List<TaxTotal> CalculateTaxTotals()
             };
 
             taxTotals.Add(taxTotalWithSubtotals);
-                       
+
 
             return taxTotals;
         }

diff --git a/Zatca.EGS/Helpers/ZatcaReference.cs b/Zatca.EGS/Helpers/ZatcaReference.cs
@@ -1,8 +1,8 @@
-using System.Text;
-using Zatca.EGS.Models;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Net.Http.Headers;
+using System.Text;
+using Zatca.EGS.Models;
 
 namespace Zatca.EGS.Helpers
 {
@@ -11,7 +11,7 @@ public class ZatcaReference
         public static async Task<(string ICV, string PIH)> GetReferenceFolder(string apiPath, string apiSecret)
         {
             string fullPath = $"{apiPath}/folder-form/{ManagerCustomField.FolderReferenceGuid}";
-            
+
             //Console.WriteLine($"Request URL: {fullPath}");
 
             using (HttpClient client = new HttpClient())

diff --git a/Zatca.EGS/Models/ApprovedInvoice.cs b/Zatca.EGS/Models/ApprovedInvoice.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
-using Zatca.eInvoice.Helpers;
 using Zatca.EGS.Helpers;
+using Zatca.eInvoice.Helpers;
 
 namespace Zatca.EGS.Models
 {

diff --git a/Zatca.EGS/Models/CertificateInfo.cs b/Zatca.EGS/Models/CertificateInfo.cs
@@ -142,7 +142,7 @@ private string GetUrl(string endpoint)
 
             return $"https://gw-fatoora.zatca.gov.sa/e-invoicing/{environment}/{endpoint}";
         }
-                
+
         public bool IsRegistered() => !string.IsNullOrEmpty(CCSIDComplianceRequestId) && !string.IsNullOrEmpty(CCSIDBinaryToken) && !string.IsNullOrEmpty(CCSIDSecret) && !string.IsNullOrEmpty(PCSIDBinaryToken) && !string.IsNullOrEmpty(PCSIDSecret);
     }
 

diff --git a/Zatca.EGS/Models/ErrorViewModel.cs b/Zatca.EGS/Models/ErrorViewModel.cs
@@ -4,8 +4,8 @@ public class ErrorViewModel
     {
         public string RequestId { get; set; }
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-        public string ErrorMessage { get; set; } 
-        public string ReferrerLink { get; set; } 
+        public string ErrorMessage { get; set; }
+        public string ReferrerLink { get; set; }
         public bool ShowSetupLink { get; set; }
     }
 
@@ -21,5 +21,5 @@ public class CertificateViewModel
         public string ReferrerLink { get; set; }
         public bool ShowSetupLink { get; set; }
     }
-    
+
 }
diff --git a/Zatca.EGS/Models/RelayData.cs b/Zatca.EGS/Models/RelayData.cs
@@ -30,13 +30,13 @@ public RelayData(Dictionary<string, string> formData)
             Key = formData.GetValueOrDefault("Key");
             Callback = formData.GetValueOrDefault("Callback");
             Data = formData.GetValueOrDefault("Data");
-            
+
             string DataString = JsonParser.UpdateJsonGuidValue(Data, ManagerCustomField.ZatcaUUIDGuid);
-            
+
             var (baseCurrency, businessDetails, dynamicParts) = JsonParser.ParseJson(DataString);
 
             var AccessToken = JsonParser.FindStringByGuid(businessDetails, ManagerCustomField.TokenInfoGuid);
-            
+
             var uri = new Uri(Referrer);
             var baseUrl = $"{uri.Scheme}://{uri.Host}";
 
@@ -53,7 +53,7 @@ public RelayData(Dictionary<string, string> formData)
             {
                 CertificateInfo = ObjectCompressor.DeserializeFromBase64String<CertificateInfo>(certString);
             }
-            
+
             if (CertificateInfo != null)
             {
                 CertificateInfo.ApiSecret = AccessToken;
@@ -98,7 +98,7 @@ public RelayData(Dictionary<string, string> formData)
                 };
 
                 Base64QrCode = JsonParser.FindStringByGuid(InvoiceJson, ManagerCustomField.QrCodeGuid, "RefInvoice");
-                
+
                 if (!string.IsNullOrEmpty(Base64QrCode))
                 {
                     ApprovalStatus = JsonParser.FindStringByGuid(InvoiceJson, ManagerCustomField.ApprovedInvoiceGuid, "RefInvoice");

diff --git a/Zatca.EGS/Program.cs b/Zatca.EGS/Program.cs
@@ -7,8 +7,16 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
+// Kondisi kompilasi untuk Windows
+#if WINDOWS
 builder.Host.UseWindowsService();
 builder.Services.AddWindowsService();
+#endif
+
+// Kondisi kompilasi untuk Linux
+#if LINUX
+builder.Host.UseSystemd();
+#endif
 
 builder.Services.Configure<JsonOptions>(options =>
     options.SerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault | JsonIgnoreCondition.WhenWritingNull);
@@ -23,7 +31,7 @@
 
 builder.Services.AddControllersWithViews();
 
-builder.Services.AddDistributedMemoryCache(); 
+builder.Services.AddDistributedMemoryCache();
 
 builder.Services.AddSession(options =>
 {

diff --git a/Zatca.EGS/Zatca.EGS.csproj b/Zatca.EGS/Zatca.EGS.csproj
@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>disable</Nullable>
@@ -8,45 +9,39 @@
     <ApplicationIcon>wwwroot\favicon.ico</ApplicationIcon>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
+
   <PropertyGroup>
-    <AssemblyVersion>24.09.02.0010</AssemblyVersion>
-    <FileVersion>24.09.02.0010</FileVersion>
+    <AssemblyVersion>24.09.02.0012</AssemblyVersion>
+    <FileVersion>24.09.02.0012</FileVersion>
   </PropertyGroup>
+
   <ItemGroup>
     <None Include="cfData.json" />
   </ItemGroup>
+
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Zatca.eInvoice\Zatca.eInvoice.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="8.0.6">
-      <TreatAsUsed>true</TreatAsUsed>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0">
-      <TreatAsUsed>true</TreatAsUsed>
-    </PackageReference>
   </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Content Update="Views\Relay\Info.cshtml">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <!--<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="powershell.exe -ExecutionPolicy Bypass -File &quot;$(ProjectDir)UpdateVersion.ps1&quot;" />
-  </Target>-->
+
 </Project>
diff --git a/Zatca.eInvoice.Test/Program.cs b/Zatca.eInvoice.Test/Program.cs
@@ -1,6 +1,6 @@
-using System.Net.Http.Headers;
+using Newtonsoft.Json;
+using System.Net.Http.Headers;
 using System.Text;
-using Newtonsoft.Json;
 using Zatca.eInvoice;
 using Zatca.eInvoice.Helpers;
 using Zatca.eInvoice.Models;
@@ -113,10 +113,10 @@ public async Task<SignedInvoiceResult> CreateSignedInvoice(string CSIDBinaryToke
                 UUID = "8e6000cf-1a98-4174-b3e7-b5d5954bc10d",
                 IssueDate = "2022-08-17",
                 IssueTime = "17:41:08",
-                InvoiceTypeCode = new InvoiceTypeCode( InvoiceType.TaxInvoice, "0200000"),
+                InvoiceTypeCode = new InvoiceTypeCode(InvoiceType.TaxInvoice, "0200000"),
                 DocumentCurrencyCode = "SAR",
                 TaxCurrencyCode = "SAR",
-                Note = new Note() { LanguageID="ar",Value = "ABC"},
+                Note = new Note() { LanguageID = "ar", Value = "ABC" },
 
                 AdditionalDocumentReference =
                 [

diff --git a/Zatca.eInvoice.Test/QrCodeDecoder.cs b/Zatca.eInvoice.Test/QrCodeDecoder.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Zatca.eInvoice.Test
+namespace Zatca.eInvoice.Test
 {
     using System;
     using System.Collections.Generic;