- preload function for better response time on /metaphone

- set gin to release mode
- set trusted proxy's
- better messages

Author: DanielFillol

controllers/controller.go

@@ -114,7 +114,7 @@ func generateJWTToken(userID uint, amountDays time.Duration) (string, error) {
 	secretKey := []byte(os.Getenv("SECRET"))
 	signedToken, err := token.SignedString(secretKey)
 	if err != nil {
-		return "", errors.New("Failed to sign token")
+		return "", errors.New("failed to sign token")
 	}
 
 	return signedToken, nil
@@ -213,7 +213,7 @@ func SearchSimilarNames(c *gin.Context) {
 
 	//for recall purposes we can't only search for metaphone exact match's if no similar word is found
 	if len(metaphoneNames) == 0 || len(similarNames) == 0 {
-		metaphoneNames = searchForAllSimilarMetaphone(nameMetaphone)
+		metaphoneNames = searchForAllSimilarMetaphone(nameMetaphone, c.MustGet("nameTypes").([]models.NameType))
 		similarNames = findNames(metaphoneNames, name, levenshtein)
 
 		if len(metaphoneNames) == 0 {
@@ -263,9 +263,9 @@ func SearchSimilarNames(c *gin.Context) {
 /*---------- used on SearchSimilarNames ----------*/
 
 //searchForAllSimilarMetaphone used in case of not finding exact metaphone match
-func searchForAllSimilarMetaphone(mtf string) []models.NameType {
-	var names []models.NameType
-	database.Db.Raw("select * from name_types").Find(&names)
+func searchForAllSimilarMetaphone(mtf string, names []models.NameType) []models.NameType {
+	//var names []models.NameType
+	//database.Db.Raw("SELECT * FROM name_types").Find(&names)
 
 	var rNames []models.NameType
 	for _, n := range names {

database/db.go

@@ -57,7 +57,6 @@ func connectDB() *gorm.DB {
 	}
 
 	dsn := DbUsername + ":" + DbPassword + "@tcp" + "(" + DbHost + ":" + DbPort + ")/" + DbName + "?" + "parseTime=true&loc=Local"
-	fmt.Println("dsn : ", dsn)
 
 	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
 	if err != nil {
@@ -83,7 +82,6 @@ func connectDB() *gorm.DB {
 }
 
 func createDatabase(host, username, password, dbName string) error {
-	fmt.Println("cra")
 	// Set up the MySQL DSN string
 	dsn := fmt.Sprintf("%s:%s@tcp(%s)/?charset=utf8mb4&parseTime=True&loc=Local", username, password, host)
 
@@ -97,28 +95,24 @@ func createDatabase(host, username, password, dbName string) error {
 	var result int64
 	db.Raw("SELECT COUNT(*) FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = ?", dbName).Scan(&result)
 	if result > 0 {
-		fmt.Println("database already exists")
 		return nil
 	}
 
 	// Create the database
-	fmt.Println("creating database")
 	err = db.Exec(fmt.Sprintf("CREATE DATABASE %s", dbName)).Error
 	if err != nil {
 		return fmt.Errorf("failed to create database: %v", err)
 	}
+	fmt.Println("-	Create Database")
 
 	return nil
 }
 
 func createRoot() error {
 	var user models.User
-	Db.First(&user, 1)
+	Db.Raw("select * from users where id = 1").Find(&user)
 
 	if user.ID == 0 {
-		fmt.Println("creating user root")
-
-		//password
 		hash, err := bcrypt.GenerateFromPassword([]byte(os.Getenv("SECRET")), 10)
 		if err != nil {
 			return err
@@ -131,13 +125,11 @@ func createRoot() error {
 
 		Db.Create(&userRoot)
 
-		fmt.Println("root user created")
-
-		return nil
-	} else {
-		fmt.Println("root user already on the database")
+		fmt.Println("-	Created first user")
 		return nil
 	}
+
+	return nil
 }
 
 func uploadCSVNameTypes() error {
@@ -146,7 +138,7 @@ func uploadCSVNameTypes() error {
 
 	if name.ID == 0 {
 		start := time.Now()
-		fmt.Println("initiating csv upload to the database")
+		fmt.Println("-	Upload data start")
 
 		filePath := "database/name_types .csv"
 		file, err := os.Open(filePath)
@@ -183,10 +175,9 @@ func uploadCSVNameTypes() error {
 			}
 		}
 
-		fmt.Println("csv upload finished in:" + time.Since(start).String())
+		fmt.Println("-	Upload data finished", time.Since(start).String())
 		return nil
 	}
-	fmt.Println("csv already imported")
 	return nil
 
 }

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"github.com/Darklabel91/API_Names/database"
 	"github.com/Darklabel91/API_Names/routes"
 )
@@ -10,5 +11,6 @@ func init() {
 }
 
 func main() {
+	fmt.Println("-	live")
 	routes.HandleRequests()
 }

routes/routes.go

@@ -2,25 +2,42 @@ package routes
 
 import (
 	"github.com/Darklabel91/API_Names/controllers"
+	"github.com/Darklabel91/API_Names/database"
 	"github.com/Darklabel91/API_Names/middleware"
+	"github.com/Darklabel91/API_Names/models"
 	"github.com/gin-gonic/gin"
 	"sync"
 )
 
 const door = ":8080"
 
+var allowedIPs = []string{"127.0.0.1", "::1"} // List of allowed IP addresses
+
 func HandleRequests() {
+	gin.SetMode(gin.ReleaseMode)
 	r := gin.Default()
+
+	// Use the OnlyAllowIPs middleware on all routes
+	err := r.SetTrustedProxies(allowedIPs)
+	if err != nil {
+		return
+	}
+
+	//signup and login
 	r.POST("/signup", controllers.Signup)
 	r.POST("/login", controllers.Login)
-	r.POST("/name", middleware.RequireAuth, controllers.CreateName)
-	r.DELETE("/:id", middleware.RequireAuth, controllers.DeleteName)
-	r.PATCH("/:id", middleware.RequireAuth, controllers.UpdateName)
-	r.GET("/:id", middleware.RequireAuth, WaitGroupID)
-	r.GET("/name/:name", middleware.RequireAuth, WaitGroupName)
-	r.GET("/metaphone/:name", middleware.RequireAuth, WaitGroupMetaphone)
-
-	err := r.Run(door)
+
+	//Other routes
+	r.Use(middleware.RequireAuth)
+
+	r.POST("/name", controllers.CreateName)
+	r.DELETE("/:id", controllers.DeleteName)
+	r.PATCH("/:id", controllers.UpdateName)
+	r.GET("/:id", WaitGroupID)
+	r.GET("/name/:name", WaitGroupName)
+	r.GET("/metaphone/:name", PreloadNameTypes(), WaitGroupMetaphone)
+
+	err = r.Run(door)
 	if err != nil {
 		panic(err)
 	}
@@ -67,3 +84,16 @@ func WaitGroupID(c *gin.Context) {
 
 	wg.Wait()
 }
+
+//PreloadNameTypes for better response time we load all records of the table
+func PreloadNameTypes() gin.HandlerFunc {
+	var nameTypes []models.NameType
+	if err := database.Db.Find(&nameTypes).Error; err != nil {
+		return nil
+	}
+
+	return func(c *gin.Context) {
+		c.Set("nameTypes", nameTypes)
+		c.Next()
+	}
+}