From bc2bd67cda5d57e2c3dba6135129d19b80842cd4 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Mon, 26 Jul 2021 11:58:57 +1000
Subject: [PATCH] Added setting description

---
 .../20201013035318_initial_schema.sql           |  1 +
 .../migrations/20201013035839_initial_data.sql  | 17 +++++++++++++++++
 backend/internal/entity/setting/apply.go        |  8 ++++++--
 backend/internal/entity/setting/model.go        | 11 ++++++-----
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/backend/embed/migrations/20201013035318_initial_schema.sql b/backend/embed/migrations/20201013035318_initial_schema.sql
index aa65b2ab..74195337 100644
--- a/backend/embed/migrations/20201013035318_initial_schema.sql
+++ b/backend/embed/migrations/20201013035318_initial_schema.sql
@@ -32,6 +32,7 @@ CREATE TABLE IF NOT EXISTS `setting`
 	created_on INTEGER NOT NULL DEFAULT 0,
 	modified_on INTEGER NOT NULL DEFAULT 0,
 	name TEXT NOT NULL,
+	description TEXT NOT NULL,
 	value TEXT NOT NULL,
 	UNIQUE (name)
 );
diff --git a/backend/embed/migrations/20201013035839_initial_data.sql b/backend/embed/migrations/20201013035839_initial_data.sql
index dad2ac8d..97a7df0c 100644
--- a/backend/embed/migrations/20201013035839_initial_data.sql
+++ b/backend/embed/migrations/20201013035839_initial_data.sql
@@ -5,14 +5,31 @@ INSERT INTO `setting` (
 	created_on,
 	modified_on,
 	name,
+	description,
 	value
 ) VALUES (
 	strftime('%s', 'now'),
 	strftime('%s', 'now'),
 	"error-reporting",
+	"If enabled, any application errors are reported to Sentry. Sensitive information is not sent. All information sent is also private.",
 	"true"
 );
 
+-- Default site
+INSERT INTO `setting` (
+	created_on,
+	modified_on,
+	name,
+	description,
+	value
+) VALUES (
+	strftime('%s', 'now'),
+	strftime('%s', 'now'),
+	"default-site",
+	"What to show users who hit your Nginx server by default",
+	"welcome"
+);
+
 -- Default Certificate Authorities
 
 INSERT INTO `certificate_authority` (
diff --git a/backend/internal/entity/setting/apply.go b/backend/internal/entity/setting/apply.go
index 72211a8e..29428975 100644
--- a/backend/internal/entity/setting/apply.go
+++ b/backend/internal/entity/setting/apply.go
@@ -10,6 +10,10 @@ func ApplySettings() {
 	logger.Debug("Applying Settings")
 
 	// Error-reporting
-	m, _ := GetByName("error-reporting")
-	config.ErrorReporting = m.Value.Decoded.(bool)
+	m, err := GetByName("error-reporting")
+	if err != nil {
+		logger.Error("ApplySettingsError", err)
+	} else {
+		config.ErrorReporting = m.Value.Decoded.(bool)
+	}
 }
diff --git a/backend/internal/entity/setting/model.go b/backend/internal/entity/setting/model.go
index 303268ae..e66d7276 100644
--- a/backend/internal/entity/setting/model.go
+++ b/backend/internal/entity/setting/model.go
@@ -15,11 +15,12 @@ const (
 
 // Model is the user model
 type Model struct {
-	ID         int          `json:"id" db:"id" filter:"id,integer"`
-	CreatedOn  types.DBDate `json:"created_on" db:"created_on" filter:"created_on,integer"`
-	ModifiedOn types.DBDate `json:"modified_on" db:"modified_on" filter:"modified_on,integer"`
-	Name       string       `json:"name" db:"name" filter:"name,string"`
-	Value      types.JSONB  `json:"value" db:"value"`
+	ID          int          `json:"id" db:"id" filter:"id,integer"`
+	CreatedOn   types.DBDate `json:"created_on" db:"created_on" filter:"created_on,integer"`
+	ModifiedOn  types.DBDate `json:"modified_on" db:"modified_on" filter:"modified_on,integer"`
+	Name        string       `json:"name" db:"name" filter:"name,string"`
+	Description string       `json:"description" db:"description" filter:"description,string"`
+	Value       types.JSONB  `json:"value" db:"value"`
 }
 
 func (m *Model) getByQuery(query string, params []interface{}) error {