From 0061f7d14a22adf58d91c2c43cddde7fa0363bbd Mon Sep 17 00:00:00 2001
From: gadotroee <55343099+gadotroee@users.noreply.github.com>
Date: Wed, 28 Apr 2021 08:08:58 +0300
Subject: [PATCH] Add api build and clean to makefile (files restructure) (#9)

* no message
* add clean api command
---
 Makefile                                      |   5 +-
 api/{src => }/.dockerignore                   |   0
 api/{src => }/Dockerfile                      |   0
 api/{src => }/main.go                         |  17 ++---
 api/{src => }/pkg/configs/fiber_config.go     |   0
 .../pkg/controllers/entries_controller.go     |   6 +-
 api/{src => }/pkg/database/main.go            |   2 +-
 api/{src => }/pkg/inserter/main.go            |   9 ++-
 .../pkg/middleware/fiber_middleware.go        |   0
 api/{src => }/pkg/models/mizuEntry.go         |   0
 api/{src => }/pkg/routes/not_found_route.go   |   0
 api/{src => }/pkg/routes/public_routes.go     |   6 +-
 api/{src => }/pkg/utils/pathUtils.go          |   0
 api/{src => }/pkg/utils/randomString.go       |   0
 api/{src => }/pkg/utils/utils.go              |   0
 api/sqlite_orm_testing/gorm.db                | Bin 12288 -> 0 bytes
 api/sqlite_orm_testing/roee.go                |  55 ----------------
 api/testing_from_file.go                      |  59 ------------------
 18 files changed, 24 insertions(+), 135 deletions(-)
 rename api/{src => }/.dockerignore (100%)
 rename api/{src => }/Dockerfile (100%)
 rename api/{src => }/main.go (58%)
 rename api/{src => }/pkg/configs/fiber_config.go (100%)
 rename api/{src => }/pkg/controllers/entries_controller.go (94%)
 rename api/{src => }/pkg/database/main.go (93%)
 rename api/{src => }/pkg/inserter/main.go (92%)
 rename api/{src => }/pkg/middleware/fiber_middleware.go (100%)
 rename api/{src => }/pkg/models/mizuEntry.go (100%)
 rename api/{src => }/pkg/routes/not_found_route.go (100%)
 rename api/{src => }/pkg/routes/public_routes.go (73%)
 rename api/{src => }/pkg/utils/pathUtils.go (100%)
 rename api/{src => }/pkg/utils/randomString.go (100%)
 rename api/{src => }/pkg/utils/utils.go (100%)
 delete mode 100644 api/sqlite_orm_testing/gorm.db
 delete mode 100644 api/sqlite_orm_testing/roee.go
 delete mode 100644 api/testing_from_file.go

diff --git a/Makefile b/Makefile
index 03c319de6..9393cbeb3 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ cli: # build CLI
 	@(cd cli; echo "building cli" )
 
 api: ## build API server
-	@(cd api; echo "building api" )
+	@(cd api; go build -o build/apiserver main.go)
+	@ls -l api/build
 
 docker: ## build Docker image 
 	@(echo "building docker image" )
@@ -43,7 +44,7 @@ clean-ui:
 	@(cd ui; rm -rf build ; echo "ui cleanup done" )
 
 clean-api: 
-	@(echo "API cleanup - NOT IMPLEMENTED YET " )
+	@(cd api; rm -rf build ; echo "api cleanup done" )
 
 clean-cli: 
 	@(echo "CLI cleanup - NOT IMPLEMENTED YET " )
diff --git a/api/src/.dockerignore b/api/.dockerignore
similarity index 100%
rename from api/src/.dockerignore
rename to api/.dockerignore
diff --git a/api/src/Dockerfile b/api/Dockerfile
similarity index 100%
rename from api/src/Dockerfile
rename to api/Dockerfile
diff --git a/api/src/main.go b/api/main.go
similarity index 58%
rename from api/src/main.go
rename to api/main.go
index 076641162..bef9a79e4 100644
--- a/api/src/main.go
+++ b/api/main.go
@@ -2,27 +2,30 @@ package main
 
 import (
 	"github.com/gofiber/fiber/v2"
-	"mizuserver/src/pkg/inserter"
-	"mizuserver/src/pkg/middleware"
-	"mizuserver/src/pkg/routes"
-	"mizuserver/src/pkg/utils"
+	"mizuserver/pkg/middleware"
+	"mizuserver/pkg/routes"
+	"mizuserver/pkg/utils"
 )
 
 func main() {
 	// TODO: to generate data
 	//path := "/Users/roeegadot/Downloads/output2"
 	//api.TestHarSavingFromFolder(path)
-	go inserter.StartReadingFiles("/var/up9hars")
+
+	// TODO: disabling this line for now (this should be as part of the MAIN
+	// go inserter.StartReadingFiles("/var/up9hars")
 	app := fiber.New()
 
 	middleware.FiberMiddleware(app) // Register Fiber's middleware for app.
 
+	app.Static("/", "./site")
+
 	// Simple route to know server is running
-	app.Get("/", func(c *fiber.Ctx) error {
+	app.Get("/echo", func(c *fiber.Ctx) error {
 		return c.SendString("Hello, World 👋!")
 	})
 
-	routes.PublicRoutes(app)
+	routes.EntriesRoutes(app)
 	routes.NotFoundRoute(app)
 
 	utils.StartServer(app)
diff --git a/api/src/pkg/configs/fiber_config.go b/api/pkg/configs/fiber_config.go
similarity index 100%
rename from api/src/pkg/configs/fiber_config.go
rename to api/pkg/configs/fiber_config.go
diff --git a/api/src/pkg/controllers/entries_controller.go b/api/pkg/controllers/entries_controller.go
similarity index 94%
rename from api/src/pkg/controllers/entries_controller.go
rename to api/pkg/controllers/entries_controller.go
index 727717fd3..d972ac98e 100644
--- a/api/src/pkg/controllers/entries_controller.go
+++ b/api/pkg/controllers/entries_controller.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"github.com/gofiber/fiber/v2"
 	"github.com/google/martian/har"
-	"mizuserver/src/pkg/database"
-	"mizuserver/src/pkg/models"
-	"mizuserver/src/pkg/utils"
+	"mizuserver/pkg/database"
+	"mizuserver/pkg/models"
+	"mizuserver/pkg/utils"
 	"strconv"
 )
 
diff --git a/api/src/pkg/database/main.go b/api/pkg/database/main.go
similarity index 93%
rename from api/src/pkg/database/main.go
rename to api/pkg/database/main.go
index 39b8bec75..b015a0868 100644
--- a/api/src/pkg/database/main.go
+++ b/api/pkg/database/main.go
@@ -3,7 +3,7 @@ package database
 import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
-	"mizuserver/src/pkg/models"
+	"mizuserver/pkg/models"
 )
 
 const (
diff --git a/api/src/pkg/inserter/main.go b/api/pkg/inserter/main.go
similarity index 92%
rename from api/src/pkg/inserter/main.go
rename to api/pkg/inserter/main.go
index 7251b072d..d236ce550 100644
--- a/api/src/pkg/inserter/main.go
+++ b/api/pkg/inserter/main.go
@@ -8,9 +8,9 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"io"
 	"io/fs"
-	"mizuserver/src/pkg/database"
-	"mizuserver/src/pkg/models"
-	"mizuserver/src/pkg/utils"
+	"mizuserver/pkg/database"
+	"mizuserver/pkg/models"
+	"mizuserver/pkg/utils"
 	"net/url"
 	"os"
 	"path"
@@ -19,7 +19,7 @@ import (
 )
 
 
-func IsEmpty(name string) (bool) {
+func IsEmpty(name string) bool {
 	f, err := os.Open(name)
 	if err != nil {
 		return false
@@ -58,7 +58,6 @@ func StartReadingFiles(workingDir string) {
 		utils.CheckErr(decErr)
 
 		for _, entry := range inputHar.Log.Entries 	{
-			fmt.Printf("Entry inserted")
 			SaveHarToDb(*entry, "")
 		}
 		rmErr := os.Remove(inputFilePath)
diff --git a/api/src/pkg/middleware/fiber_middleware.go b/api/pkg/middleware/fiber_middleware.go
similarity index 100%
rename from api/src/pkg/middleware/fiber_middleware.go
rename to api/pkg/middleware/fiber_middleware.go
diff --git a/api/src/pkg/models/mizuEntry.go b/api/pkg/models/mizuEntry.go
similarity index 100%
rename from api/src/pkg/models/mizuEntry.go
rename to api/pkg/models/mizuEntry.go
diff --git a/api/src/pkg/routes/not_found_route.go b/api/pkg/routes/not_found_route.go
similarity index 100%
rename from api/src/pkg/routes/not_found_route.go
rename to api/pkg/routes/not_found_route.go
diff --git a/api/src/pkg/routes/public_routes.go b/api/pkg/routes/public_routes.go
similarity index 73%
rename from api/src/pkg/routes/public_routes.go
rename to api/pkg/routes/public_routes.go
index 73e07bcca..15298b0d1 100644
--- a/api/src/pkg/routes/public_routes.go
+++ b/api/pkg/routes/public_routes.go
@@ -2,11 +2,11 @@ package routes
 
 import (
 	"github.com/gofiber/fiber/v2"
-	"mizuserver/src/pkg/controllers"
+	"mizuserver/pkg/controllers"
 )
 
-// PublicRoutes func for describe group of public routes.
-func PublicRoutes(fiberApp *fiber.App) {
+// EntriesRoutes func for describe group of public routes.
+func EntriesRoutes(fiberApp *fiber.App) {
 	routeGroup := fiberApp.Group("/api")
 
 	routeGroup.Get("/entries", controllers.GetEntries)        // get entries (base/thin entries)
diff --git a/api/src/pkg/utils/pathUtils.go b/api/pkg/utils/pathUtils.go
similarity index 100%
rename from api/src/pkg/utils/pathUtils.go
rename to api/pkg/utils/pathUtils.go
diff --git a/api/src/pkg/utils/randomString.go b/api/pkg/utils/randomString.go
similarity index 100%
rename from api/src/pkg/utils/randomString.go
rename to api/pkg/utils/randomString.go
diff --git a/api/src/pkg/utils/utils.go b/api/pkg/utils/utils.go
similarity index 100%
rename from api/src/pkg/utils/utils.go
rename to api/pkg/utils/utils.go
diff --git a/api/sqlite_orm_testing/gorm.db b/api/sqlite_orm_testing/gorm.db
deleted file mode 100644
index 93745bb8569365781b6ade5c5800ead85c4cfa18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI#O;5rw7zgl{X;2fzcv-yl2ocEGKob%ZP<KFHROBEhI$VV%Fw7_kdc!ZEAJC8D
z!7@;Hka#g3%)jZ{XY12v-S4*RtC}YTyBh^VM>31-5=u#lF+zy8ywnu7m>SoX@qD6@
zcvYy8Z1rVZt;Tj<Nus0%GzdTd0uX=z1Rwwb2tWV=5P-lh3v^>~y`a<Cy63xM>bcX-
zWGsSl#}xx1h1+ptc(0u{?Q+XzmByKU!}xc3oLw{+53_laf9>a~*)fglx=x?k(&-LF
zm=X@LWz|;sq-KBYWl2?@GtZZzCxSG;4TQ5e31_Z~q&F04KDnRA^YcZYM&269^_`*M
zOp2*YbEl`m&)QutkbT#Ah}5`jR_f(un^o=h;v}im{NJ1=o{8#c5P$##AOHafKmY;|
zfB*y_009X6jlhU*kb0f$)4FMxxr~v|m?q1aMI%=<t!&;r%I69PhE+6-pVrSk|FJ*W
tTajiRT8lDU>bq#-ji`<W0SG_<0uX=z1Rwwb2tWV=5P-lx6woxX`3@x7iQ@nO

diff --git a/api/sqlite_orm_testing/roee.go b/api/sqlite_orm_testing/roee.go
deleted file mode 100644
index 107c15f0e..000000000
--- a/api/sqlite_orm_testing/roee.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-import (
-	"gorm.io/driver/sqlite"
-	_ "gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"time"
-)
-
-type User struct {
-	gorm.Model  // this will add "id", "created updated inserted times"
-
-	Name string
-	Age  int
-	Birthday time.Time
-}
-
-func main () {
-	// github.com/mattn/go-sqlite3
-	db, err := gorm.Open(sqlite.Open("gorm.db"), &gorm.Config{})
-	if err != nil{
-		panic("ff")
-	}
-
-	// Run migrations
-	migErr := db.AutoMigrate(&User{})
-	if migErr != nil {
-		panic("Cannot run migration")
-	}
-
-	user := User{Name: "Jinzhu", Age: 18, Birthday: time.Now()}
-	db.Create(&user) // pass pointer of data to Create
-
-}
-
-
-
-//func main() {
-//	app := fiber.New()
-//
-//	c := make(chan os.Signal, 1)
-//	signal.Notify(c, os.Interrupt)
-//	go func() {
-//		_ = <-c
-//		fmt.Println("Gracefully shutting down...")
-//		_ = app.Shutdown()
-//	}()
-//
-//	if err := app.Listen(":3000"); err != nil {
-//		log.Panic(err)
-//	}
-//
-//	fmt.Println("Running cleanup tasks...")
-//	// Your cleanup tasks go here
-//}
diff --git a/api/testing_from_file.go b/api/testing_from_file.go
deleted file mode 100644
index 1b06a86a8..000000000
--- a/api/testing_from_file.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package api
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"github.com/google/martian/har"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"mizuserver/src/pkg/database"
-	"mizuserver/src/pkg/models"
-	"mizuserver/src/pkg/utils"
-	"net/url"
-	"os"
-	"path"
-	"sort"
-)
-
-func TestHarSavingFromFolder(inputDir string) {
-	dir, _ := os.Open(inputDir)
-	dirFiles, _ := dir.Readdir(-1)
-	sort.Sort(utils.ByModTime(dirFiles))
-
-	for _, fileInfo := range dirFiles {
-		inputFilePath := path.Join(inputDir, fileInfo.Name())
-		file, err := os.Open(inputFilePath)
-		utils.CheckErr(err)
-
-		var inputHar har.HAR
-		decErr := json.NewDecoder(bufio.NewReader(file)).Decode(&inputHar)
-		utils.CheckErr(decErr)
-
-		for _, entry := range inputHar.Log.Entries {
-			SaveHarToDb(*entry, "")
-		}
-	}
-}
-
-func SaveHarToDb(entry har.Entry, source string) {
-	entryBytes, _ := json.Marshal(entry)
-	serviceName, urlPath := getServiceNameFromUrl(entry.Request.URL)
-	mizuEntry := models.MizuEntry{
-		EntryId:   primitive.NewObjectID().Hex(),
-		Entry:     string(entryBytes), // simple way to store it and not convert to bytes
-		Service:   serviceName,
-		Url:       entry.Request.URL,
-		Path:      urlPath,
-		Method:    entry.Request.Method,
-		Status:    entry.Response.Status,
-		Source:    source,
-		Timestamp: entry.StartedDateTime.Unix(),
-	}
-	database.GetEntriesTable().Create(&mizuEntry)
-}
-
-func getServiceNameFromUrl(inputUrl string) (string, string) {
-	parsed, err := url.Parse(inputUrl)
-	utils.CheckErr(err)
-	return fmt.Sprintf("%s://%s", parsed.Scheme, parsed.Host), parsed.Path
-}