@@ -124,15 +124,16 @@ func (s *dbserver) ListTestSuite(ctx context.Context, _ *server.Empty) (suites *
124
124
return
125
125
}
126
126
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 )
132
132
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
+ }
136
137
}
137
138
}
138
139
return
@@ -145,7 +146,7 @@ func (s *dbserver) CreateTestSuite(ctx context.Context, testSuite *remote.TestSu
145
146
return
146
147
}
147
148
148
- db .Create (ConvertToDBTestSuite (testSuite ))
149
+ err = db .Create (ConvertToDBTestSuite (testSuite )). Error
149
150
return
150
151
}
151
152
@@ -162,15 +163,15 @@ func (s *dbserver) GetTestSuite(ctx context.Context, suite *remote.TestSuite) (r
162
163
return
163
164
}
164
165
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
+ }
174
175
}
175
176
}
176
177
return
@@ -183,9 +184,9 @@ func (s *dbserver) GetHistoryTestSuite(ctx context.Context, suite *remote.Histor
183
184
return
184
185
}
185
186
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
+ }
189
190
return
190
191
}
191
192
@@ -197,7 +198,7 @@ func (s *dbserver) UpdateTestSuite(ctx context.Context, suite *remote.TestSuite)
197
198
return
198
199
}
199
200
200
- testSuiteIdentity (db , input ).Updates (input )
201
+ err = testSuiteIdentity (db , input ).Updates (input ). Error
201
202
return
202
203
}
203
204
@@ -244,7 +245,7 @@ func (s *dbserver) CreateTestCase(ctx context.Context, testcase *server.TestCase
244
245
return
245
246
}
246
247
reply = & server.Empty {}
247
- db .Create (& payload )
248
+ err = db .Create (& payload ). Error
248
249
return
249
250
}
250
251
@@ -266,7 +267,9 @@ func (s *dbserver) CreateTestCaseHistory(ctx context.Context, historyTestResult
266
267
}
267
268
268
269
var count int64
269
- db .Model (& HistoryTestResult {}).Count (& count )
270
+ if err = db .Model (& HistoryTestResult {}).Count (& count ).Error ; err != nil {
271
+ return
272
+ }
270
273
271
274
if count >= int64 (historyLimit ) {
272
275
var oldestRecord HistoryTestResult
@@ -282,7 +285,7 @@ func (s *dbserver) CreateTestCaseHistory(ctx context.Context, historyTestResult
282
285
log .Printf ("Existing count: %d, limit: %d\n maximum number of entries reached.\n " , count , historyLimit )
283
286
}
284
287
285
- db .Create (ConvertToDBHistoryTestResult (historyTestResult ))
288
+ err = db .Create (ConvertToDBHistoryTestResult (historyTestResult )). Error
286
289
return
287
290
}
288
291
@@ -294,7 +297,9 @@ func (s *dbserver) ListHistoryTestSuite(ctx context.Context, _ *server.Empty) (s
294
297
return
295
298
}
296
299
297
- db .Find (& items )
300
+ if err = db .Find (& items ).Error ; err != nil {
301
+ return
302
+ }
298
303
299
304
groupedItems := make (map [string ][]* HistoryTestResult )
300
305
for _ , item := range items {
@@ -334,9 +339,9 @@ func (s *dbserver) GetHistoryTestCaseWithResult(ctx context.Context, testcase *s
334
339
if db , err = s .getClient (ctx ); err != nil {
335
340
return
336
341
}
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
+ }
340
345
return
341
346
}
342
347
@@ -346,9 +351,10 @@ func (s *dbserver) GetHistoryTestCase(ctx context.Context, testcase *server.Hist
346
351
if db , err = s .getClient (ctx ); err != nil {
347
352
return
348
353
}
349
- db .Find (& item , idQuery , testcase .ID )
350
354
351
- result = ConvertToGRPCHistoryTestCase (item )
355
+ if err = db .Find (& item , idQuery , testcase .ID ).Error ; err == nil {
356
+ result = ConvertToGRPCHistoryTestCase (item )
357
+ }
352
358
return
353
359
}
354
360
@@ -358,11 +364,11 @@ func (s *dbserver) GetTestCaseAllHistory(ctx context.Context, testcase *server.T
358
364
if db , err = s .getClient (ctx ); err != nil {
359
365
return
360
366
}
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
+ }
366
372
}
367
373
return
368
374
}
@@ -399,7 +405,7 @@ func (s *dbserver) DeleteTestCase(ctx context.Context, testcase *server.TestCase
399
405
if db , err = s .getClient (ctx ); err != nil {
400
406
return
401
407
}
402
- testCaseIdentity (db , input ).Delete (input )
408
+ err = testCaseIdentity (db , input ).Delete (input ). Error
403
409
return
404
410
}
405
411
@@ -425,7 +431,7 @@ func (s *dbserver) DeleteHistoryTestCase(ctx context.Context, historyTestCase *s
425
431
return
426
432
}
427
433
}
428
- db .Delete (& historyTestResult )
434
+ err = db .Delete (& historyTestResult ). Error
429
435
return
430
436
}
431
437
0 commit comments