refactor: migrate to latest gorm version

refactor: language mappings implementation

migrations/common/common.go

@@ -0,0 +1,11 @@
+package common
+
+import (
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+)
+
+type migrationFunc struct {
+	f    func(db *gorm.DB, cfg *config.Config) error
+	name string
+}

migrations/common/custom_post.go

@@ -0,0 +1,30 @@
+package common
+
+import (
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+	"log"
+)
+
+var customPostMigrations []migrationFunc
+
+func init() {
+	customPostMigrations = []migrationFunc{
+		{
+			f: func(db *gorm.DB, cfg *config.Config) error {
+				return cfg.GetFixturesFunc(cfg.Db.Dialect)(db)
+			},
+			name: "apply fixtures",
+		},
+		// TODO: add function to modify aggregated summaries according to configured custom language mappings
+	}
+}
+
+func RunCustomPostMigrations(db *gorm.DB, cfg *config.Config) {
+	for _, m := range customPostMigrations {
+		log.Printf("running migration '%s'\n", m.name)
+		if err := m.f(db, cfg); err != nil {
+			log.Fatalf("migration '%s' failed – %v\n", m.name, err)
+		}
+	}
+}

migrations/common/custom_pre.go

@@ -0,0 +1,33 @@
+package common
+
+import (
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+	"log"
+)
+
+var customPreMigrations []migrationFunc
+
+func init() {
+	customPreMigrations = []migrationFunc{
+		{
+			f: func(db *gorm.DB, cfg *config.Config) error {
+				if db.Migrator().HasTable("custom_rules") {
+					return db.Migrator().RenameTable("custom_rules", &models.LanguageMapping{})
+				}
+				return nil
+			},
+			name: "rename language mappings table",
+		},
+	}
+}
+
+func RunCustomPreMigrations(db *gorm.DB, cfg *config.Config) {
+	for _, m := range customPreMigrations {
+		log.Printf("running migration '%s'\n", m.name)
+		if err := m.f(db, cfg); err != nil {
+			log.Fatalf("migration '%s' failed – %v\n", m.name, err)
+		}
+	}
+}

migrations/common/fixtures.go

@@ -1,15 +0,0 @@
-package common
-
-import (
-	"github.com/jinzhu/gorm"
-	"github.com/muety/wakapi/config"
-	"log"
-)
-
-func ApplyFixtures(db *gorm.DB) {
-	cfg := config.Get()
-
-	if err := cfg.GetFixturesFunc(cfg.Db.Dialect)(db); err != nil {
-		log.Fatal(err)
-	}
-}

migrations/common/languages.go

@@ -1,9 +1,9 @@
 package common
 
 import (
-	"github.com/jinzhu/gorm"
 	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
 	"log"
 )
 

migrations/sqlite3/1_initial.sql

@@ -1,87 +0,0 @@
--- +migrate Up
--- SQL in section 'Up' is executed when this migration is applied
-create table aliases
-(
-    id      integer primary key autoincrement,
-    type    integer      not null,
-    user_id varchar(255) not null,
-    key     varchar(255) not null,
-    value   varchar(255) not null
-);
-
-create index idx_alias_type_key
-    on aliases (type, key);
-
-create index idx_alias_user
-    on aliases (user_id);
-
-create table summaries
-(
-    id        integer primary key autoincrement,
-    user_id   varchar(255) not null,
-    from_time timestamp default CURRENT_TIMESTAMP not null,
-    to_time   timestamp default CURRENT_TIMESTAMP not null
-);
-
-create index idx_time_summary_user
-    on summaries (user_id, from_time, to_time);
-
-create table summary_items
-(
-    id         integer primary key autoincrement,
-    summary_id integer REFERENCES summaries (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    type       integer,
-    key        varchar(255),
-    total      bigint
-);
-
-create table users
-(
-    id       varchar(255) primary key,
-    api_key  varchar(255) unique,
-    password varchar(255)
-);
-
-create table heartbeats
-(
-    id               integer primary key autoincrement,
-    user_id          varchar(255) not null REFERENCES users (id) ON DELETE RESTRICT ON UPDATE RESTRICT,
-    entity           varchar(255) not null,
-    type             varchar(255),
-    category         varchar(255),
-    project          varchar(255),
-    branch           varchar(255),
-    language         varchar(255),
-    is_write         bool,
-    editor           varchar(255),
-    operating_system varchar(255),
-    time             timestamp default CURRENT_TIMESTAMP
-);
-
-create index idx_entity
-    on heartbeats (entity);
-
-create index idx_language
-    on heartbeats (language);
-
-create index idx_time
-    on heartbeats (time);
-
-create index idx_time_user
-    on heartbeats (user_id, time);
-
-
-
--- +migrate Down
--- SQL section 'Down' is executed when this migration is rolled back
-DROP INDEX idx_alias_user;
-DROP INDEX idx_alias_type_key;
-DROP TABLE aliases;
-DROP INDEX idx_time_summary_user;
-DROP TABLE summaries;
-DROP TABLE summary_items;
-DROP TABLE heartbeats;
-DROP INDEX idx_entity;
-DROP INDEX idx_language;
-DROP INDEX idx_time;
-DROP INDEX idx_time_user;

migrations/sqlite3/2_key_value_table.sql

@@ -1,11 +0,0 @@
--- +migrate Up
--- SQL in section 'Up' is executed when this migration is applied
-create table key_string_values
-(
-    key      varchar(255) primary key,
-    value    text
-);
-
--- +migrate Down
--- SQL section 'Down' is executed when this migration is rolled back
-drop table key_string_value;

migrations/sqlite3/3_user_creation_date.sql

@@ -1,20 +0,0 @@
--- +migrate Up
--- SQL in section 'Up' is executed when this migration is applied
-
--- SQLite does not allow altering a table to add a new column with default of CURRENT_TIMESTAMP
--- See https://www.sqlite.org/lang_altertable.html
-
-alter table users
-    add `created_at` timestamp default '2020-01-01T00:00:00.000' not null;
-
-alter table users
-    add `last_logged_in_at` timestamp default '2020-01-01T00:00:00.000' not null;
-
--- +migrate Down
--- SQL section 'Down' is executed when this migration is rolled back
-
-alter table users
-    drop column `created_at`;
-
-alter table users
-    drop column `last_logged_in_at`;

migrations/sqlite3/4_machine_column.sql

@@ -1,11 +0,0 @@
--- +migrate Up
--- SQL in section 'Up' is executed when this migration is applied
-
-alter table heartbeats
-    add column `machine` varchar(255);
-
--- +migrate Down
--- SQL section 'Down' is executed when this migration is rolled back
-
-alter table heartbeats
-    drop column `machine`;

migrations/sqlite3/5_badges_column.sql

@@ -1,11 +0,0 @@
--- +migrate Up
--- SQL in section 'Up' is executed when this migration is applied
-
-alter table users
-    add column `badges_enabled` tinyint(1) default 0 not null;
-
--- +migrate Down
--- SQL section 'Down' is executed when this migration is rolled back
-
-alter table users
-    drop column `badges_enabled`;

migrations/sqlite3/6_customrule_table.sql

@@ -1,15 +0,0 @@
--- +migrate Up
--- SQL in section 'Up' is executed when this migration is applied
-
-create table custom_rules
-(
-    id               integer primary key autoincrement,
-    user_id          varchar(255) not null REFERENCES users (id) ON DELETE RESTRICT ON UPDATE RESTRICT,
-    extension        varchar(255),
-    language         varchar(255)
-);
-
--- +migrate Down
--- SQL section 'Down' is executed when this migration is rolled back
-
-DROP TABLE custom_rules;