fix(outages): set default outage to type "none"

Author: Diane LAKESTANI

dev/postman.json

@@ -1823,7 +1823,7 @@
 								],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n    \"name\": \"Updated New Service\",\n    \"domain\": \"https://google.com\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 60,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 10,\n    \"order_id\": 0,\n    \"is_outage_enabled\": false,\n    \"outage_type\": \"\"\n}"
+									"raw": "{\n    \"name\": \"Updated New Service\",\n    \"domain\": \"https://google.com\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 60,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 10,\n    \"order_id\": 0,\n    \"is_outage_enabled\": false,\n    \"outage_type\": \"none\"\n}"
 								},
 								"url": {
 									"raw": "{{endpoint}}/api/services/{{service_id}}",

frontend/src/mixin.js

@@ -258,7 +258,7 @@ export default Vue.mixin({
       return addSeconds(date, amount)
     },
     serviceBadgeClass(service) {
-      if (service.is_outage_enabled) {
+      if (service.outage_type != "none") {
         if (service.outage_type === 'critical') {
           return 'bg-danger';
         } else if (service.outage_type === 'minor' || service.outage_type === 'major') {
@@ -269,7 +269,7 @@ export default Vue.mixin({
       return service.online ? 'bg-success' : 'bg-danger';
     },
     textClass(service) {
-      if (service.is_outage_enabled) {
+      if (service.outage_type != "none") {
         if (service.outage_type === 'critical') {
           return 'text-danger';
         } else if (service.outage_type === 'minor' || service.outage_type === 'major') {

handlers/services.go

@@ -131,17 +131,15 @@ func apiServiceOutagePatchHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	service.IsOutageEnabled = req.IsOutageEnabled
-	service.OutageType = req.OutageType
-
 	issueDefault := "Service was triggered to be outaged"
 
 	if req.IsOutageEnabled {
-		services.RecordFailure(service, issueDefault, "trigger", service.OutageType)
-	} else {
-		services.RecordSuccess(service)
+		services.RecordFailure(service, issueDefault, "trigger", req.OutageType)
 	}
 
+	service.IsOutageEnabled = req.IsOutageEnabled
+	service.OutageType = req.OutageType
+
 	if err := service.Update(); err != nil {
 		sendErrorJson(err, w, r)
 		return

types/services/struct.go

@@ -62,7 +62,7 @@ type Service struct {
 	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"`
-	OutageType         string   			  `gorm:"column:outage_type;default:''" json:"outage_type,omitempty" yaml:"-"`
+	OutageType         string   			  `gorm:"column:outage_type;default:'none'" json:"outage_type" yaml:"-"`
 	IsOutageEnabled    bool     			  `gorm:"column:is_outage_enabled;default:false" json:"is_outage_enabled" yaml:"-"`
 
 	notifyAfterCount int64 `gorm:"-" json:"-" yaml:"-"`