Merge pull request #45 from crupest/avatar-cache

Add 304 response for If-Modified-Since in avatar.

2 files changed, 22 insertions, 4 deletions

diff --git a/Timeline/Entities/DatabaseContext.cs b/Timeline/Entities/DatabaseContext.cs
index f32e5992..bc06b9df 100644
--- a/Timeline/Entities/DatabaseContext.cs
+++ b/Timeline/Entities/DatabaseContext.cs
@@ -28,6 +28,7 @@ namespace Timeline.Entities
         [Column("version"), Required]

         public long Version { get; set; }

 

+        [Required]

         public UserAvatar Avatar { get; set; }

     }

 

@@ -42,7 +43,7 @@ namespace Timeline.Entities
         protected override void OnModelCreating(ModelBuilder modelBuilder)

         {

             modelBuilder.Entity<User>().Property(e => e.Version).HasDefaultValue(0);

-

+            modelBuilder.Entity<User>().HasIndex(e => e.Name);

         }

 

         public DbSet<User> Users { get; set; }

diff --git a/Timeline/Entities/UserAvatar.cs b/Timeline/Entities/UserAvatar.cs
index d7c24403..b941445d 100644
--- a/Timeline/Entities/UserAvatar.cs
+++ b/Timeline/Entities/UserAvatar.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;

+using System;

+using System.ComponentModel.DataAnnotations;

 using System.ComponentModel.DataAnnotations.Schema;

 

 namespace Timeline.Entities

@@ -9,10 +10,26 @@ namespace Timeline.Entities
         [Column("id"), Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]

         public long Id { get; set; }

 

-        [Column("data"), Required]

+        [Column("data")]

         public byte[] Data { get; set; }

 

-        [Column("type"), Required]

+        [Column("type")]

         public string Type { get; set; }

+

+        [Column("last_modified"), Required]

+        public DateTime LastModified { get; set; }

+

+        public long UserId { get; set; }

+

+        public static UserAvatar Create(DateTime lastModified)

+        {

+            return new UserAvatar

+            {

+                Id = 0,

+                Data = null,

+                Type = null,

+                LastModified = lastModified

+            };

+        }

     }

 }