@@ -124,15 +124,16 @@ func (s *dbserver) ListTestSuite(ctx context.Context, _ *server.Empty) (suites *
124124 return
125125 }
126126
127- db .Find (& items )
128- suites = & remote.TestSuites {}
129- for i := range items {
130- suite := ConvertToGRPCTestSuite (items [i ])
131- suites .Data = append (suites .Data , suite )
127+ if err = db .Find (& items ). Error ; err == nil {
128+ suites = & remote.TestSuites {}
129+ for i := range items {
130+ suite := ConvertToGRPCTestSuite (items [i ])
131+ suites .Data = append (suites .Data , suite )
132132
133- suite .Full = true
134- if suiteWithCases , dErr := s .GetTestSuite (ctx , suite ); dErr == nil {
135- suites .Data [i ] = suiteWithCases
133+ suite .Full = true
134+ if suiteWithCases , dErr := s .GetTestSuite (ctx , suite ); dErr == nil {
135+ suites .Data [i ] = suiteWithCases
136+ }
136137 }
137138 }
138139 return
@@ -145,7 +146,7 @@ func (s *dbserver) CreateTestSuite(ctx context.Context, testSuite *remote.TestSu
145146 return
146147 }
147148
148- db .Create (ConvertToDBTestSuite (testSuite ))
149+ err = db .Create (ConvertToDBTestSuite (testSuite )). Error
149150 return
150151}
151152
@@ -162,15 +163,15 @@ func (s *dbserver) GetTestSuite(ctx context.Context, suite *remote.TestSuite) (r
162163 return
163164 }
164165
165- db .Find (& query , nameQuery , suite .Name )
166-
167- reply = ConvertToGRPCTestSuite ( query )
168- if suite . Full {
169- var testcases * server. TestCases
170- if testcases , err = s . ListTestCases ( ctx , & remote. TestSuite {
171- Name : suite . Name ,
172- }); err == nil && testcases != nil {
173- reply . Items = testcases . Data
166+ if err = db .Find (& query , nameQuery , suite .Name ). Error ; err == nil {
167+ reply = ConvertToGRPCTestSuite ( query )
168+ if suite . Full {
169+ var testcases * server. TestCases
170+ if testcases , err = s . ListTestCases ( ctx , & remote. TestSuite {
171+ Name : suite . Name ,
172+ }); err == nil && testcases != nil {
173+ reply . Items = testcases . Data
174+ }
174175 }
175176 }
176177 return
@@ -183,9 +184,9 @@ func (s *dbserver) GetHistoryTestSuite(ctx context.Context, suite *remote.Histor
183184 return
184185 }
185186
186- db .Find (& query , nameQuery , suite .HistorySuiteName )
187-
188- reply = ConvertToGRPCHistoryTestSuite ( query )
187+ if err = db .Find (& query , nameQuery , suite .HistorySuiteName ). Error ; err == nil {
188+ reply = ConvertToGRPCHistoryTestSuite ( query )
189+ }
189190 return
190191}
191192
@@ -197,7 +198,7 @@ func (s *dbserver) UpdateTestSuite(ctx context.Context, suite *remote.TestSuite)
197198 return
198199 }
199200
200- testSuiteIdentity (db , input ).Updates (input )
201+ err = testSuiteIdentity (db , input ).Updates (input ). Error
201202 return
202203}
203204
@@ -244,7 +245,7 @@ func (s *dbserver) CreateTestCase(ctx context.Context, testcase *server.TestCase
244245 return
245246 }
246247 reply = & server.Empty {}
247- db .Create (& payload )
248+ err = db .Create (& payload ). Error
248249 return
249250}
250251
@@ -266,7 +267,9 @@ func (s *dbserver) CreateTestCaseHistory(ctx context.Context, historyTestResult
266267 }
267268
268269 var count int64
269- db .Model (& HistoryTestResult {}).Count (& count )
270+ if err = db .Model (& HistoryTestResult {}).Count (& count ).Error ; err != nil {
271+ return
272+ }
270273
271274 if count >= int64 (historyLimit ) {
272275 var oldestRecord HistoryTestResult
@@ -282,7 +285,7 @@ func (s *dbserver) CreateTestCaseHistory(ctx context.Context, historyTestResult
282285 log .Printf ("Existing count: %d, limit: %d\n maximum number of entries reached.\n " , count , historyLimit )
283286 }
284287
285- db .Create (ConvertToDBHistoryTestResult (historyTestResult ))
288+ err = db .Create (ConvertToDBHistoryTestResult (historyTestResult )). Error
286289 return
287290}
288291
@@ -294,7 +297,9 @@ func (s *dbserver) ListHistoryTestSuite(ctx context.Context, _ *server.Empty) (s
294297 return
295298 }
296299
297- db .Find (& items )
300+ if err = db .Find (& items ).Error ; err != nil {
301+ return
302+ }
298303
299304 groupedItems := make (map [string ][]* HistoryTestResult )
300305 for _ , item := range items {
@@ -334,9 +339,9 @@ func (s *dbserver) GetHistoryTestCaseWithResult(ctx context.Context, testcase *s
334339 if db , err = s .getClient (ctx ); err != nil {
335340 return
336341 }
337- db .Find (& item , idQuery , testcase .ID )
338-
339- result = ConvertToRemoteHistoryTestResult ( item )
342+ if err = db .Find (& item , idQuery , testcase .ID ). Error ; err == nil {
343+ result = ConvertToRemoteHistoryTestResult ( item )
344+ }
340345 return
341346}
342347
@@ -346,9 +351,10 @@ func (s *dbserver) GetHistoryTestCase(ctx context.Context, testcase *server.Hist
346351 if db , err = s .getClient (ctx ); err != nil {
347352 return
348353 }
349- db .Find (& item , idQuery , testcase .ID )
350354
351- result = ConvertToGRPCHistoryTestCase (item )
355+ if err = db .Find (& item , idQuery , testcase .ID ).Error ; err == nil {
356+ result = ConvertToGRPCHistoryTestCase (item )
357+ }
352358 return
353359}
354360
@@ -358,11 +364,11 @@ func (s *dbserver) GetTestCaseAllHistory(ctx context.Context, testcase *server.T
358364 if db , err = s .getClient (ctx ); err != nil {
359365 return
360366 }
361- db .Find (& items , "suite_name = ? AND case_name = ? " , testcase .SuiteName , testcase .Name )
362-
363- result = & server. HistoryTestCases {}
364- for i := range items {
365- result . Data = append ( result . Data , ConvertToGRPCHistoryTestCase ( items [ i ]))
367+ if err = db .Find (& items , "suite_name = ? AND case_name = ? " , testcase .SuiteName , testcase .Name ). Error ; err == nil {
368+ result = & server. HistoryTestCases {}
369+ for i := range items {
370+ result . Data = append ( result . Data , ConvertToGRPCHistoryTestCase ( items [ i ]))
371+ }
366372 }
367373 return
368374}
@@ -399,7 +405,7 @@ func (s *dbserver) DeleteTestCase(ctx context.Context, testcase *server.TestCase
399405 if db , err = s .getClient (ctx ); err != nil {
400406 return
401407 }
402- testCaseIdentity (db , input ).Delete (input )
408+ err = testCaseIdentity (db , input ).Delete (input ). Error
403409 return
404410}
405411
@@ -425,7 +431,7 @@ func (s *dbserver) DeleteHistoryTestCase(ctx context.Context, historyTestCase *s
425431 return
426432 }
427433 }
428- db .Delete (& historyTestResult )
434+ err = db .Delete (& historyTestResult ). Error
429435 return
430436}
431437
0 commit comments