Documentation

Summary

Minimal documentation is written now and shows up on docs.indiscale.com.

Focus

• Is the documentation correct and complete?
• Is the minimal example enough for users to get started?
• Is it acceptable that the API documentation is outside sphinx?

Test Environment

• Build: make doc_clean; make doc
• Open the html: xdg-open build/doc/html/index.html
• To test the pages build: download the artifact directory from the pipeline, extract it and inspect the index.html inside.

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 -> integration test is allowed to fail since no corresponding repo exists there.
• Reference related Issues: for caosdb/customers/lfpb/management#417
• 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 spezifications? Are they satisfied?

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

TODO

• Add description to README_SETUP.md: how to run unit tests locally

src/lib/maoxdb.cpp

@@ -198,9 +198,7 @@ auto mxFromCaosDBParents(const ce::Parents &parents) -> mxArray * {
     auto parent = parents.at(i);
     mxSetField(result, i, "id", mxCreateString(parent.GetId().c_str()));
     mxSetField(result, i, "name", mxCreateString(parent.GetName().c_str()));
-    // FIXME Add again once upstream is ready.
-    // mxSetField(result, i, "description",
-    // mxCreateString(parent.GetDescription().c_str()));
+    mxSetField(result, i, "description", mxCreateString(parent.GetDescription().c_str()));
   }
   return result;
 }
@@ -367,11 +365,16 @@ void assignEntityDataFromMx(ce::Entity &entity, const mxArray *array, const mwSi
     entity.SetFilePath(mxGetStdString(mxGetField(array, index, "filepath")));
     entity.SetLocalPath(mxGetStdString(mxGetField(array, index, "localpath")));
   }
-  // TODO Remove existing parents and properties.
   CAOSDB_LOG_TRACE(logger_name) << "parents & properties";
+  for (size_t i = entity.GetParents().size(); i > 0; i--) {
+    entity.RemoveParent(i - 1);
+  }
   for (auto parent : parentsFromMx(mxGetField(array, index, "parents"))) {
     entity.AppendParent(parent);
   }
+  for (size_t i = entity.GetProperties().size(); i > 0; i--) {
+    entity.RemoveProperty(i - 1);
+  }
   for (auto &property : propertiesFromMx(mxGetField(array, index, "properties"))) {
     entity.AppendProperty(property);
   }
@@ -496,7 +499,7 @@ auto dataTypeFromMx(const mxArray *datatypeArray) -> ce::DataType {
   } else if (is_list) {
     dtype = ce::DataType::ListOf(cu::getEnumValueFromName<ce::AtomicDataType>(dtype_name));
   } else {
-    dtype = ce::DataType(cu::getEnumValueFromName<ce::AtomicDataType>(dtype_name), is_list);
+    dtype = ce::DataType(cu::getEnumValueFromName<ce::AtomicDataType>(dtype_name));
   }
 
   return dtype;