From 9c8bf2b69e9b7de077e9b2fe524f52bf3e61cf87 Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Mon, 12 Jul 2021 01:06:44 -0400 Subject: [PATCH] Refactor uselessly complex code --- storage/store/database/database.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/storage/store/database/database.go b/storage/store/database/database.go index 604bb0ed..574afcf4 100644 --- a/storage/store/database/database.go +++ b/storage/store/database/database.go @@ -175,13 +175,13 @@ func (s *Store) getResultsByServiceID(serviceID int64) (results []*core.Result, if err != nil { return nil, err } - idConditionResultsMap := make(map[int64]*[]*core.ConditionResult) + idResultMap := make(map[int64]*core.Result) for rows.Next() { result := &core.Result{} var id int64 _ = rows.Scan(&id, &result.Success, &result.Connected, &result.HTTPStatus, &result.DNSRCode, &result.CertificateExpiration, &result.Hostname, &result.IP, &result.Duration, &result.Timestamp) results = append(results, result) - idConditionResultsMap[id] = &result.ConditionResults + idResultMap[id] = result } _ = rows.Close() // Get the conditionResults @@ -189,7 +189,7 @@ func (s *Store) getResultsByServiceID(serviceID int64) (results []*core.Result, if err != nil { return } - for serviceResultID, conditionResults := range idConditionResultsMap { + for serviceResultID, result := range idResultMap { rows, err = transaction.Query(` SELECT service_result_id, condition, success FROM service_result_condition @@ -201,11 +201,10 @@ func (s *Store) getResultsByServiceID(serviceID int64) (results []*core.Result, return } for rows.Next() { - var id int64 conditionResult := &core.ConditionResult{} - _ = rows.Scan(&id, &conditionResult.Condition, &conditionResult.Success) - *conditionResults = append(*conditionResults, conditionResult) - // XXX: profile this ^ + //var id int64 + _ = rows.Scan(&conditionResult.Condition, &conditionResult.Success) + result.ConditionResults = append(result.ConditionResults, conditionResult) } _ = rows.Close() }