From bea9d67446fb06fbfa254da6a33934d8d0ff48c7 Mon Sep 17 00:00:00 2001
From: Kichiyaki <xyztojajestem@gmail.com>
Date: Sun, 11 Jul 2021 08:33:39 +0200
Subject: [PATCH] one more opt to postgres.Config (SkipDBInitialization), move
 the queue package folder up

---
 pkg/cron/cron.go                                         | 2 +-
 pkg/postgres/postgres.go                                 | 9 ++++++---
 pkg/{cron => }/queue/config.go                           | 0
 pkg/{cron => }/queue/helpers.go                          | 0
 pkg/{cron => }/queue/queue.go                            | 2 +-
 pkg/{cron => }/queue/task.go                             | 0
 .../queue/task_delete_non_existent_villages.go           | 0
 .../queue/task_load_servers_and_update_data.go           | 0
 .../queue/task_load_versions_and_update_server_data.go   | 0
 .../queue/task_server_delete_non_existent_villages.go    | 0
 pkg/{cron => }/queue/task_update_ennoblements.go         | 0
 pkg/{cron => }/queue/task_update_history.go              | 0
 pkg/{cron => }/queue/task_update_server_data.go          | 0
 pkg/{cron => }/queue/task_update_server_ennoblements.go  | 0
 pkg/{cron => }/queue/task_update_server_history.go       | 0
 pkg/{cron => }/queue/task_update_server_stats.go         | 0
 pkg/{cron => }/queue/task_update_stats.go                | 0
 pkg/{cron => }/queue/task_vacuum.go                      | 0
 pkg/{cron => }/queue/task_vacuum_server_data.go          | 0
 19 files changed, 8 insertions(+), 5 deletions(-)
 rename pkg/{cron => }/queue/config.go (100%)
 rename pkg/{cron => }/queue/helpers.go (100%)
 rename pkg/{cron => }/queue/queue.go (97%)
 rename pkg/{cron => }/queue/task.go (100%)
 rename pkg/{cron => }/queue/task_delete_non_existent_villages.go (100%)
 rename pkg/{cron => }/queue/task_load_servers_and_update_data.go (100%)
 rename pkg/{cron => }/queue/task_load_versions_and_update_server_data.go (100%)
 rename pkg/{cron => }/queue/task_server_delete_non_existent_villages.go (100%)
 rename pkg/{cron => }/queue/task_update_ennoblements.go (100%)
 rename pkg/{cron => }/queue/task_update_history.go (100%)
 rename pkg/{cron => }/queue/task_update_server_data.go (100%)
 rename pkg/{cron => }/queue/task_update_server_ennoblements.go (100%)
 rename pkg/{cron => }/queue/task_update_server_history.go (100%)
 rename pkg/{cron => }/queue/task_update_server_stats.go (100%)
 rename pkg/{cron => }/queue/task_update_stats.go (100%)
 rename pkg/{cron => }/queue/task_vacuum.go (100%)
 rename pkg/{cron => }/queue/task_vacuum_server_data.go (100%)

diff --git a/pkg/cron/cron.go b/pkg/cron/cron.go
index 9c124f3..02e5dd4 100644
--- a/pkg/cron/cron.go
+++ b/pkg/cron/cron.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/robfig/cron/v3"
 
-	"github.com/tribalwarshelp/cron/pkg/cron/queue"
+	"github.com/tribalwarshelp/cron/pkg/queue"
 )
 
 type Cron struct {
diff --git a/pkg/postgres/postgres.go b/pkg/postgres/postgres.go
index b1c5c11..e0b7e89 100644
--- a/pkg/postgres/postgres.go
+++ b/pkg/postgres/postgres.go
@@ -14,7 +14,8 @@ import (
 var log = logrus.WithField("package", "pkg/postgres")
 
 type Config struct {
-	LogQueries bool
+	LogQueries           bool
+	SkipDBInitialization bool
 }
 
 func Connect(cfg *Config) (*pg.DB, error) {
@@ -27,8 +28,10 @@ func Connect(cfg *Config) (*pg.DB, error) {
 		})
 	}
 
-	if err := prepareDB(db); err != nil {
-		return nil, err
+	if cfg == nil || !cfg.SkipDBInitialization {
+		if err := prepareDB(db); err != nil {
+			return nil, err
+		}
 	}
 
 	return db, nil
diff --git a/pkg/cron/queue/config.go b/pkg/queue/config.go
similarity index 100%
rename from pkg/cron/queue/config.go
rename to pkg/queue/config.go
diff --git a/pkg/cron/queue/helpers.go b/pkg/queue/helpers.go
similarity index 100%
rename from pkg/cron/queue/helpers.go
rename to pkg/queue/helpers.go
diff --git a/pkg/cron/queue/queue.go b/pkg/queue/queue.go
similarity index 97%
rename from pkg/cron/queue/queue.go
rename to pkg/queue/queue.go
index 9cb6c94..9f1d9c4 100644
--- a/pkg/cron/queue/queue.go
+++ b/pkg/queue/queue.go
@@ -11,7 +11,7 @@ import (
 	"github.com/vmihailenco/taskq/v3/redisq"
 )
 
-var log = logrus.WithField("package", "pkg/cron/queue")
+var log = logrus.WithField("package", "pkg/queue")
 
 type Queue struct {
 	redis        redis.UniversalClient
diff --git a/pkg/cron/queue/task.go b/pkg/queue/task.go
similarity index 100%
rename from pkg/cron/queue/task.go
rename to pkg/queue/task.go
diff --git a/pkg/cron/queue/task_delete_non_existent_villages.go b/pkg/queue/task_delete_non_existent_villages.go
similarity index 100%
rename from pkg/cron/queue/task_delete_non_existent_villages.go
rename to pkg/queue/task_delete_non_existent_villages.go
diff --git a/pkg/cron/queue/task_load_servers_and_update_data.go b/pkg/queue/task_load_servers_and_update_data.go
similarity index 100%
rename from pkg/cron/queue/task_load_servers_and_update_data.go
rename to pkg/queue/task_load_servers_and_update_data.go
diff --git a/pkg/cron/queue/task_load_versions_and_update_server_data.go b/pkg/queue/task_load_versions_and_update_server_data.go
similarity index 100%
rename from pkg/cron/queue/task_load_versions_and_update_server_data.go
rename to pkg/queue/task_load_versions_and_update_server_data.go
diff --git a/pkg/cron/queue/task_server_delete_non_existent_villages.go b/pkg/queue/task_server_delete_non_existent_villages.go
similarity index 100%
rename from pkg/cron/queue/task_server_delete_non_existent_villages.go
rename to pkg/queue/task_server_delete_non_existent_villages.go
diff --git a/pkg/cron/queue/task_update_ennoblements.go b/pkg/queue/task_update_ennoblements.go
similarity index 100%
rename from pkg/cron/queue/task_update_ennoblements.go
rename to pkg/queue/task_update_ennoblements.go
diff --git a/pkg/cron/queue/task_update_history.go b/pkg/queue/task_update_history.go
similarity index 100%
rename from pkg/cron/queue/task_update_history.go
rename to pkg/queue/task_update_history.go
diff --git a/pkg/cron/queue/task_update_server_data.go b/pkg/queue/task_update_server_data.go
similarity index 100%
rename from pkg/cron/queue/task_update_server_data.go
rename to pkg/queue/task_update_server_data.go
diff --git a/pkg/cron/queue/task_update_server_ennoblements.go b/pkg/queue/task_update_server_ennoblements.go
similarity index 100%
rename from pkg/cron/queue/task_update_server_ennoblements.go
rename to pkg/queue/task_update_server_ennoblements.go
diff --git a/pkg/cron/queue/task_update_server_history.go b/pkg/queue/task_update_server_history.go
similarity index 100%
rename from pkg/cron/queue/task_update_server_history.go
rename to pkg/queue/task_update_server_history.go
diff --git a/pkg/cron/queue/task_update_server_stats.go b/pkg/queue/task_update_server_stats.go
similarity index 100%
rename from pkg/cron/queue/task_update_server_stats.go
rename to pkg/queue/task_update_server_stats.go
diff --git a/pkg/cron/queue/task_update_stats.go b/pkg/queue/task_update_stats.go
similarity index 100%
rename from pkg/cron/queue/task_update_stats.go
rename to pkg/queue/task_update_stats.go
diff --git a/pkg/cron/queue/task_vacuum.go b/pkg/queue/task_vacuum.go
similarity index 100%
rename from pkg/cron/queue/task_vacuum.go
rename to pkg/queue/task_vacuum.go
diff --git a/pkg/cron/queue/task_vacuum_server_data.go b/pkg/queue/task_vacuum_server_data.go
similarity index 100%
rename from pkg/cron/queue/task_vacuum_server_data.go
rename to pkg/queue/task_vacuum_server_data.go