#66 Change Meal FileName

PlanBGmbH · Mar 3, 2020 · 647ce03 · 647ce03
1 parent 2dcdfbe
commit 647ce03
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/PlanB.Butler.Services/PlanB.Butler.Services/Controllers/MealService.cs b/PlanB.Butler.Services/PlanB.Butler.Services/Controllers/MealService.cs
@@ -8,6 +8,7 @@
 using System.Net.Mime;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Web;
 
 using AzureFunctions.Extensions.Swashbuckle.Attribute;
 using Microsoft.AspNetCore.Http;
@@ -82,14 +83,16 @@ public static async Task<IActionResult> CreateMeal(
 
                     if (isValid)
                     {
-                        var date = mealModel.Date.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
+                        var fileName = CreateFileName(mealModel);
+                        trace.Add($"fileName", fileName);
+                        mealModel.Id = fileName;
 
-                        var filename = $"{date}-{mealModel.Restaurant}.json";
-                        trace.Add($"filename", filename);
+                        var fullFileName = $"{fileName}.json";
+                        trace.Add($"fullFileName", fullFileName);
 
                         req.HttpContext.Response.Headers.Add(Constants.ButlerCorrelationTraceHeader, correlationId.ToString());
 
-                        CloudBlockBlob blob = cloudBlobContainer.GetBlockBlobReference($"{filename}");
+                        CloudBlockBlob blob = cloudBlobContainer.GetBlockBlobReference($"{fullFileName}");
                         if (blob != null)
                         {
                             blob.Properties.ContentType = "application/json";
@@ -544,5 +547,18 @@ internal static bool Validate(MealModel mealModel, Guid correlationId, out Error
 
             return isValid;
         }
+
+        /// <summary>
+        /// Creates the name of the file.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <returns>FileName without extension.</returns>
+        internal static string CreateFileName(MealModel model)
+        {
+            var date = model.Date.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
+            string fileName = $"{date}-{model.Restaurant}";
+            fileName = HttpUtility.UrlEncode(fileName);
+            return fileName;
+        }
     }
 }
diff --git a/PlanB.Butler.Services/PlanB.Butler.Services/Models/MealModel.cs b/PlanB.Butler.Services/PlanB.Butler.Services/Models/MealModel.cs
@@ -14,21 +14,13 @@ namespace PlanB.Butler.Services.Models
     public class MealModel
     {
         /// <summary>
-        /// Gets the identifier.
+        /// Gets or sets the identifier.
         /// </summary>
         /// <value>
         /// The identifier.
         /// </value>
         [JsonProperty("id")]
-        public string Id
-        {
-            get
-            {
-                var date = this.Date.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
-                var id = $"{date}-{this.Restaurant}";
-                return id;
-            }
-        }
+        public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets the correlation identifier.