Minor fix of event command

alpacanetworks · Feb 3, 2024 · 0b93b5f · 0b93b5f
1 parent aadf961
commit 0b93b5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/api/event/event.go b/api/event/event.go
@@ -32,9 +32,7 @@ func GetEventList(ac *client.AlpaconClient, pageSize int, serverName string, use
 		}
 	}
 
-	url := buildURL(serverID, userID, pageSize)
-
-	responseBody, err := ac.SendGetRequest(url)
+	responseBody, err := ac.SendGetRequest(buildURL(serverID, userID, pageSize))
 	if err != nil {
 		return nil, err
 	}
@@ -51,7 +49,7 @@ func GetEventList(ac *client.AlpaconClient, pageSize int, serverName string, use
 			Shell:       event.Shell,
 			Command:     event.Line,
 			Result:      utils.TruncateString(event.Result, 70),
-			Status:      event.Success,
+			Status:      utils.BoolPointerToString(event.Success),
 			Operator:    event.RequestedByName,
 			RequestedAt: utils.TimeUtils(event.AddedAt),
 		})

diff --git a/api/event/types.go b/api/event/types.go
@@ -7,7 +7,7 @@ type EventAttributes struct {
 	Shell       string `json:"shell"`
 	Command     string `json:"command"`
 	Result      string `json:"result"`
-	Status      bool   `json:"status"`
+	Status      string `json:"status"`
 	Operator    string `json:"operator"`
 	RequestedAt string `json:"requested_at"`
 }
@@ -25,7 +25,7 @@ type EventDetails struct {
 	ID              string                 `json:"id"`
 	Shell           string                 `json:"shell"`
 	Line            string                 `json:"line"`
-	Success         bool                   `json:"success"`
+	Success         *bool                  `json:"success"`
 	Result          string                 `json:"result"`
 	Status          map[string]interface{} `json:"status"`
 	ResponseDelay   float64                `json:"response_delay"`
@@ -45,15 +45,3 @@ type EventCommandRequest struct {
 	Server      string   `json:"server"`
 	RunAfter    []string `json:"run_after"`
 }
-
-type EventCommandResponse struct {
-	ID          string   `json:"id"`
-	Shell       string   `json:"shell"`
-	Line        string   `json:"line"`
-	Data        string   `json:"data"`
-	AddedAt     string   `json:"added_at"`
-	ScheduledAt string   `json:"scheduled_at"`
-	Server      string   `json:"server"`
-	RequestedBy string   `json:"requested_by"`
-	RunAfter    []string `json:"run_after"`
-}