1. extract isOnlyDigits to stringUtils

2. handle the case when the run type is a number and convert it to the string representation
3. tests

Author: Barthelemy

Framework/CMakeLists.txt

@@ -279,7 +279,8 @@ set(TEST_SRCS
     test/testQualitiesToTRFCollectionConverter.cxx
     test/testUserCodeInterface.cxx
     test/testCustomParameters.cxx
-  )
+    test/testStringUtils.cxx
+)
 
 set(TEST_ARGS
     ""
@@ -301,6 +302,7 @@ set(TEST_ARGS
     ""
     ""
     ""
+    ""
   )
 
 list(LENGTH TEST_SRCS count)

Framework/include/QualityControl/stringUtils.h

@@ -40,6 +40,11 @@ bool decodeBool(const std::string& value);
 /// @throw std::runtime_error the value is not a bool
 bool parseBoolParam(const CustomParameters& customParameters, const std::string& name, const std::string& runType = "default", const std::string& beamType = "default");
 
+/**
+ * Check if the string contains only digits.
+ */
+bool isOnlyDigits(std::string s);
+
 } // namespace o2::quality_control::core
 
 #endif // QC_STRING_UTILS_H

Framework/src/ActivityHelpers.cxx

@@ -20,6 +20,9 @@
 #include <CCDB/BasicCCDBManager.h>
 #include "QualityControl/ObjectMetadataKeys.h"
 
+#include <DataFormatsParameters/ECSDataAdapters.h>
+#include <QualityControl/stringUtils.h>
+
 using namespace o2::quality_control::repository;
 
 namespace o2::quality_control::core::activity_helpers
@@ -47,7 +50,13 @@ core::Activity asActivity(const std::map<std::string, std::string>& metadata, co
 {
   core::Activity activity;
   if (auto runType = metadata.find(metadata_keys::runType); runType != metadata.end()) {
-    activity.mType = runType->second;
+    if(isOnlyDigits(runType->second)) {
+      // we probably got the former representation of run types, i.e. an integer. We convert it as best
+      // as we can using O2's ECSDataAdapter
+      activity.mType = parameters::GRPECS::RunTypeNames[std::stoi(runType->second)];
+    } else {
+      activity.mType = runType->second;
+    }
   }
   if (auto runNumber = metadata.find(metadata_keys::runNumber); runNumber != metadata.end()) {
     activity.mId = std::strtol(runNumber->second.c_str(), nullptr, 10);
@@ -72,7 +81,13 @@ core::Activity asActivity(const boost::property_tree::ptree& tree, const std::st
 {
   core::Activity activity;
   if (auto runType = tree.get_optional<std::string>(metadata_keys::runType); runType.has_value()) {
-    activity.mType = runType.value();
+    if(isOnlyDigits(runType.value())) {
+      // we probably got the former representation of run types, i.e. an integer. We convert it as best
+      // as we can using O2's ECSDataAdapter
+      activity.mType = parameters::GRPECS::RunTypeNames[std::stoi(runType.value())];
+    } else {
+      activity.mType = runType.value();
+    }
   }
   if (auto runNumber = tree.get_optional<int>(metadata_keys::runNumber); runNumber.has_value()) {
     activity.mId = runNumber.value();

Framework/src/stringUtils.cxx

@@ -80,4 +80,10 @@ bool parseBoolParam(const CustomParameters& customParameters, const std::string&
   }
 }
 
+bool isOnlyDigits(std::string s)
+{
+  return !s.empty() && std::all_of(s.begin(), s.end(), ::isdigit);
+}
+
+
 } // namespace o2::quality_control::core

Framework/test/testActivityHelpers.cxx

@@ -212,3 +212,28 @@ TEST_CASE("test_overlappingActivity")
     CHECK(result == expectation);
   }
 }
+
+TEST_CASE("test_backward_compatible_activity_type")
+{
+  SECTION("metadata map")
+  {
+    std::map<std::string, std::string> metadata = {
+      { metadata_keys::runType, "2" }, // technical
+    };
+
+    Activity activity = activity_helpers::asActivity(metadata, "test_provenance");
+
+    CHECK(activity.mType == "TECHNICAL");
+    std::cout << "type " << activity << std::endl;
+  }
+
+  SECTION("property tree")
+  {
+    boost::property_tree::ptree tree;
+    tree.put(metadata_keys::runType, "2");
+
+    Activity activity = activity_helpers::asActivity(tree, "test_provenance");
+
+    CHECK(activity.mType == "TECHNICAL");
+  }
+}

Framework/test/testStringUtils.cxx

@@ -0,0 +1,37 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+///
+/// \file    testActivity.cxx
+/// \author  Piotr Konopka
+///
+
+#include "QualityControl/stringUtils.h"
+
+#define BOOST_TEST_MODULE Triggers test
+#define BOOST_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
+
+#include <boost/test/unit_test.hpp>
+
+using namespace o2::quality_control::core;
+
+BOOST_AUTO_TEST_CASE(test_is_number)
+{
+  BOOST_CHECK_EQUAL(isOnlyDigits("1"), true);
+  BOOST_CHECK_EQUAL(isOnlyDigits("-1"), false);
+  BOOST_CHECK_EQUAL(isOnlyDigits("1000000"), true);
+  BOOST_CHECK_EQUAL(isOnlyDigits("0.1"), false);
+  BOOST_CHECK_EQUAL(isOnlyDigits(".2"), false);
+  BOOST_CHECK_EQUAL(isOnlyDigits("x"), false);
+  BOOST_CHECK_EQUAL(isOnlyDigits("1x"), false);
+  BOOST_CHECK_EQUAL(isOnlyDigits("......"), false);
+}