From 49feb1958c15fe897de860d108ceb16bdf8cca76 Mon Sep 17 00:00:00 2001
From: Ben Congdon <bencongdon96@gmail.com>
Date: Sun, 29 Nov 2020 17:04:18 -0800
Subject: [PATCH] Add created_at field for entries
---
client/core.go | 1 +
database/migration.go | 2 +-
database/sql.go | 4 ++++
database/sql/schema_version_42.sql | 2 ++
model/entry.go | 5 +++--
model/entry_test.go | 2 +-
storage/entry_query_builder.go | 3 +++
7 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 database/sql/schema_version_42.sql
diff --git a/client/core.go b/client/core.go
index b521729b..ddb8f3eb 100644
--- a/client/core.go
+++ b/client/core.go
@@ -137,6 +137,7 @@ type Entry struct {
Title string `json:"title"`
URL string `json:"url"`
Date time.Time `json:"published_at"`
+ CreatedAt time.Time `json:"created_at"`
Content string `json:"content"`
Author string `json:"author"`
ShareCode string `json:"share_code"`
diff --git a/database/migration.go b/database/migration.go
index 8c291edb..02897236 100644
--- a/database/migration.go
+++ b/database/migration.go
@@ -12,7 +12,7 @@ import (
"miniflux.app/logger"
)
-const schemaVersion = 41
+const schemaVersion = 42
// Migrate executes database migrations.
func Migrate(db *sql.DB) {
diff --git a/database/sql.go b/database/sql.go
index 5bf464c8..4800b896 100644
--- a/database/sql.go
+++ b/database/sql.go
@@ -204,6 +204,9 @@ alter table users add column entry_direction entry_sorting_direction default 'as
;
`,
"schema_version_41": `alter table entries add column reading_time int not null default 0;`,
+ "schema_version_42": `alter table entries add column created_at timestamp with time zone not null default now();
+update entries set created_at = published_at;
+`,
"schema_version_5": `create table integrations (
user_id int not null,
pinboard_enabled bool default 'f',
@@ -266,6 +269,7 @@ var SqlMapChecksums = map[string]string{
"schema_version_4": "216ea3a7d3e1704e40c797b5dc47456517c27dbb6ca98bf88812f4f63d74b5d9",
"schema_version_40": "6a8fec92399f853ed6817aff4cfa43255dce4c19afad796e41519d09de62105e",
"schema_version_41": "128e118ce61267ea1f6ae03b63a6d4734eae87e520b00e309ad083f1f6afdfe5",
+ "schema_version_42": "3d0cd422c6d9d13e7a619a8dbf081e17750881e0ae9ae380475b09d37ada9e33",
"schema_version_5": "46397e2f5f2c82116786127e9f6a403e975b14d2ca7b652a48cd1ba843e6a27c",
"schema_version_6": "9d05b4fb223f0e60efc716add5048b0ca9c37511cf2041721e20505d6d798ce4",
"schema_version_7": "33f298c9aa30d6de3ca28e1270df51c2884d7596f1283a75716e2aeb634cd05c",
diff --git a/database/sql/schema_version_42.sql b/database/sql/schema_version_42.sql
new file mode 100644
index 00000000..b2937475
--- /dev/null
+++ b/database/sql/schema_version_42.sql
@@ -0,0 +1,2 @@
+alter table entries add column created_at timestamp with time zone not null default now();
+update entries set created_at = published_at;
diff --git a/model/entry.go b/model/entry.go
index abd303ed..d10e9740 100644
--- a/model/entry.go
+++ b/model/entry.go
@@ -29,6 +29,7 @@ type Entry struct {
URL string `json:"url"`
CommentsURL string `json:"comments_url"`
Date time.Time `json:"published_at"`
+ CreatedAt time.Time `json:"created_at"`
Content string `json:"content"`
Author string `json:"author"`
ShareCode string `json:"share_code"`
@@ -54,11 +55,11 @@ func ValidateEntryStatus(status string) error {
// ValidateEntryOrder makes sure the sorting order is valid.
func ValidateEntryOrder(order string) error {
switch order {
- case "id", "status", "changed_at", "published_at", "category_title", "category_id":
+ case "id", "status", "changed_at", "published_at", "created_at", "category_title", "category_id":
return nil
}
- return fmt.Errorf(`Invalid entry order, valid order values are: "id", "status", "changed_at", "published_at", "category_title", "category_id"`)
+ return fmt.Errorf(`Invalid entry order, valid order values are: "id", "status", "changed_at", "published_at", "created_at", "category_title", "category_id"`)
}
// ValidateDirection makes sure the sorting direction is valid.
diff --git a/model/entry_test.go b/model/entry_test.go
index c16bd9bb..e878f94b 100644
--- a/model/entry_test.go
+++ b/model/entry_test.go
@@ -19,7 +19,7 @@ func TestValidateEntryStatus(t *testing.T) {
}
func TestValidateEntryOrder(t *testing.T) {
- for _, status := range []string{"id", "status", "changed_at", "published_at", "category_title", "category_id"} {
+ for _, status := range []string{"id", "status", "changed_at", "published_at", "created_at", "category_title", "category_id"} {
if err := ValidateEntryOrder(status); err != nil {
t.Error(`A valid order should not generate any error`)
}
diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go
index 58b7e576..f86afce6 100644
--- a/storage/entry_query_builder.go
+++ b/storage/entry_query_builder.go
@@ -227,6 +227,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
e.status,
e.starred,
e.reading_time,
+ e.created_at,
f.title as feed_title,
f.feed_url,
f.site_url,
@@ -286,6 +287,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
&entry.Status,
&entry.Starred,
&entry.ReadingTime,
+ &entry.CreatedAt,
&entry.Feed.Title,
&entry.Feed.FeedURL,
&entry.Feed.SiteURL,
@@ -312,6 +314,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
// Make sure that timestamp fields contains timezone information (API)
entry.Date = timezone.Convert(tz, entry.Date)
+ entry.CreatedAt = timezone.Convert(tz, entry.CreatedAt)
entry.Feed.CheckedAt = timezone.Convert(tz, entry.Feed.CheckedAt)
entry.Feed.ID = entry.FeedID
--
GitLab