From fb0b03bb37c58fc0819a9692adf3de968c008c79 Mon Sep 17 00:00:00 2001 From: Rhythm <35167328+kRhythm@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:21:50 +0530 Subject: [PATCH] modified files --- handlers/routes.go | 2 +- handlers/services.go | 17 ++++------ types/services/struct.go | 72 +++------------------------------------- 3 files changed, 12 insertions(+), 79 deletions(-) diff --git a/handlers/routes.go b/handlers/routes.go index 992e2ff6..5f7e2a2d 100644 --- a/handlers/routes.go +++ b/handlers/routes.go @@ -131,7 +131,7 @@ func Router() *mux.Router { // API SERVICE Routes api.Handle("/api/services", scoped(apiAllServicesHandler)).Methods("GET") - api.Handle("/api/services/status", scoped(apiAllServicesStatusHandler)).Methods("GET") + api.Handle("/api/services/status", authenticated(apiAllServicesStatusHandler,false)).Methods("GET") api.Handle("/api/services", authenticated(apiCreateServiceHandler, false)).Methods("POST") api.Handle("/api/services/{id}", authenticatedV2(apiServiceHandler)).Methods("GET") api.Handle("/api/services/{id}/sub_services", scoped(apiAllSubServicesHandler)).Methods("GET") diff --git a/handlers/services.go b/handlers/services.go index 391474ad..7186c5c1 100644 --- a/handlers/services.go +++ b/handlers/services.go @@ -1,7 +1,6 @@ package handlers import ( - "encoding/json" "fmt" "github.com/gorilla/mux" "github.com/statping/statping/database" @@ -552,7 +551,7 @@ func apiAllServicesHandler(r *http.Request) interface{} { return srvs } -func apiAllServicesStatusHandler(r *http.Request) interface{} { +func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request){ query := r.URL.Query() var t string if query.Get("time") != "" { @@ -568,18 +567,14 @@ func apiAllServicesStatusHandler(r *http.Request) interface{} { if !v.Public.Bool && !IsUser(r) { continue } - serviceJson, _ := json.Marshal(&v) - var serviceDowntimeMap map[string]interface{} - json.Unmarshal(serviceJson, &serviceDowntimeMap) - jsonString, _ := json.Marshal(serviceDowntimeMap) - serviceDowntime := services.ServiceWithDowntime{} - json.Unmarshal(jsonString, &serviceDowntime) + var serviceDowntimeVar services.ServiceWithDowntime + serviceDowntimeVar.Service = v if vv, ok := m[v.Id]; ok == true { - serviceDowntime.Downtime = vv + serviceDowntimeVar.Downtime = &vv } - srvs = append(srvs, serviceDowntime) + srvs = append(srvs, serviceDowntimeVar) } - return srvs + sendJsonAction(srvs, "fetch", w, r) } func apiAllSubServicesHandler(r *http.Request) interface{} { diff --git a/types/services/struct.go b/types/services/struct.go index 173eb9e6..0fdc649d 100644 --- a/types/services/struct.go +++ b/types/services/struct.go @@ -12,6 +12,11 @@ import ( "time" ) +type ServiceWithDowntime struct { + Service + Downtime *downtimes.Downtime `gorm:"-" json:"downtime" yaml:"-"` +} + // Service is the main struct for Services type Service struct { Id int64 `gorm:"primary_key;column:id" json:"id" yaml:"id"` @@ -79,73 +84,6 @@ type Service struct { ManualDowntime bool `gorm:"default:false;column:manual_downtime" json:"manual_downtime"` } -type ServiceWithDowntime struct { - Id int64 `gorm:"primary_key;column:id" json:"id" yaml:"id"` - Name string `gorm:"column:name" json:"name" yaml:"name"` - Description string `gorm:"column:description" json:"description" yaml:"-"` - DisplayName string `json:"display_name"` - Domain string `gorm:"column:domain" json:"domain" yaml:"domain" private:"true" scope:"user,admin"` - Expected null.NullString `gorm:"column:expected" json:"expected" yaml:"expected" scope:"user,admin"` - ExpectedStatus int `gorm:"default:200;column:expected_status" json:"expected_status" yaml:"expected_status" scope:"user,admin"` - Interval int `gorm:"default:30;column:check_interval" json:"check_interval" yaml:"check_interval"` - Type string `gorm:"column:check_type" json:"type" yaml:"type"` - Method string `gorm:"column:method" json:"method" scope:"user,admin" yaml:"method"` - PostData null.NullString `gorm:"column:post_data" json:"post_data" scope:"user,admin" yaml:"post_data"` - Port int `gorm:"not null;column:port" json:"port" scope:"user,admin" yaml:"port"` - Timeout int `gorm:"default:30;column:timeout" json:"timeout" scope:"user,admin" yaml:"timeout"` - Order int `gorm:"default:0;column:order_id" json:"order_id" yaml:"order_id"` - Ftc int `gorm:"default:3;column:ftc" json:"ftc" yaml:"ftc"` - VerifySSL null.NullBool `gorm:"default:false;column:verify_ssl" json:"verify_ssl" scope:"user,admin" yaml:"verify_ssl"` - GrpcHealthCheck null.NullBool `gorm:"default:false;column:grpc_health_check" json:"grpc_health_check" scope:"user,admin" yaml:"grpc_health_check"` - Public null.NullBool `gorm:"default:true;column:public" json:"public" yaml:"public"` - GroupId int `gorm:"default:0;column:group_id" json:"group_id" yaml:"group_id"` - TLSCert null.NullString `gorm:"column:tls_cert" json:"tls_cert" scope:"user,admin" yaml:"tls_cert"` - TLSCertKey null.NullString `gorm:"column:tls_cert_key" json:"tls_cert_key" scope:"user,admin" yaml:"tls_cert_key"` - TLSCertRoot null.NullString `gorm:"column:tls_cert_root" json:"tls_cert_root" scope:"user,admin" yaml:"tls_cert_root"` - Headers null.NullString `gorm:"column:headers" json:"headers" scope:"user,admin" yaml:"headers"` - Permalink null.NullString `gorm:"column:permalink" json:"permalink" yaml:"permalink"` - Redirect null.NullBool `gorm:"default:false;column:redirect" json:"redirect" scope:"user,admin" yaml:"redirect"` - SubServicesDetails SubServicesDetail `gorm:"column:sub_services_detail;type:json;DEFAULT:null" json:"sub_services_detail" yaml:"sub_services_detail"` - CreatedAt time.Time `gorm:"column:created_at" json:"created_at" yaml:"-"` - UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at" yaml:"-"` - Online bool `gorm:"column:online" json:"online" yaml:"-"` - Latency int64 `gorm:"-" json:"latency" yaml:"-"` - PingTime int64 `gorm:"-" json:"ping_time" yaml:"-"` - Online24Hours float32 `gorm:"-" json:"online_24_hours" yaml:"-"` - Online7Days float32 `gorm:"-" json:"online_7_days" yaml:"-"` - AvgResponse int64 `gorm:"-" json:"avg_response" yaml:"-"` - FailuresLast24Hours int `gorm:"-" json:"failures_24_hours" yaml:"-"` - Running chan bool `gorm:"-" json:"-" yaml:"-"` - Checkpoint time.Time `gorm:"-" json:"-" yaml:"-"` - SleepDuration time.Duration `gorm:"-" json:"-" yaml:"-"` - LastResponse string `gorm:"-" json:"-" yaml:"-"` - NotifyAfter int64 `gorm:"column:notify_after" json:"notify_after" yaml:"notify_after" scope:"user,admin"` - AllowNotifications null.NullBool `gorm:"default:true;column:allow_notifications" json:"allow_notifications" yaml:"allow_notifications" scope:"user,admin"` - UpdateNotify null.NullBool `gorm:"default:true;column:notify_all_changes" json:"notify_all_changes" yaml:"notify_all_changes" scope:"user,admin"` // This Variable is a simple copy of `core.CoreApp.UpdateNotify.Bool` - DownText string `gorm:"-" json:"-" yaml:"-"` // Contains the current generated Downtime Text // Is 'true' if the user has already be informed that the Services now again available // Is 'true' if the user has already be informed that the Services now again available - LastStatusCode int `gorm:"-" json:"status_code" yaml:"-"` - LastLookupTime int64 `gorm:"-" json:"-" yaml:"-"` - LastLatency int64 `gorm:"-" json:"-" yaml:"-"` - LastCheck time.Time `gorm:"column:last_check" json:"last_check" yaml:"-"` - LastOnline time.Time `gorm:"column:last_success" json:"last_success" yaml:"-"` - LastOffline time.Time `gorm:"column:last_error" json:"last_error" yaml:"-"` - Stats *Stats `gorm:"-" json:"stats,omitempty" yaml:"-"` - Messages []*messages.Message `gorm:"foreignkey:service;association_foreignkey:id" json:"messages,omitempty" yaml:"messages"` - Incidents []*incidents.Incident `gorm:"foreignkey:service;association_foreignkey:id" json:"incidents,omitempty" yaml:"incidents"` - Checkins []*checkins.Checkin `gorm:"foreignkey:service;association_foreignkey:id" json:"checkins,omitempty" yaml:"-" scope:"user,admin"` - Failures []*failures.Failure `gorm:"-" json:"failures,omitempty" yaml:"-" scope:"user,admin"` - LastProcessingTime time.Time `gorm:"column:last_processing_time" json:"-"` - - notifyAfterCount int64 `gorm:"column:notify_after_count" yaml:"-"` - prevOnline bool `gorm:"column:prev_online" yaml:"-"` - - FailureCounter int `gorm:"column:failure_counter" json:"-" yaml:"-"` - CurrentDowntime int64 `gorm:"column:current_downtime" json:"-" yaml:"-"` - LastFailureType string `gorm:"-" json:"-" yaml:"-"` - ManualDowntime bool `gorm:"default:false;column:manual_downtime" json:"manual_downtime"` - Downtime downtimes.Downtime `gorm:"-" json:"downtime" yaml:"-"` -} - // ServiceOrder will reorder the services based on 'order_id' (Order) type ServiceOrder []Service