Merge pull request #21 from go-gorf/20-add-gorf-types-mod-for-common-types

Gorf types module

Author: tomvictor

app.go

@@ -3,6 +3,7 @@ package gorf
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"log"
 )
 
 // Apps array of all registered apps
@@ -49,7 +50,7 @@ func SetupApps() {
 	for _, app := range Apps {
 		err := app.Setup()
 		if err != nil {
-			panic("Unable to configure apps")
+			log.Fatal("unable to configure apps, ", err.Error())
 		}
 	}
 }

backends/dynamodbi/db.go

@@ -9,6 +9,9 @@ type DynamoDB struct {
 func (d *DynamoDB) Get(dest interface{}, key string) error {
 	return nil
 }
+func (d *DynamoDB) GetUser(dest interface{}, id string) error {
+	return nil
+}
 
 func (d *DynamoDB) Filter(dest interface{}, conds ...interface{}) error {
 	return nil

backends/gormi/db.go

@@ -9,14 +9,22 @@ type GormDB struct {
 }
 
 func (d *GormDB) Get(dest interface{}, key string) error {
+	//TODO:implement
+	return nil
+}
+
+func (d *GormDB) GetUser(dest interface{}, id string) error {
+	//TODO:implement
 	return nil
 }
 
 func (d *GormDB) Filter(dest interface{}, conds ...interface{}) error {
+	//TODO:implement
 	return nil
 }
 
 func (d *GormDB) AutoMigrate(dst ...interface{}) error {
+	//TODO:implement
 	return d.DB.Migrator().AutoMigrate(dst...)
 }
 

backends/gormi/sqlite.go

@@ -10,6 +10,10 @@ type GormSqliteBackend struct {
 	Name string
 }
 
+func NewSqliteBackend(name string) *GormSqliteBackend {
+	return &GormSqliteBackend{Name: name}
+}
+
 func (b *GormSqliteBackend) Connect() (gorf.Db, error) {
 	db, err := gorm.Open(sqlite.Open(b.Name), &gorm.Config{})
 	if err != nil {

common/go.mod

@@ -0,0 +1,3 @@
+module github.com/go-gorf/gorf/common
+
+go 1.20

common/user.go

@@ -0,0 +1,6 @@
+package common
+
+type LoginInput struct {
+	Email    string `json:"email" binding:"required"`
+	Password string `json:"password" binding:"required"`
+}

database.go

@@ -28,6 +28,7 @@ type Db interface {
 	AutoMigrate(dst ...interface{}) error
 	First(dest interface{}, conds ...interface{}) error
 	Create(value interface{}) error
+	GetUser(dest interface{}, id string) error
 }
 
 type DbBackend interface {
@@ -45,7 +46,7 @@ func InitializeDatabase() error {
 
 	DB, err = Settings.DbBackends.Connect()
 	if err != nil {
-		return errors.New("Unable to initialise the database")
+		return errors.New("unable to initialise the database")
 	}
 	return nil
 }

errors.go

@@ -1,8 +1,8 @@
 package gorf
 
 import (
+	"errors"
 	"github.com/gin-gonic/gin"
-	"net/http"
 )
 
 type Err struct {
@@ -11,6 +11,20 @@ type Err struct {
 	status int
 }
 
+func NewErr(msg string, status int, err error) *Err {
+	var e error
+	if err != nil {
+		e = err
+	} else {
+		e = errors.New(msg)
+	}
+	return &Err{
+		Msg:    msg,
+		Er:     e,
+		status: status,
+	}
+}
+
 func (e *Err) Response() gin.H {
 	return gin.H{
 		"Message":    e.Msg,
@@ -22,8 +36,3 @@ func (e *Err) Response() gin.H {
 func (e *Err) Error() string {
 	return e.Er.Error()
 }
-
-func BadRequest(ctx *gin.Context, msg string, err error) {
-	e := &Err{msg, err, http.StatusBadRequest}
-	ctx.JSON(http.StatusBadRequest, e.Response())
-}

examples/admin/settings.go

@@ -7,7 +7,7 @@ import (
 )
 
 var apps = []gorf.App{
-	&admin.App,
+	&admin.AdminApp,
 }
 
 func LoadSettings() {

examples/auth/go.mod

@@ -2,13 +2,22 @@ module github.com/go-gorf/gorf/example/auth
 
 go 1.20
 
-
 require (
+	github.com/caarlos0/env/v8 v8.0.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-gorf/auth v0.0.8
-	github.com/go-gorf/gorf v0.0.13
+	github.com/go-gorf/auth v0.0.9
+	github.com/go-gorf/gorf v0.0.14
 )
 
+replace github.com/go-gorf/gorf => ../../
+
+replace github.com/go-gorf/gorf/common => ../../common
+
+replace github.com/go-gorf/gorf/backends/gormi => ../../backends/gormi
+
+//remove
+//replace github.com/go-gorf/auth => ../../../auth
+
 require (
 	github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
@@ -24,22 +33,35 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
 	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
-	github.com/caarlos0/env/v8 v8.0.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-gorf/gorf/backends/gormi v0.0.0-20230611221909-7706e082ab74 // indirect
+	github.com/go-gorf/gorf/common v0.0.0-00010101000000-000000000000 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/httpcc v1.0.1 // indirect
+	github.com/lestrrat-go/httprc v1.0.4 // indirect
+	github.com/lestrrat-go/iter v1.0.2 // indirect
+	github.com/lestrrat-go/jwx/v2 v2.0.11 // indirect
+	github.com/lestrrat-go/option v1.0.1 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-sqlite3 v1.14.16 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
@@ -49,4 +71,6 @@ require (
 	golang.org/x/text v0.9.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/driver/sqlite v1.5.1 // indirect
+	gorm.io/gorm v1.25.1 // indirect
 )