sync code

App/Data/FlowerDatabase.cs

@@ -26,12 +26,12 @@ public class FlowerDatabase
 #if DEBUG
         var result =
 #endif
-            await database.CreateTablesAsync<FlowerItem, RecordItem>();
+            await database.CreateTablesAsync<FlowerItem, RecordItem, PhotoItem>();
 
 #if DEBUG
         foreach (var item in result.Results)
         {
-            logger.LogDebug("create table {table}, result: {result}", item.Key, item.Value);
+            logger.LogInformation("create table {table}, result: {result}", item.Key, item.Value);
         }
 #endif
     }

App/Data/Model/FlowerItem.cs

@@ -18,11 +18,11 @@ public class FlowerItem
         {
             if (categoryName == null)
             {
-                if (!Constants.Categories.TryGetValue(CategoryId, out categoryName))
+                if (!Constants.Categories.TryGetValue(CategoryId, out var name))
                 {
-                    categoryName = Constants.CategoryOther;
+                    name = Constants.CategoryOther;
                 }
-                // TODO: i18n
+                categoryName = LocalizationResource.GetText(name);
             }
             return categoryName;
         }
@@ -40,6 +40,6 @@ public class FlowerItem
     [Column("purchase")]
     public string Purchase { get; set; }
 
-    [Column("photo")]
-    public byte[] Photo { get; set; }
+    [Column("memo")]
+    public string Memo { get; set; }
 }

App/Data/Model/PhotoItem.cs

@@ -0,0 +1,28 @@
+using SQLite;
+
+namespace Blahblah.FlowerStory.Data.Model;
+
+[Table("photos")]
+public class PhotoItem
+{
+    [Column("pid"), PrimaryKey, AutoIncrement]
+    public int Id { get; set; }
+
+    [Column("fid")]
+    public int FlowerId { get; set; }
+
+    [Column("rid")]
+    public int RecordId { get; set; }
+
+    [Column("filetype")]
+    public string FileType { get; set; }
+
+    [Column("filename")]
+    public string FileName { get; set; }
+
+    [Column("path")]
+    public string Path { get; set; }
+
+    [Column("dateupload")]
+    public DateTimeOffset DateUpload { get; set; }
+}

App/Data/Model/RecordItem.cs

@@ -8,6 +8,9 @@ public class RecordItem
     [Column("rid"), PrimaryKey, AutoIncrement]
     public int Id { get; set; }
 
+    [Column("fid")]
+    public int FlowerId { get; set; }
+
     [Column("eid")]
     public int EventId { get; set; }
 
@@ -18,15 +21,16 @@ public class RecordItem
         {
             if (eventName == null)
             {
+                string evtkey;
                 if (Constants.Events.TryGetValue(EventId, out var @event))
                 {
-                    eventName = @event.Name;
+                    evtkey = @event.Name;
                 }
                 else
                 {
-                    eventName = Constants.EventUnknown;
+                    evtkey = Constants.EventUnknown;
                 }
-                // TODO: i18n
+                eventName = LocalizationResource.GetText(evtkey);
             }
             return eventName;
         }
@@ -41,6 +45,6 @@ public class RecordItem
     [Column("byname")]
     public string ByUserName { get; set; }
 
-    [Column("photo")]
-    public byte[] Photo { get; set; }
+    [Column("memo")]
+    public string Memo { get; set; }
 }

App/Data/Model/UserItem.cs

@@ -2,10 +2,19 @@
 
 public class UserItem
 {
-    public string Id { get; set; }
+    public int Id { get; set; }
+
+    public string UserId { get; set; }
+
     public int Level { get; set; }
+
     public DateTimeOffset RegisterDate { get; set; }
+
     public string Name { get; set; }
+
     public string Email { get; set; }
+
     public string Mobile { get; set; }
+
+    public byte[] Avatar { get; set; }
 }