fix: fix coop image url, fix due date on product upsert

manuel-rw · Jan 27, 2024 · edefcb3 · edefcb3
1 parent caac9a1
commit edefcb3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/GrocyScanner.Core/GrocyClient/GrocyClient.cs b/GrocyScanner.Core/GrocyClient/GrocyClient.cs
@@ -80,13 +80,16 @@ public async Task AddProductToStock(int productId, int amount, DateOnly? bestBef
             throw new ArgumentException("Amount cannot be negative", nameof(amount));
         }
 
+        // this is Grocy's way of "no due date". Inserting null sadly displays "today" as the due date
+        DateOnly bestBeforeOrDefault = bestBefore ?? new DateOnly(2999, 12, 31);
+
         HttpClient httpClient = _httpClientFactory.CreateClient();
         HttpRequestMessage httpRequestMessage = new(HttpMethod.Post,
             $"{_grocyConfiguration.Value.BaseUrl}/api/stock/products/{productId}/add");
         httpRequestMessage.Headers.Add("GROCY-API-KEY", _grocyConfiguration.Value.ApiKey);
         httpRequestMessage.Headers.Add("accept", "application/json");
-        string json =
-            $@"{{""amount"": {amount},""best_before_date"":""{bestBefore:yyyy-MM-dd}"",""price"":""{price:N}""}}";
+        string json = 
+            $@"{{""amount"": {amount},""best_before_date"":""{bestBeforeOrDefault:yyyy-MM-dd}"",""price"":""{price:N}""}}";
         httpRequestMessage.Content = new StringContent(json);
         httpRequestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
         await httpClient.SendAsync(httpRequestMessage);

diff --git a/GrocyScanner.Core/Providers/CoopProductProvider.cs b/GrocyScanner.Core/Providers/CoopProductProvider.cs
@@ -78,13 +78,14 @@ public CoopProductProvider(IHttpClientFactory httpClientFactory, ILogger<CoopPro
 
     private static string GetBestQualityImage(CoopProductImage coopProductImage)
     {
-        return coopProductImage.Srcset
+        string uri = coopProductImage.Srcset
             .OrderByDescending(sourceSetPair =>
                 int.Parse(sourceSetPair
                     .Last()
                     .Trim('w')))
             .First()
             .First();
+        return $"https:{uri}";
     }
 
     public string Name => "Coop";