From 7b73930ce56189a1299643c2c1ea60f42653d0b0 Mon Sep 17 00:00:00 2001
From: Lawrence Wong <lawwong@paypal.com>
Date: Thu, 26 Jan 2023 11:39:28 -0800
Subject: [PATCH] Address further code review comment regarding JobExists
 method

---
 helpers.go         | 14 +++++++-------
 realis_e2e_test.go | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/helpers.go b/helpers.go
index 1cd04f2..f1983db 100644
--- a/helpers.go
+++ b/helpers.go
@@ -12,12 +12,12 @@ func (r *Client) JobExists(key aurora.JobKey) (bool, error) {
 		return false, err
 	}
 
-	return !(resp == nil ||
-			resp.GetResult_() == nil ||
-			resp.GetResult_().GetConfigSummaryResult_() == nil ||
-			resp.GetResult_().GetConfigSummaryResult_().GetSummary() == nil ||
-			resp.GetResult_().GetConfigSummaryResult_().GetSummary().GetGroups() == nil ||
-			len(resp.GetResult_().GetConfigSummaryResult_().GetSummary().GetGroups()) == 0 ||
-			resp.GetResponseCode() != aurora.ResponseCode_OK),
+	return resp != nil &&
+			resp.GetResult_() != nil &&
+			resp.GetResult_().GetConfigSummaryResult_() != nil &&
+			resp.GetResult_().GetConfigSummaryResult_().GetSummary() != nil &&
+			resp.GetResult_().GetConfigSummaryResult_().GetSummary().GetGroups() != nil &&
+			len(resp.GetResult_().GetConfigSummaryResult_().GetSummary().GetGroups()) > 0 &&
+			resp.GetResponseCode() == aurora.ResponseCode_OK,
 		nil
 }
diff --git a/realis_e2e_test.go b/realis_e2e_test.go
index 9482964..5893491 100644
--- a/realis_e2e_test.go
+++ b/realis_e2e_test.go
@@ -1467,10 +1467,15 @@ func TestRealisClient_JobExists(t *testing.T) {
 		Tier("preemptible").
 		Priority(0)
 
-	err := r.CreateJob(job)
+	// Check if job exists before creating
+	exists, err := r.JobExists(job.JobKey())
+	assert.NoError(t, err)
+	assert.False(t, exists)
+
+	err = r.CreateJob(job)
 	assert.NoError(t, err)
 
-	exists, err := r.JobExists(job.JobKey())
+	exists, err = r.JobExists(job.JobKey())
 	assert.NoError(t, err)
 	assert.True(t, exists)
 
@@ -1486,6 +1491,11 @@ func TestRealisClient_JobExists(t *testing.T) {
 		Disk(10).
 		InstanceCount(1)
 
+	// Check if job exists before creating
+	exists, err = r.JobExists(badJob.JobKey())
+	assert.NoError(t, err)
+	assert.False(t, exists)
+
 	err = r.CreateJob(badJob)
 	assert.Error(t, err)