diff --git a/types/checkin.go b/types/checkin.go
new file mode 100644
index 00000000..b7f26c73
--- /dev/null
+++ b/types/checkin.go
@@ -0,0 +1,23 @@
+package types
+
+import "time"
+
+type Checkin struct {
+ Id int `db:"id,omitempty"`
+ Service int64 `db:"service"`
+ Interval int64 `db:"check_interval"`
+ Api string `db:"api"`
+ CreatedAt time.Time `db:"created_at"`
+ Hits int64 `json:"hits"`
+ Last time.Time `json:"last"`
+ CheckinInterface
+}
+
+type CheckinInterface interface {
+ // Database functions
+ Create() (int64, error)
+ //Update() error
+ //Delete() error
+ Ago() string
+ Receivehit()
+}
diff --git a/types/core.go b/types/core.go
new file mode 100644
index 00000000..dd2409e9
--- /dev/null
+++ b/types/core.go
@@ -0,0 +1,30 @@
+package types
+
+import "time"
+
+type Core struct {
+ Name string `db:"name" json:"name"`
+ Description string `db:"description" json:"description"`
+ Config string `db:"config" json:"-"`
+ ApiKey string `db:"api_key" json:"api_key"`
+ ApiSecret string `db:"api_secret" json:"api_secret"`
+ Style string `db:"style" json:"-"`
+ Footer string `db:"footer" json:"-"`
+ Domain string `db:"domain" json:"domain,omitempty"`
+ Version string `db:"version" json:"version,omitempty"`
+ MigrationId int64 `db:"migration_id" json:"-"`
+ UseCdn bool `db:"use_cdn" json:"-"`
+ DbServices []*Service `json:"services,omitempty"`
+ Plugins []Info
+ Repos []PluginJSON
+ AllPlugins []PluginActions
+ Communications []AllNotifiers
+ DbConnection string
+ Started time.Time
+ CoreInterface
+}
+
+type CoreInterface interface {
+ SelectAllServices() ([]*Service, error)
+ Services() []*Service
+}
diff --git a/types/failure.go b/types/failure.go
new file mode 100644
index 00000000..43712149
--- /dev/null
+++ b/types/failure.go
@@ -0,0 +1,19 @@
+package types
+
+import "time"
+
+type Failure struct {
+ Id int `db:"id,omitempty" json:"id"`
+ Issue string `db:"issue" json:"issue"`
+ Method string `db:"method" json:"method,omitempty"`
+ Service int64 `db:"service" json:"service_id"`
+ CreatedAt time.Time `db:"created_at" json:"created_at"`
+ FailureInterface
+}
+
+type FailureInterface interface {
+ Delete() error
+ // method functions
+ Ago() string
+ ParseError() string
+}
diff --git a/types/interfaces.go b/types/interfaces.go
deleted file mode 100644
index 9971735b..00000000
--- a/types/interfaces.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Statup
-// Copyright (C) 2018. Hunter Long and the project contributors
-// Written by Hunter Long and the project contributors
-//
-// https://github.com/hunterlong/statup
-//
-// The licenses for most software and other practical works are designed
-// to take away your freedom to share and change the works. By contrast,
-// the GNU General Public License is intended to guarantee your freedom to
-// share and change all versions of a program--to make sure it remains free
-// software for all its users.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
-package types
-
-type ServiceInterface interface {
- AvgTime() float64
- Online24() float32
- ToService() *Service
- SmallText() string
- GraphData() string
- AvgUptime() string
- LimitedFailures() []*Failure
- TotalFailures() (uint64, error)
- TotalFailures24Hours() (uint64, error)
-}
-
-type FailureInterface interface {
- ToFailure() *Failure
- Ago() string
- ParseError() string
-}
diff --git a/types/service.go b/types/service.go
index 45afcdbc..d53d81b2 100644
--- a/types/service.go
+++ b/types/service.go
@@ -46,6 +46,38 @@ type Service struct {
LastStatusCode int
LastOnline time.Time
DnsLookup float64 `json:"dns_lookup_time"`
+ ServiceInterface
+}
+
+type ServiceInterface interface {
+ // Database functions
+ Create() (int64, error)
+ Update() error
+ Delete() error
+ // Basic Method functions
+ AvgTime() float64
+ Online24() float32
+ SmallText() string
+ GraphData() string
+ AvgUptime() string
+ ToJSON() string
+ // Failure functions
+ CreateFailure(*Failure) (int64, error)
+ LimitedFailures() []*Failure
+ AllFailures() []*Failure
+ TotalFailures() (uint64, error)
+ TotalFailures24Hours() (uint64, error)
+ // Hits functions (successful responses)
+ CreateHit(*Hit) (int64, error)
+ Hits() ([]*Hit, error)
+ TotalHits() (uint64, error)
+ Sum() (float64, error)
+ LimitedHits() ([]*Hit, error)
+ SelectHitsGroupBy(string) ([]*Hit, error)
+ // Go Routines
+ CheckQueue(bool)
+ // Checkin functions
+ AllCheckins() []*Checkin
}
func (s *Service) Start() {
diff --git a/types/types.go b/types/types.go
index bf743e8c..70f6977b 100644
--- a/types/types.go
+++ b/types/types.go
@@ -61,38 +61,6 @@ type PluginActions interface {
type AllNotifiers interface{}
-type Core struct {
- Name string `db:"name" json:"name"`
- Description string `db:"description" json:"description"`
- Config string `db:"config" json:"-"`
- ApiKey string `db:"api_key" json:"api_key"`
- ApiSecret string `db:"api_secret" json:"api_secret"`
- Style string `db:"style" json:"-"`
- Footer string `db:"footer" json:"-"`
- Domain string `db:"domain" json:"domain,omitempty"`
- Version string `db:"version" json:"version,omitempty"`
- MigrationId int64 `db:"migration_id" json:"-"`
- UseCdn bool `db:"use_cdn" json:"-"`
- Services []*Service `json:"services,omitempty"`
- Plugins []Info
- Repos []PluginJSON
- AllPlugins []PluginActions
- Communications []AllNotifiers
- DbConnection string
- Started time.Time
-}
-
-type User struct {
- Id int64 `db:"id,omitempty" json:"id"`
- Username string `db:"username" json:"username"`
- Password string `db:"password" json:"-"`
- Email string `db:"email" json:"-"`
- ApiKey string `db:"api_key" json:"api_key"`
- ApiSecret string `db:"api_secret" json:"-"`
- Admin bool `db:"administrator" json:"admin"`
- CreatedAt time.Time `db:"created_at" json:"created_at"`
-}
-
type Hit struct {
Id int `db:"id,omitempty"`
Service int64 `db:"service"`
@@ -100,24 +68,6 @@ type Hit struct {
CreatedAt time.Time `db:"created_at"`
}
-type Failure struct {
- Id int `db:"id,omitempty" json:"id"`
- Issue string `db:"issue" json:"issue"`
- Method string `db:"method" json:"method,omitempty"`
- Service int64 `db:"service" json:"service_id"`
- CreatedAt time.Time `db:"created_at" json:"created_at"`
-}
-
-type Checkin struct {
- Id int `db:"id,omitempty"`
- Service int64 `db:"service"`
- Interval int64 `db:"check_interval"`
- Api string `db:"api"`
- CreatedAt time.Time `db:"created_at"`
- Hits int64 `json:"hits"`
- Last time.Time `json:"last"`
-}
-
type Config struct {
Connection string `yaml:"connection"`
Host string `yaml:"host"`
diff --git a/types/user.go b/types/user.go
new file mode 100644
index 00000000..4f3f99e2
--- /dev/null
+++ b/types/user.go
@@ -0,0 +1,22 @@
+package types
+
+import "time"
+
+type User struct {
+ Id int64 `db:"id,omitempty" json:"id"`
+ Username string `db:"username" json:"username"`
+ Password string `db:"password" json:"-"`
+ Email string `db:"email" json:"-"`
+ ApiKey string `db:"api_key" json:"api_key"`
+ ApiSecret string `db:"api_secret" json:"-"`
+ Admin bool `db:"administrator" json:"admin"`
+ CreatedAt time.Time `db:"created_at" json:"created_at"`
+ UserInterface
+}
+
+type UserInterface interface {
+ // Database functions
+ Create() (int64, error)
+ Update() error
+ Delete() error
+}