Merge pull request #5 from Hillside-Labs/ionrock/remove-unused-models

Remove unused models

models/db.go

@@ -2,9 +2,6 @@ package models
 
 import (
 	"fmt"
-	"net/url"
-	"strconv"
-	"strings"
 	"time"
 
 	"github.com/glebarez/sqlite"
@@ -42,39 +39,6 @@ func (lc LocalConfig) String() {
 	fmt.Printf("LocalConfig:%+v\n", lc)
 }
 
-type User struct {
-	gorm.Model
-	Name     string `json:"name"`
-	Email    string `gorm:"unique" json:"email"`
-	Password string `json:"password"`
-	Role     string `json:"role"`
-}
-
-func (u User) String() string {
-	return fmt.Sprintf("User:{ID: %d, Name: %s, Email: %s, Role: %s}\n", u.ID, u.Name, u.Email, u.Role)
-}
-
-type Client struct {
-	ClientID     string `gorm:"unique;primarykey"`
-	ClientSecret string `gorm:"unique"`
-	Name         string
-	UserID       uint
-	User         User
-}
-
-type DSN struct {
-	Host     string
-	User     string
-	Password string
-	DBName   string
-	Port     int
-	SSLMode  string
-}
-
-func (c Client) String() string {
-	return fmt.Sprintf("Client:{ClientID: %s, ClientSecret: %s, Name: %s, UserID: %d, User:{%s}", c.ClientID, c.ClientSecret, c.Name, c.UserID, c.User.String())
-}
-
 func Connect(fn string) (*gorm.DB, error) {
 	db, err := gorm.Open(sqlite.Open(fn), &gorm.Config{})
 	if err != nil {
@@ -84,48 +48,3 @@ func Connect(fn string) (*gorm.DB, error) {
 
 	return db, err
 }
-
-func (dsn *DSN) String() string {
-	return fmt.Sprintf(
-		"host=%s user=%s password=%s dbname=%s port=%d sslmode=%s",
-		dsn.Host, dsn.User, dsn.Password, dsn.DBName, dsn.Port, dsn.SSLMode,
-	)
-}
-
-func NewDSN(dburi string) (*DSN, error) {
-	url, err := url.Parse(dburi)
-	if err != nil {
-		return nil, err
-	}
-
-	pw, _ := url.User.Password()
-	port := 5432
-	if url.Port() != "" {
-		port, err = strconv.Atoi(url.Port())
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	path := strings.Split(strings.TrimLeft(url.Path, "/"), "/")
-
-	if len(path) == 0 {
-		return nil, fmt.Errorf("missing db name: %s", url.Path)
-	}
-
-	dbname := path[0]
-
-	sslmode := url.Query().Get("sslmode")
-	if sslmode == "" {
-		sslmode = "disable"
-	}
-
-	return &DSN{
-		Host:     url.Hostname(),
-		User:     url.User.Username(),
-		Password: pw,
-		DBName:   dbname,
-		Port:     port,
-		SSLMode:  sslmode,
-	}, nil
-}