rename module

Author: steveyiyo

internal/Database/Database.go

@@ -1,52 +1,52 @@
-package Database
+package database
 
 import (
 	"database/sql"
 	"time"
 
 	_ "github.com/mattn/go-sqlite3"
-	Tools "github.com/steveyiyo/url-shortener/internal/tools"
+	"github.com/steveyiyo/url-shortener/internal/tools"
 )
 
 // Create file and table
 func CreateTable() {
 	// Create Table
 	db, err := sql.Open("sqlite3", "./data.db")
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	stmt, err := db.Prepare("CREATE TABLE IF NOT EXISTS urlinfo (ShortID string, Link string, Expireat string);")
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	stmt.Exec()
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	db.Close()
 }
 
 // Add data to DB
 func AddData(ShortID string, Link string, ExpireAt int64) {
 	db, err := sql.Open("sqlite3", "./data.db")
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	stmt, err := db.Prepare("INSERT INTO urlinfo(ShortID, Link, Expireat) values(?,?,?)")
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	res, err := stmt.Exec(ShortID, Link, ExpireAt)
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	res.LastInsertId()
 	db.Close()
 }
 
 // Get data from DB
 func QueryData(ID string) (bool, string) {
 	db, err := sql.Open("sqlite3", "./data.db")
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	now := time.Now().Unix()
 	rows, err := db.Query("SELECT * FROM urlinfo WHERE ShortID = ?", ID)
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 	status := false
 	URL := ""
 	for rows.Next() {
 		var Link string
 		var Expireat int64
 		var ShortLink string
 		err = rows.Scan(&ShortLink, &Link, &Expireat)
-		Tools.ErrCheck(err)
+		tools.ErrCheck(err)
 		if Link != "" {
 			URL = Link
 			if Expireat > now {

internal/Tools/Tools.go

@@ -1,4 +1,4 @@
-package Tools
+package tools
 
 import (
 	"fmt"

internal/cache/cache.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/go-redis/redis/v8"
-	Tools "github.com/steveyiyo/url-shortener/internal/tools"
+	"github.com/steveyiyo/url-shortener/internal/tools"
 )
 
 var Redis *redis.Client
@@ -25,7 +25,7 @@ func AddData(key string, value string, second time.Duration) bool {
 	ctx := context.Background()
 
 	err := Redis.Set(ctx, key, value, second*time.Second).Err()
-	return Tools.ErrCheck(err)
+	return tools.ErrCheck(err)
 }
 
 // Query data from Redis
@@ -36,12 +36,12 @@ func QueryData(key string) (bool, string) {
 	var return_value string
 
 	value, err := Redis.Get(ctx, key).Result()
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 
 	if err == redis.Nil {
 		return_status = false
 		return_value = ""
-	} else if !Tools.ErrCheck(err) {
+	} else if !tools.ErrCheck(err) {
 		log.Println(err)
 	} else {
 		return_status = true

internal/cache/cache_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/go-redis/redis/v8"
-	Tools "github.com/steveyiyo/url-shortener/internal/tools"
+	"github.com/steveyiyo/url-shortener/internal/tools"
 )
 
 var Redis *redis.Client
@@ -27,7 +27,7 @@ func AddData(key string, value string, second time.Duration) bool {
 	ctx := context.Background()
 
 	err := Redis.Set(ctx, key, value, second*time.Second).Err()
-	return Tools.ErrCheck(err)
+	return tools.ErrCheck(err)
 }
 
 // Query data from Redis
@@ -38,12 +38,12 @@ func QueryData(key string) (bool, string) {
 	var return_value string
 
 	value, err := Redis.Get(ctx, key).Result()
-	Tools.ErrCheck(err)
+	tools.ErrCheck(err)
 
 	if err == redis.Nil {
 		return_status = false
 		return_value = ""
-	} else if !Tools.ErrCheck(err) {
+	} else if !tools.ErrCheck(err) {
 		log.Println(err)
 	} else {
 		return_status = true

main.go

@@ -8,8 +8,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/viper"
 	"github.com/steveyiyo/url-shortener/internal/cache"
-	Database "github.com/steveyiyo/url-shortener/internal/database"
-	Tools "github.com/steveyiyo/url-shortener/internal/tools"
+	"github.com/steveyiyo/url-shortener/internal/database"
+	"github.com/steveyiyo/url-shortener/internal/tools"
 )
 
 // Predefined variable and struct
@@ -48,21 +48,21 @@ func AddURL(c *gin.Context) {
 	var return_data URLid
 
 	// Check Time and Convert to Unix format
-	isTimestampOk, timestamp := Tools.ConvertTimetoUnix(data.ExpiredAt)
+	isTimestampOk, timestamp := tools.ConvertTimetoUnix(data.ExpiredAt)
 
 	// Check Limit IP
 	limit_check, _ := cache.QueryData(c.ClientIP())
 
 	// Check Limit
 	if !limit_check {
 		// Check Link and Time Valid
-		if Tools.CheckLinkValid(data.URL) && (isTimestampOk) {
+		if tools.CheckLinkValid(data.URL) && (isTimestampOk) {
 
 			// Random Short ID
-			ShortID := Tools.RandomString(5)
+			ShortID := tools.RandomString(5)
 
 			// Add data to DB
-			Database.AddData(ShortID, data.URL, timestamp)
+			database.AddData(ShortID, data.URL, timestamp)
 
 			// Add Limit IP to Redis
 			cache.AddData(c.ClientIP(), "", 5)
@@ -93,7 +93,7 @@ func RedirectURL(c *gin.Context) {
 	isExist, URL := cache.QueryData(ID)
 	if !isExist {
 		// Query Link in DB
-		Check, Link := Database.QueryData(ID)
+		Check, Link := database.QueryData(ID)
 		if Check {
 			// Add hit to Redis
 			cache.AddData(ID, Link, 30)
@@ -135,13 +135,13 @@ func main() {
 	URL = Host + ":" + Port + "/"
 
 	// Check Config
-	// Tools.CheckIPAddress(Listen)
+	// tools.CheckIPAddress(Listen)
 
 	// Init Redis
 	cache.InitRedis()
 
 	// Init Database
-	Database.CreateTable()
+	database.CreateTable()
 
 	// Init Web Server
 	gin.SetMode(gin.ReleaseMode)