More refactor.

Signed-off-by: Daksh Chauhan <dak-x@outlook.com>

elastic/elastic.go

@@ -1,7 +1,11 @@
 package elastic
 
 import (
+	"fmt"
 	"log"
+	"sokemotor/models"
+	"sokemotor/utils"
+	"strings"
 	"time"
 
 	"github.com/elastic/go-elasticsearch/v7"
@@ -19,14 +23,11 @@ func init() {
 
 	client, err := elasticsearch.NewClient(esCfg)
 
-	if err != nil {
-		log.Fatalf("Cannot create Client: %v", err)
-	}
+	utils.HandleFatalError("Error creating client", err)
 
 	esInfo, err := client.Info()
 
 	var numRetries int = 0
-
 	for err != nil {
 		// Wait for the instane to get up and running.
 		time.Sleep(3 * time.Second)
@@ -37,15 +38,29 @@ func init() {
 		esInfo, err = client.Info()
 	}
 
-	if err != nil {
-		log.Fatalf("Elastic is not running %s", err)
-	}
+	utils.HandleFatalError("Coundn't connect to elastic instance", err)
+
+	log.Printf("%v", esInfo)
+
+	// Default Mapping the string.
+	err = createIndex(models.HtmlDocumentMapping)
 
-	log.Printf("ELASTIC IS UP: %v\n", esInfo)
-	log.Printf("STARTING SOKEMOTOR SERVICE \n")
+	utils.HandleFatalError("Index creation error:", err)
 
 }
 
-func GetEsClint() *elasticsearch.Client {
+func GetEsClient() *elasticsearch.Client {
 	return client
 }
+
+func createIndex(mapping string) error {
+	res, err := client.Indices.Create("index01", client.Indices.Create.WithBody(strings.NewReader(mapping)))
+
+	if err != nil {
+		return err
+	}
+	if res.IsError() {
+		return fmt.Errorf("error: %s", res)
+	}
+	return nil
+}

go.mod

@@ -5,4 +5,3 @@ go 1.16
 require github.com/gin-gonic/gin v1.7.2
 
 require github.com/elastic/go-elasticsearch/v7 v7.13.1
-

main.go

@@ -3,19 +3,16 @@ package main
 import (
 	"log"
 	"net/http"
+
 	"sokemotor/elastic"
+	"sokemotor/models"
 
 	"github.com/gin-gonic/gin"
 )
 
-type htmlDocument struct {
-	Url string `json:"url"`
-	Dom string `json:"dom"`
-}
-
 func main() {
 
-	_ = elastic.GetEsClint()
+	_ = elastic.GetEsClient()
 
 	app := gin.Default()
 	app.GET("/search/:query", searchHandler)
@@ -33,7 +30,7 @@ func documentHandler(c *gin.Context) {
 
 func processHtml(c *gin.Context) {
 
-	var v htmlDocument
+	var v models.HtmlDocument
 
 	err := c.Bind(&v)
 

models/htmlDoc.go

@@ -0,0 +1,15 @@
+package models
+
+type HtmlDocument struct {
+	Url string `json:"url"`
+	Dom string `json:"dom"`
+}
+
+// For elastic-search indexing
+const HtmlDocumentMapping string = `"mappings": {
+	"properties": {
+		"url" : {"type" : ""},
+		"htmltext" : {"type" : "text"},
+		"time_of_registry" : {"type" : "date"},
+	}
+  }`

utils/utils.go

@@ -0,0 +1,9 @@
+package utils
+
+import "log"
+
+func HandleFatalError(logMessage string, err error) {
+	if err != nil {
+		log.Fatalf("%s %s", logMessage, err)
+	}
+}