From 700cedc19b864903e05a7877d4094b6bfce13dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erc=C3=BCment=20Kaya?= <kayaercument95@gmail.com>
Date: Thu, 17 Sep 2026 10:56:15 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=20Code=20clean=20up=20and=20upd?=
 =?UTF-8?q?ating=20the=20tets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/job.cpp                      | 16 +++++++---------
 tests/unit/c++/job_unit_test.cpp | 16 ++++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/job.cpp b/src/job.cpp
index 36ef02d..bf9a3d1 100644
--- a/src/job.cpp
+++ b/src/job.cpp
@@ -32,16 +32,14 @@
 using namespace mqss::client;
 
 nlohmann::json CircuitJobRequest::toJson(bool isHpc) const {
-  nlohmann::json circuit = mCircuit;
-
-  if (isHpc) {
-    circuit = nlohmann::json::array({mCircuit});
-  }
-
   return {
-      {"circuit", std::move(circuit)},  {"circuit_format", mCircuitFormat},
-      {"resource_name", mResourceName}, {"shots", mShots},
-      {"no_modify", mNoModify},         {"queued", mQueued},
+      {"circuit",
+       isHpc ? nlohmann::json::array({mCircuit}) : nlohmann::json(mCircuit)},
+      {"circuit_format", mCircuitFormat},
+      {"resource_name", mResourceName},
+      {"shots", mShots},
+      {"no_modify", mNoModify},
+      {"queued", mQueued},
   };
 }
 
diff --git a/tests/unit/c++/job_unit_test.cpp b/tests/unit/c++/job_unit_test.cpp
index 7929804..087c5b7 100644
--- a/tests/unit/c++/job_unit_test.cpp
+++ b/tests/unit/c++/job_unit_test.cpp
@@ -90,7 +90,7 @@ class MQSSClientTest : public ::testing::Test {
 TEST_F(MQSSClientTest, SubmitJobSuccess) {
   auto job = createCircuitJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(1)))
       .WillOnce(Return(kSubmitSuccess));
 
   auto client = createClient();
@@ -105,7 +105,7 @@ TEST_F(MQSSClientTest, SubmitJobSuccess) {
 TEST_F(MQSSClientTest, SubmitJobEmptyResponse) {
   auto job = createCircuitJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(1)))
       .WillOnce(Return(""));
 
   auto client = createClient();
@@ -116,7 +116,7 @@ TEST_F(MQSSClientTest, SubmitJobEmptyResponse) {
 TEST_F(MQSSClientTest, SubmitJobInvalidJson) {
   auto job = createCircuitJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(1)))
       .WillOnce(Return("not-json"));
 
   auto client = createClient();
@@ -127,7 +127,7 @@ TEST_F(MQSSClientTest, SubmitJobInvalidJson) {
 TEST_F(MQSSClientTest, SubmitJobMissingUuid) {
   auto job = createCircuitJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(1)))
       .WillOnce(Return(R"({"status":"ok"})"));
 
   auto client = createClient();
@@ -262,7 +262,7 @@ TEST_F(MQSSClientTest, GetJobResultInvalidJson) {
 TEST_F(MQSSClientTest, SubmitHamiltonianJobSuccess) {
   auto job = createHamiltonianJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(0)))
       .WillOnce(Return(kSubmitSuccess));
 
   auto client = createClient();
@@ -277,7 +277,7 @@ TEST_F(MQSSClientTest, SubmitHamiltonianJobSuccess) {
 TEST_F(MQSSClientTest, SubmitHamiltonianJobEmptyResponse) {
   auto job = createHamiltonianJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(0)))
       .WillOnce(Return(""));
 
   auto client = createClient();
@@ -288,7 +288,7 @@ TEST_F(MQSSClientTest, SubmitHamiltonianJobEmptyResponse) {
 TEST_F(MQSSClientTest, SubmitHamiltonianJobInvalidJson) {
   auto job = createHamiltonianJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(0)))
       .WillOnce(Return("not-json"));
 
   auto client = createClient();
@@ -299,7 +299,7 @@ TEST_F(MQSSClientTest, SubmitHamiltonianJobInvalidJson) {
 TEST_F(MQSSClientTest, SubmitHamiltonianJobMissingUuid) {
   auto job = createHamiltonianJob();
 
-  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson()))
+  EXPECT_CALL(*mock_ptr_, post(job.getPath(), job.toJson(0)))
       .WillOnce(Return(R"({"status":"ok"})"));
 
   auto client = createClient();