Cleanup Api code (#5)

- file store loading bug fix - Added comments for methods - Improved import tool, - Updated CAEN codes
twentytwokhz · Feb 5, 2022 · 1fcc9ab · 1fcc9ab
1 parent 4608b13
commit 1fcc9ab
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 95 deletions.
diff --git a/src/CAEN.Api/Controllers/CaenController.cs b/src/CAEN.Api/Controllers/CaenController.cs
@@ -17,17 +17,6 @@ public CaenController(ICaenService caenService)
             this.caenService = caenService;
         }
 
-        [HttpGet()]
-        public IActionResult GetAllCodes()
-        {
-            var result = caenService.GetCodesByFilter();
-            if (result.Count == 0)
-            {
-                return NotFound();
-            }
-            return Ok(result);
-        }
-
         [HttpGet("search/{query}")]
         public IActionResult SearchCodes(string query)
         {
@@ -39,30 +28,8 @@ public IActionResult SearchCodes(string query)
             return Ok(result);
         }
 
-        [HttpGet("{sectionId}")]
-        public IActionResult GetCodesBySection(string sectionId)
-        {
-            var result = caenService.GetCodesByFilter(sectionId);
-            if (result.Count == 0)
-            {
-                return NotFound();
-            }
-            return Ok(result);
-        }
-
-        [HttpGet("{sectionId}/{divisionId}")]
-        public IActionResult GetCodesByDivision(string sectionId, string divisionId)
-        {
-            var result = caenService.GetCodesByFilter(sectionId, divisionId);
-            if (result.Count == 0)
-            {
-                return NotFound();
-            }
-            return Ok(result);
-        }
-
-        [HttpGet("{sectionId}/{divisionId}/{groupId}")]
-        public IActionResult GetCodesByGroup(string sectionId, string divisionId, string groupId)
+        [HttpGet("{sectionId?}/{divisionId?}/{groupId?}")]
+        public IActionResult GetCodesByFilter(string sectionId, string divisionId, string groupId)
         {
             var result = caenService.GetCodesByFilter(sectionId, divisionId, groupId);
             if (result.Count == 0)

diff --git a/src/CAEN.Import/CaenDataImportService.cs b/src/CAEN.Import/CaenDataImportService.cs
@@ -116,7 +116,7 @@ public void ConvertXlsToJson(string fileName, string outputFileName)
                 else if (isClass)
                 {
                     writer.WriteStartObject();
-                    writer.WriteString("CAENRev2", col3);
+                    writer.WriteString("CAENRev2", col3.PadLeft(4, '0'));
                     writer.WriteString("Denumire", col4);
                     writer.WriteString("CAENRev1", col5);
                     writer.WriteString("ISICRev4", col6);

diff --git a/src/CAEN.Library/Models/CaenCode.cs b/src/CAEN.Library/Models/CaenCode.cs
@@ -11,7 +11,7 @@ public class Section : ISearchableCaen
         [JsonPropertyName("Denumire")]
         public string Name { get; set; }
         [JsonPropertyName("Diviziuni")]
-        public List<Division> Divisions { get; set; }
+        public List<Division> Divisions { get; set; } = new List<Division>();
 
         public bool Search(string query)
         {
@@ -27,7 +27,7 @@ public class Division : ISearchableCaen
         [JsonPropertyName("Denumire")]
         public string Name { get; set; }
         [JsonPropertyName("Grupe")]
-        public List<Group> Groups { get; set; }
+        public List<Group> Groups { get; set; } = new List<Group>();
 
         public bool Search(string query)
         {
@@ -43,7 +43,7 @@ public class Group : ISearchableCaen
         [JsonPropertyName("Denumire")]
         public string Name { get; set; }
         [JsonPropertyName("Clase")]
-        public List<CaenCode> Codes { get; set; }
+        public List<CaenCode> Codes { get; set; } = new List<CaenCode>();
 
         public bool Search(string query)
         {

diff --git a/src/CAEN.Library/Services/CaenService.cs b/src/CAEN.Library/Services/CaenService.cs
@@ -13,7 +13,8 @@ public class CaenService : ICaenService
 
         public CaenService()
         {
-            caenStore = JsonDocument.Parse(File.ReadAllText(storePath));
+            var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, storePath);
+            caenStore = JsonDocument.Parse(File.ReadAllText(filePath));
             list = caenStore.Deserialize<List<Section>>();
         }
 

diff --git a/src/CAEN.Library/Services/ICaenService.cs b/src/CAEN.Library/Services/ICaenService.cs
@@ -6,7 +6,21 @@ namespace CAEN.Library.Services
 {
     public interface ICaenService
     {
-        List<CaenCode> GetCodesByFilter(string sectionId = null, string divisionId = null, string groupId = null);
+        /// <summary>
+        /// Aduce codurile caen in functie
+        /// de parametrii oferiti
+        /// </summary>
+        /// <param name="sectionId"></param>
+        /// <param name="divisionId"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        List<CaenCode> GetCodesByFilter(string sectionId, string divisionId, string groupId);
+        /// <summary>
+        /// Cauta coduri caen corespunzatoare
+        /// criteriului de cautare
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
         List<CaenCode> SearchCode(string query);
     }
 }