From 40c6366608c8b4c8a0cf9cabd9b8a4845c6f7f4c Mon Sep 17 00:00:00 2001
From: Nedim <nedim@saburly.com>
Date: Wed, 6 Sep 2023 11:58:33 +0200
Subject: [PATCH] Added devices and companies models

---
 .gitignore                         |  13 ++++++++++++
 controllers/CompaniesController.go |  19 +++++++++++++++++
 demo.db                            | Bin 24576 -> 0 bytes
 main.go                            |  11 +++++++++-
 models/company.go                  |  33 +++++++++++++++++++++++++++++
 models/crudInterface.go            |   4 ----
 models/device.go                   |  20 +++++++++++++++++
 models/user.go                     |  11 ++++------
 routes/publicRoutes.go             |   3 ++-
 shared/database.go                 |  23 +++++++++++++-------
 10 files changed, 116 insertions(+), 21 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 controllers/CompaniesController.go
 delete mode 100644 demo.db
 create mode 100644 models/company.go
 create mode 100644 models/device.go

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..54985c8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+#configuration
+.env
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+debug
+.vscode
+.vs/
+.DS_Store
diff --git a/controllers/CompaniesController.go b/controllers/CompaniesController.go
new file mode 100644
index 0000000..93e002e
--- /dev/null
+++ b/controllers/CompaniesController.go
@@ -0,0 +1,19 @@
+package controllers
+
+// import (
+// 	"net/http"
+// 	models "novatech/models"
+
+// 	"github.com/VoidArtanis/go-rest-boilerplate/models"
+// 	"github.com/gin-gonic/gin"
+// )
+
+// func Companies(c *gin.Context) {
+// 	var companies []models.Company
+// 	// Fetch companies from DB here
+// 	if err := models.FetchCompanies(&companies); err != nil {
+// 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error fetching companies"})
+// 		return
+// 	}
+// 	c.JSON(http.StatusOK, gin.H{"companies": companies})
+// }
\ No newline at end of file
diff --git a/demo.db b/demo.db
deleted file mode 100644
index 0399bc0df22634bb76dafa66dc8c8c82f61daaf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
zcmeI%O>fgM7{Kvl>x%?*AaTgm%Bj^Vq%!r+C_PM?HePmMmqn&ABce%L$0^+jm3<^m
zT=`@;*~;1k4Ne@Yza=NO<M`$G<YMLBo8!nR@o}PKX~co^#Bp8cg%FP8)NF3pyh?dJ
z&#UCF3isS=&a=VKmhDh~^xb*<aPP<7dF#j)NeCc-00IagfB*srAb`NX2rQr0o8D>9
zT^>Y9s1{MU2xb!<$S{tQAXUah$z>XZYOIV318J%c8-usQ!?U3{I(apGFaA1!I6V=5
zbripSH%CW&Yt@=wujgJ5jr=fH)$Y}n`t35#4qqM*|2Tta`%&nNC^70%X))DNEcKQ6
ztgeL2%p^)iTE!|cUEdbu&31he+LDQ4)%CM!Ud|ELTkn>=-f9Q+#a!yqC#l=d`~6PW
z*D9T4dZfzjS*mo9FKn~>T#hr_*QkXNor~Ru*Z177zhjiYv>ukCUaLf++^xVb8aKUP
z?=-yqefPZ3PG@6#inYO?Whxn|QgwI3x%9A|NGoOE>@2n0^gPeK9u#91a~7AKjraYV
z#r)6E<TK{WEQ3#Fntqw+N+47$qj9;joJ%A1W~=DrXLEb#Cn10U0tg_000IagfB*sr
zAb`LY3vmA5;^4A11Q0*~0R#|0009ILKmY**ZUr9XcmDtLJs^Mp0tg_000IagfB*sr
zAh6W}{QuwT@Ul4s5I_I{1Q0*~0R#|0009IF0sjB<As~PN0tg_000IagfB*srAh7)c
FzW}6DFd_f|

diff --git a/main.go b/main.go
index 7778256..c392af1 100644
--- a/main.go
+++ b/main.go
@@ -26,13 +26,22 @@ func main() {
 	}
 
 	// Db Connect and Close
-	shared.Init()
+	if shared.Init() != nil {
+		panic("Failed to connect to database")
+	}
 	defer shared.CloseDb()
 
 	// Initialize Admin interface
 	Admin := admin.New(&admin.AdminConfig{DB: shared.GetDb()})
+	fmt.Printf("Admin instance: %+v\n", Admin)
 	// Allow Admin to manage User resource
+	company := Admin.AddResource(&models.Company{})
+	company.Meta(&admin.Meta{Name: "Users", Config: &admin.SelectManyConfig{SelectMode: "bottom_sheet"}})
+	company.Meta(&admin.Meta{Name: "Devices", Config: &admin.SelectManyConfig{SelectMode: "bottom_sheet"}})
+	
+	// Add User and Device resources
 	Admin.AddResource(&models.User{})
+	Admin.AddResource(&models.Device{})
 	// Initialize HTTP request multiplexer
 	mux := http.NewServeMux()
 	// Mount admin interface to mux
diff --git a/models/company.go b/models/company.go
new file mode 100644
index 0000000..3d0dcd2
--- /dev/null
+++ b/models/company.go
@@ -0,0 +1,33 @@
+package models
+
+import "github.com/jinzhu/gorm"
+
+type Company struct {
+	gorm.Model
+	Name string
+	Password string
+	Email    string
+	Avatar   string
+	Users    []User
+	Devices  []Device
+}
+
+
+// func FetchCompanies(companies *[]Company) (err error) {
+// 	db := gorm.GetDb()
+
+// 	if err = db.Find(companies).Error; err != nil {
+// 		return err
+// 	}
+// 	return nil
+// }
+
+func (Company)Update() (bool, error) {
+	return false, nil
+}
+func (Company)Create() (bool, error) {
+	return false, nil
+}
+func (Company)Delete() (bool, error) {
+	return false, nil
+}
diff --git a/models/crudInterface.go b/models/crudInterface.go
index fd7fc92..5c9406b 100644
--- a/models/crudInterface.go
+++ b/models/crudInterface.go
@@ -1,7 +1,3 @@
-/**
- * Created by VoidArtanis on 10/24/2017
- */
-
 package models
 
 type SimpleCRUD interface {
diff --git a/models/device.go b/models/device.go
new file mode 100644
index 0000000..7e03d18
--- /dev/null
+++ b/models/device.go
@@ -0,0 +1,20 @@
+package models
+
+import "github.com/jinzhu/gorm"
+
+type Device struct {
+	gorm.Model
+	DeviceName string
+	DeviceConfiguration string `gorm:"type:json"` 
+	CompanyID  uint
+}
+
+func (Device)Update() (bool, error) {
+	return false, nil
+}
+func (Device)Create() (bool, error) {
+	return false, nil
+}
+func (Device)Delete() (bool, error) {
+	return false, nil
+}
diff --git a/models/user.go b/models/user.go
index a1310fd..9257e21 100644
--- a/models/user.go
+++ b/models/user.go
@@ -1,7 +1,3 @@
-/**
- * Created by desha on 10/24/2017
- */
-
 package models
 
 import "github.com/jinzhu/gorm"
@@ -12,14 +8,15 @@ type User struct {
 	Password string
 	Email    string
 	Avatar   string
+	CompanyID  uint
 }
 
-func (this User)Update() (bool, error) {
+func (User)Update() (bool, error) {
 	return false, nil
 }
-func (this User)Create() (bool, error) {
+func (User)Create() (bool, error) {
 	return false, nil
 }
-func (this User)Delete() (bool, error) {
+func (User)Delete() (bool, error) {
 	return false, nil
 }
diff --git a/routes/publicRoutes.go b/routes/publicRoutes.go
index 6d1000c..5118b69 100644
--- a/routes/publicRoutes.go
+++ b/routes/publicRoutes.go
@@ -5,12 +5,13 @@
 package routes
 
 import (
-	"github.com/gin-gonic/gin"
 	"github.com/VoidArtanis/go-rest-boilerplate/controllers"
+	"github.com/gin-gonic/gin"
 )
 
 func RegisterPublicRoutes(r *gin.Engine){
 
 	r.GET("/publicmessage", controllers.GetPublicText)
+	// r.GET("/companies", controllers.Ge)
 }
 
diff --git a/shared/database.go b/shared/database.go
index bc5d9b6..fd4bd0d 100644
--- a/shared/database.go
+++ b/shared/database.go
@@ -2,7 +2,9 @@ package shared
 
 import (
 	"fmt"
+	"log"
 	"novatech/config"
+	"novatech/models"
 
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/postgres"
@@ -13,23 +15,28 @@ var db *gorm.DB
 var err error
 
 
-func Init() {
+func Init()  error{
      host := config.AppConfig.Database.HostName
 	 user := config.AppConfig.Database.UserName
-	 port := config.AppConfig.Database.Port
+	//  port := config.AppConfig.Database.Port
 	 dbName := config.AppConfig.Database.DatabaseName
 	 password := config.AppConfig.Database.Password
 
-	dbString:= fmt.Sprintf("postgres, host=%s:%s user=%s dbname=%s sslmode=disable password=%s",host,port,user,dbName,password) 
-
-	//PostgreSQL
-	db, err = gorm.Open(dbString)
+	dbString:= fmt.Sprintf("host=%s user=%s dbname=%s sslmode=disable password=%s",host,user,dbName,password) 
+	// db, err = gorm.Open("postgres", "host=localhost user=postgres dbname=postgres sslmode=disable password=root")
+	var err error
+	// //PostgreSQL
+	db, err = gorm.Open("postgres",dbString)
 
 	if err != nil {
-		fmt.Println(err)
+		log.Println("Error initializing the database: ", err)
+		return err
 	}
 	//TODO AUTOMIGRATE models once we have them
-	//db.AutoMigrate(&models.Person{})
+	db.AutoMigrate(&models.User{}, &models.Company{}, &models.Device{})
+
+	return nil
+
 }