refactor code and update README

Author: antoniosubasic

APIHandler.cs

@@ -6,77 +6,55 @@ namespace AoC.API;
 public class Session
 {
     private const string DOMAIN = "https://adventofcode.com";
-    private readonly string _sessionCookie;
-    private readonly int _year;
-    private readonly int _day;
+
+    public string SessionCookie { get; private set; }
+    public int Year { get; private set; }
+    public int Day { get; private set; }
 
     public Session(string sessionCookie, int year, int day)
     {
-        _sessionCookie = sessionCookie;
-        _year = year;
-        _day = day;
+        SessionCookie = sessionCookie;
+        Year = year;
+        Day = day;
     }
 
     public Session(string sessionCookie, string input, Regex pattern)
     {
-        _sessionCookie = sessionCookie;
+        SessionCookie = sessionCookie;
 
         var match = pattern.Match(input);
         if (match.Success)
         {
-            _year = int.Parse(match.Groups["year"].Value);
-            _day = int.Parse(match.Groups["day"].Value);
+            Year = int.Parse(match.Groups["year"].Value);
+            Day = int.Parse(match.Groups["day"].Value);
         }
         else { throw new Exception("no regex match found"); }
     }
 
-    private async Task<string> Get(string uri)
-    {
-        var client = new HttpClient();
-        var request = new HttpRequestMessage
-        {
-            Method = HttpMethod.Get,
-            RequestUri = new Uri(uri),
-            Headers =
-            {
-                { "Cookie", $"session={_sessionCookie}" },
-            }
-        };
-
-        using (var response = await client.SendAsync(request))
-        {
-            response.EnsureSuccessStatusCode();
-            return await response.Content.ReadAsStringAsync();
-        }
-    }
-    private async Task<string> Post(string uri, HttpContent? content = null)
+    private async Task<string> SendRequest(HttpMethod method, string uri, HttpContent? content = null)
     {
         var client = new HttpClient();
         var request = new HttpRequestMessage
         {
-            Method = HttpMethod.Post,
+            Method = method,
             RequestUri = new Uri(uri),
-            Headers =
-            {
-                { "Cookie", $"session={_sessionCookie}" },
-            }
+            Headers = { { "Cookie", $"session={SessionCookie}" } }
         };
-
         if (content != null) { request.Content = content; }
 
-
         using (var response = await client.SendAsync(request))
         {
             response.EnsureSuccessStatusCode();
             return await response.Content.ReadAsStringAsync();
         }
     }
 
-    public async Task<string> GetInputText() => (await Get($"{DOMAIN}/{_year}/day/{_day}/input")).TrimEnd('\n');
+    public async Task<string> GetInputText() => (await SendRequest(HttpMethod.Get, $"{DOMAIN}/{Year}/day/{Day}/input")).TrimEnd('\n');
     public async Task<string[]> GetInputLines() => (await GetInputText()).Split('\n');
+
     public async Task<Dictionary<int, int>> GetAllStars()
     {
-        var response = (await Get($"{DOMAIN}/events"))
+        var response = (await SendRequest(HttpMethod.Get, $"{DOMAIN}/events"))
             .Split('\n')
             .Where(line => line.StartsWith("<div class=\"eventlist-event\">"))
             .ToArray();
@@ -92,18 +70,15 @@ public async Task<Dictionary<int, int>> GetAllStars()
             return new { Year = year, Stars = stars };
         }).ToDictionary(x => x.Year, x => x.Stars);
     }
-    public async Task<int> GetThisYearStars() => (await GetAllStars())[_year];
+
     public async Task<bool> SubmitAnswer(int level, object answer)
     {
         var content = new StringContent($"level={level}&answer={answer}")
         {
-            Headers =
-            {
-                ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded")
-            }
+            Headers = { ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded") }
         };
 
-        var response = await Post($"{DOMAIN}/{_year}/day/{_day}/answer", content);
+        var response = await SendRequest(HttpMethod.Post, $"{DOMAIN}/{Year}/day/{Day}/answer", content);
         return response.Contains("That's the right answer!");
     }
 }

AoC.API.csproj

@@ -9,9 +9,9 @@
     <Description>Handle personal AoC data directly from your .NET project</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>AoCAPI, Advent-of-Code-API</PackageTags>
-    <RepositoryUrl>https://github.com/hckmtrx/AoC.API</RepositoryUrl>
+    <RepositoryUrl>https://github.com/antonio-subasic/AoC.API</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageVersion>2.0.2</PackageVersion>
+    <PackageVersion>2.0.3</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

README.md

@@ -4,6 +4,7 @@
 A simple [NuGet](https://nuget.org) package to handle personal [AoC](https://adventofcode.com) data directly from your .NET project
 
 ## Documentation
+
 - [Add to your project](#add-to-your-project)
 - [Initialization](#initialization)
 - [Features](#features)
@@ -14,6 +15,7 @@ A simple [NuGet](https://nuget.org) package to handle personal [AoC](https://adv
 <br><br>
 
 # Add to your project
+
 ```bash
 dotnet add package AoCAPI
 ```
@@ -25,12 +27,15 @@ using AoC.API;
 <br>
 
 # Initialization
+
 ```csharp
 var client = new Session("session cookie", int year, int day);
 ```
+
 ```csharp
 var client = new Session("session cookie", string input, Regex pattern);
 ```
+
 > <picture>
 >   <source media="(prefers-color-scheme: dark)" srcset="https://github.com/Mqxx/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/info.svg">
 >   <img alt="Info" src="https://github.com/Mqxx/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/Info">
@@ -46,6 +51,7 @@ var client = new Session("session cookie", string input, Regex pattern);
 # Features
 
 ## Get input file
+
 ```csharp
 string inputText = client.GetInputText(); // input file (raw text)
 string inputLines = client.GetInputLines(); // input file (lines)
@@ -54,21 +60,19 @@ string inputLines = client.GetInputLines(); // input file (lines)
 <br>
 
 ## Get achieved stars
+
 ```csharp
-Dictionary<int, int> allStars = client.GetAllStars(); // all user's achieved stars
-int thisYearStars = client.GetThisYearStars(); // user's achieved stars from initialized year
+Dictionary<int, int> allStars = client.GetAllStars(); // all user's achieved stars (key = year, value = stars)
 ```
 
 <br>
 
 ## Submit answer
+
 ```csharp
 bool succeeded = client.SubmitAnswer(int level, object answer); // submits answer to initialized year and day, returns true if answer is correct
 ```
 
 <br><br>
 
->  credits to:<br>
-> [Max](https://github.com/Mqxx) - markdown info icons<br>
-> [Monday Morning Haskell](https://mmhaskell.com/) - documentation on how to obtaining session cookie<br>
-> [Developer.Mozilla](https://developer.mozilla.org) - documentation on how to name Regex groups
+> credits to:<br> > [Max](https://github.com/Mqxx) - markdown info icons<br> > [Monday Morning Haskell](https://mmhaskell.com/) - documentation on how to obtaining session cookie<br> > [Developer.Mozilla](https://developer.mozilla.org) - documentation on how to name Regex groups