Merge pull request #34 from skl-hyf/main

Author: abuzuhri

Source/FikaAmazonAPI/Services/FbaInventoryService.cs

@@ -28,7 +28,7 @@ public List<InventorySummaries> GetInventorySummaries(ParameterGetInventorySumma
                 var nextToken = response.Pagination.NextToken;
                 while (!string.IsNullOrEmpty(nextToken))
                 {
-                    var getInventorySummaries = GetInventorySummariesByNextToken(nextToken);
+                    var getInventorySummaries = GetInventorySummariesByNextToken(nextToken, ParameterGetInventorySummaries);
                     list.Add(getInventorySummaries.Payload.InventorySummaries);
                     nextToken = getInventorySummaries.Pagination?.NextToken;
                 }

Source/FikaAmazonAPI/Services/ReportService.cs

@@ -125,60 +125,45 @@ public string GetReportFile(string reportDocumentId)
 
         private string GetFile(ReportDocument reportDocument)
         {
-            bool IsCompressionFile = false;
-            bool IsEncryptedFile = false;
-
-            if (reportDocument.EncryptionDetails != null)
-                IsEncryptedFile = true;
-            if (reportDocument.CompressionAlgorithm != null && reportDocument.CompressionAlgorithm.HasValue && reportDocument.CompressionAlgorithm.Value == ReportDocument.CompressionAlgorithmEnum.GZIP)
-                IsCompressionFile = true;
+            bool isCompressionFile = false;
+            bool isEncryptedFile = reportDocument.EncryptionDetails != null;
 
+            if (reportDocument.CompressionAlgorithm is ReportDocument.CompressionAlgorithmEnum.GZIP)
+                isCompressionFile = true;
 
             var client = new System.Net.WebClient();
             string fileName = Guid.NewGuid().ToString();
-            
 
-            if (IsCompressionFile)
+            if (isCompressionFile)
             {
                 client.Headers[System.Net.HttpRequestHeader.AcceptEncoding] = "gzip";
                 fileName += ".gz";
-            }else fileName += ".txt";
+            }
+            else fileName += ".txt";
 
             string tempFilePath = Path.Combine(Path.GetTempPath() + fileName);
 
-
-
-            if (IsEncryptedFile)
+            if (isEncryptedFile)
             {
                 //Later will check
-                //byte[] rawData = client.DownloadData(reportDocument.Url);
-                //byte[] key = Convert.FromBase64String(reportDocument.EncryptionDetails.Key);
-                //byte[] iv = Convert.FromBase64String(reportDocument.EncryptionDetails.InitializationVector);
-                //var reportData = FileTransform.DecryptString(key, iv, rawData);
-                //File.WriteAllText(tempFilePath, reportData);
-                return tempFilePath;
+                byte[] rawData = client.DownloadData(reportDocument.Url);
+                byte[] key = Convert.FromBase64String(reportDocument.EncryptionDetails.Key);
+                byte[] iv = Convert.FromBase64String(reportDocument.EncryptionDetails.InitializationVector);
+                var reportData = FileTransform.DecryptString(key, iv, rawData);
+                File.WriteAllText(tempFilePath, reportData);
             }
             else
             {
-                
                 var stream = client.OpenRead(reportDocument.Url);
-                //var responseStream = new System.IO.Compression.GZipStream(rawData, System.IO.Compression.CompressionMode.Decompress);
                 using (Stream s = File.Create(tempFilePath))
                 {
-                    stream.CopyTo(s);
+                    stream?.CopyTo(s);
                 }
-
-               return FileTransform.Decompress(tempFilePath);
-                //SaveStreamToFile(tempFilePath, responseStream);
-
             }
 
-            
+            return isCompressionFile ? FileTransform.Decompress(tempFilePath) : tempFilePath;
         }
 
-
-
-
         public void SaveStreamToFile(string fileFullPath, Stream stream)
         {
             if (stream.Length == 0) return;

Source/FikaAmazonAPI/Utils/Country.cs

@@ -46,7 +46,7 @@ private Country(string code, string name,string domain, string sellercentralUrl,
 
         public static Country SG { get { return new Country("SG", "Singapore", "sg", "	https://sellercentral.amazon.sg", "https://vendorcentral.amazon.com.sg"); } }
         public static Country AU { get { return new Country("AU", "Australia", "com.au", "https://sellercentral.amazon.com.au", "https://vendorcentral.amazon.com.au"); } }
-        public static Country JP { get { return new Country("JP", "Japan", "jp", "https://sellercentral.amazon.co.jp", "https://vendorcentral.amazon.co.jp"); } }
+        public static Country JP { get { return new Country("JP", "Japan", "co.jp", "https://sellercentral.amazon.co.jp", "https://vendorcentral.amazon.co.jp"); } }