Merge pull request #71 from crupest/cache

Add cache support for timeline post data.

1 files changed, 6 insertions, 4 deletions

diff --git a/Timeline/Controllers/TimelineController.cs b/Timeline/Controllers/TimelineController.cs
index 58390c29..f1781ff3 100644
--- a/Timeline/Controllers/TimelineController.cs
+++ b/Timeline/Controllers/TimelineController.cs
@@ -3,12 +3,12 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;

 using Microsoft.AspNetCore.Mvc;

 using Microsoft.Extensions.Logging;

-using Microsoft.Net.Http.Headers;

 using System;

 using System.Collections.Generic;

 using System.ComponentModel.DataAnnotations;

 using System.Threading.Tasks;

 using Timeline.Filters;

+using Timeline.Helpers;

 using Timeline.Models;

 using Timeline.Models.Http;

 using Timeline.Models.Validation;

@@ -114,7 +114,6 @@ namespace Timeline.Controllers
             return result;

         }

 

-        // TODO: Make cache available.

         [HttpGet("timelines/{name}/posts/{id}/data")]

         public async Task<ActionResult<List<TimelinePostInfo>>> PostDataGet([FromRoute][GeneralTimelineName] string name, [FromRoute] long id)

         {

@@ -125,8 +124,11 @@ namespace Timeline.Controllers
 

             try

             {

-                var data = await _service.GetPostData(name, id);

-                return File(data.Data, data.Type, data.LastModified, new EntityTagHeaderValue($"\"{data.ETag}\""));

+                return await DataCacheHelper.GenerateActionResult(this, () => _service.GetPostDataETag(name, id), async () =>

+                {

+                    var data = await _service.GetPostData(name, id);

+                    return data;

+                });

             }

             catch (TimelinePostNotExistException)

             {