change naming user struct

config.go

@@ -10,13 +10,13 @@ import (
 
 // TransportConfig struct
 type TransportConfig struct {
-	LogLevel   logging.Level    `yaml:"log_level"`
-	Database   DatabaseConfig   `yaml:"database"`
-	SentryDSN  string           `yaml:"sentry_dsn"`
-	HTTPServer HTTPServerConfig `yaml:"http_server"`
-	Debug      bool             `yaml:"debug"`
-	UpdateTime int              `yaml:"update_time"`
-	ConfigAWS  ConfigAWS        `yaml:"config_aws"`
+	LogLevel       logging.Level    `yaml:"log_level"`
+	Database       DatabaseConfig   `yaml:"database"`
+	SentryDSN      string           `yaml:"sentry_dsn"`
+	HTTPServer     HTTPServerConfig `yaml:"http_server"`
+	Debug          bool             `yaml:"debug"`
+	UpdateInterval int              `yaml:"update_interval"`
+	ConfigAWS      ConfigAWS        `yaml:"config_aws"`
 }
 
 // ConfigAWS struct

config.yml.dist

@@ -11,7 +11,7 @@ log_level: 5
 
 debug: false
 
-update_time: 24
+update_interval: 24
 
 config_aws:
     access_key_id: ~

migrations/1528208070_app.down.sql

@@ -1 +1 @@
-drop table user_tg;
+drop table users;

migrations/1528208070_app.up.sql

@@ -1,4 +1,4 @@
-create table user_tg
+create table users
 (
   id serial not null
     constraint user_tg_pkey
@@ -10,4 +10,3 @@ create table user_tg
   updated_at  timestamp with time zone,
   constraint user_tg_key unique(external_id, user_photo, user_photo_id)
 );
-

models.go

@@ -28,8 +28,8 @@ type Bot struct {
 	Active       bool `json:"active,omitempty"`
 }
 
-// UserTG model
-type UserTG struct {
+// Users model
+type Users struct {
 	ID           int    `gorm:"primary_key"`
 	ExternalID   int    `gorm:"external_id;not null;unique"`
 	UserPhotoURL string `gorm:"user_photo type:varchar(255);unique"`

repository.go

@@ -79,12 +79,12 @@ func getConnectionById(id int) *Connection {
 	return &connection
 }
 
-func (u *UserTG) saveUser() error {
+func (u *Users) saveUser() error {
 	return orm.DB.Save(u).Error
 }
 
-func getUserByExternalID(eid int) *UserTG {
-	user := UserTG{ExternalID: eid}
+func getUserByExternalID(eid int) *Users {
+	user := Users{ExternalID: eid}
 	orm.DB.First(&user)
 
 	return &user

telegram.go

@@ -75,7 +75,7 @@ func telegramWebhookHandler(w http.ResponseWriter, r *http.Request, token string
 
 	user := getUserByExternalID(update.Message.From.ID)
 
-	if time.Now().After(user.UpdatedAt.Add(time.Hour*time.Duration(config.UpdateTime))) || user.ID == 0 {
+	if time.Now().After(user.UpdatedAt.Add(time.Hour*time.Duration(config.UpdateInterval))) || user.ID == 0 {
 
 		fileID, fileURL, err := getFileIDAndURL(b.Token, update.Message.From.ID)
 		if err != nil {