F files

Summary

Insert a meaningful description for this merge request here.  What is the
new/changed behavior? Which bug has been fixed? Are there related Issues?

Focus

Point the reviewer to the core of the code change. Where should they start
reading? What should they focus on (e.g. security, performance,
maintainability, user-friendliness, compliance with the specs, finding more
corner cases, concrete questions)?

Test Environment

How to set up a test environment for manual testing?

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related Issues
• Up-to-date CHANGELOG.md
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

test/test_transaction.cpp

@@ -23,22 +23,24 @@
 #include "caosdb/entity/v1alpha1/main.pb.h" // for Entity
 #include "caosdb/exceptions.h"              // for ConnectionError
 #include "caosdb/status_code.h"
-#include "caosdb/transaction.h"        // for Transaction, UniqueResult
-#include "caosdb/transaction_status.h" // for ConnectionError
-#include "caosdb_test_utility.h"       // for EXPECT_THROW_MESSAGE
-#include "gtest/gtest-message.h"       // for Message
-#include "gtest/gtest-test-part.h"     // for SuiteApiResolver, TestPa...
-#include "gtest/gtest_pred_impl.h"     // for Test, TestInfo, TEST
-#include <memory>                      // for allocator, unique_ptr
-#include <string>                      // for string, basic_string
-#include <utility>                     // for move
-#include <vector>                      // for vector
+#include "caosdb/transaction.h"         // for Transaction
+#include "caosdb/transaction_handler.h" // for MultiTransactionResponse
+#include "caosdb/transaction_status.h"  // for ConnectionError
+#include "caosdb_test_utility.h"        // for EXPECT_THROW_MESSAGE
+#include <gtest/gtest-message.h>        // for Message
+#include <gtest/gtest-test-part.h>      // for SuiteApiResolver, TestPa...
+#include <gtest/gtest_pred_impl.h>      // for Test, TestInfo, TEST
+#include <memory>                       // for allocator, unique_ptr
+#include <stdexcept>                    // for out_of_range
+#include <string>                       // for string, basic_string
+#include <utility>                      // for move
+#include <vector>                       // for vector
 
 namespace caosdb::transaction {
 using caosdb::configuration::InsecureConnectionConfiguration;
 using caosdb::connection::Connection;
+using caosdb::entity::Entity;
 using caosdb::exceptions::ConnectionError;
-using caosdb::transaction::UniqueResult;
 using ProtoEntity = caosdb::entity::v1alpha1::Entity;
 using caosdb::entity::v1alpha1::RetrieveResponse;
 
@@ -52,19 +54,29 @@ TEST(test_transaction, create_transaction) {
   EXPECT_THROW_MESSAGE(
     transaction->Execute(), ConnectionError,
     "The attempt to execute this transaction was not successful because the "
-    "connection to the server could not be established.");
+    "connection to the server could not be established. "
+    "Original message: failed to connect to all addresses");
 }
 
-TEST(test_transaction, unique_result) {
-  auto *entity = new ProtoEntity();
-  entity->set_id("test");
-  UniqueResult result(entity);
+TEST(test_transaction, test_multi_result_set) {
+  std::vector<std::unique_ptr<Entity>> entities;
+  for (int i = 0; i < 5; i++) {
+    entities.push_back(std::make_unique<Entity>());
+    entities[i]->SetName("E" + std::to_string(i));
+  }
+  MultiResultSet result_set(std::move(entities));
 
-  EXPECT_EQ("test", result.GetEntity().GetId());
+  EXPECT_EQ(result_set.size(), 5);
+  EXPECT_EQ(result_set.mutable_at(3)->GetName(), "E3");
+  EXPECT_EQ(result_set.at(4).GetName(), "E4");
+  EXPECT_EQ(result_set.at(4).GetName(), "E4");
+  EXPECT_THROW(auto &e = result_set.at(15), std::out_of_range);
 
-  // DON'T DELETE! The caosdb::entity::Entity takes care of that
-  // Try it yourself:
-  // delete entity;
+  int counter = 0;
+  for (const auto &entity : result_set) {
+    EXPECT_EQ(entity.GetName(), "E" + std::to_string(counter++));
+  }
+  EXPECT_EQ(counter, 5);
 }
 
 TEST(test_transaction, test_unavailable) {
@@ -96,29 +108,19 @@ TEST(test_transaction, test_retrieve_by_ids) {
 TEST(test_transaction, test_multi_result_set_empty) {
   std::vector<std::unique_ptr<Entity>> empty;
   MultiResultSet rs(std::move(empty));
-  EXPECT_EQ(rs.Size(), 0);
+  EXPECT_EQ(rs.size(), 0);
 }
 
 TEST(test_transaction, test_multi_result_iterator) {
   std::vector<std::unique_ptr<Entity>> one_elem;
   RetrieveResponse response;
-  response.mutable_entity()->set_id("100");
-  one_elem.push_back(std::make_unique<Entity>(response.release_entity()));
+  response.mutable_entity_response()->mutable_entity()->set_id("100");
+  one_elem.push_back(
+    std::make_unique<Entity>(response.release_entity_response()));
 
   MultiResultSet rs(std::move(one_elem));
-  EXPECT_EQ(rs.Size(), 1);
-
-  for (const Entity &entity : rs) {
-    EXPECT_EQ(entity.GetId(), "100");
-  }
-}
-
-TEST(test_transaction, test_unique_result_iterator) {
-  caosdb::entity::v1alpha1::Entity response;
-  response.set_id("100");
+  EXPECT_EQ(rs.size(), 1);
 
-  UniqueResult rs(&response);
-  EXPECT_EQ(rs.Size(), 1);
   for (const Entity &entity : rs) {
     EXPECT_EQ(entity.GetId(), "100");
   }
@@ -127,12 +129,13 @@ TEST(test_transaction, test_unique_result_iterator) {
 TEST(test_transaction, test_multi_result_set_one) {
   std::vector<std::unique_ptr<Entity>> one_elem;
   RetrieveResponse response;
-  response.mutable_entity()->set_id("100");
-  one_elem.push_back(std::make_unique<Entity>(response.release_entity()));
+  response.mutable_entity_response()->mutable_entity()->set_id("100");
+  one_elem.push_back(
+    std::make_unique<Entity>(response.release_entity_response()));
 
   MultiResultSet rs(std::move(one_elem));
-  EXPECT_EQ(rs.Size(), 1);
-  EXPECT_EQ(rs.At(0).GetId(), "100");
+  EXPECT_EQ(rs.size(), 1);
+  EXPECT_EQ(rs.at(0).GetId(), "100");
 }
 
 TEST(test_transaction, test_multi_result_set_three) {
@@ -141,14 +144,17 @@ TEST(test_transaction, test_multi_result_set_three) {
   MultiTransactionResponse response;
   response.add_responses()
     ->mutable_retrieve_response()
+    ->mutable_entity_response()
     ->mutable_entity()
     ->set_id("100");
-  auto *entity_with_error =
-    response.add_responses()->mutable_retrieve_response()->mutable_entity();
-  entity_with_error->set_id("101");
+  auto *entity_with_error = response.add_responses()
+                              ->mutable_retrieve_response()
+                              ->mutable_entity_response();
+  entity_with_error->mutable_entity()->set_id("101");
   entity_with_error->add_errors()->set_code(1);
   response.add_responses()
     ->mutable_retrieve_response()
+    ->mutable_entity_response()
     ->mutable_entity()
     ->set_id("102");
 
@@ -156,12 +162,12 @@ TEST(test_transaction, test_multi_result_set_three) {
   std::vector<std::unique_ptr<Entity>> entities;
   for (auto sub_response : *responses) {
     three_elem.push_back(std::make_unique<Entity>(
-      sub_response.mutable_retrieve_response()->release_entity()));
+      sub_response.mutable_retrieve_response()->release_entity_response()));
   }
 
   MultiResultSet rs(std::move(three_elem));
-  EXPECT_EQ(rs.Size(), 3);
-  EXPECT_TRUE(rs.At(1).HasErrors());
+  EXPECT_EQ(rs.size(), 3);
+  EXPECT_TRUE(rs.at(1).HasErrors());
 }
 
 TEST(test_transaction, test_update_entity) {
@@ -189,4 +195,36 @@ TEST(test_transaction, test_multi_deletion) {
   }
 }
 
+TEST(test_transaction, test_retrieve_and_download) {
+  const auto *host = "localhost";
+  auto configuration = InsecureConnectionConfiguration(host, 8000);
+  Connection connection(configuration);
+  auto transaction = connection.CreateTransaction();
+
+  EXPECT_EQ(transaction->GetStatus().GetCode(), StatusCode::INITIAL);
+  transaction->RetrieveAndDownloadFilesById("asdf", "local_path");
+
+  EXPECT_EQ(transaction->GetStatus().GetCode(), StatusCode::GO_ON);
+
+  EXPECT_EQ(transaction->ExecuteAsynchronously(), StatusCode::EXECUTING);
+  EXPECT_EQ(transaction->GetStatus().GetCode(), StatusCode::CONNECTION_ERROR);
+}
+
+TEST(test_transaction, test_insert_with_file) {
+  const auto *host = "localhost";
+  auto configuration = InsecureConnectionConfiguration(host, 8000);
+  Connection connection(configuration);
+  auto transaction = connection.CreateTransaction();
+  Entity entity;
+  entity.SetRole("File");
+  entity.SetLocalPath(TEST_DATA_DIR + "/test.json");
+
+  EXPECT_TRUE(transaction->GetUploadFiles().empty());
+  transaction->InsertEntity(&entity);
+  EXPECT_EQ(transaction->GetUploadFiles().size(), 1);
+
+  transaction->ExecuteAsynchronously();
+  EXPECT_EQ(transaction->GetStatus().GetCode(), StatusCode::FILE_UPLOAD_ERROR);
+}
+
 } // namespace caosdb::transaction