From cc133b70f5f4cc9ccbac66e622f7783caaa0621a Mon Sep 17 00:00:00 2001
From: tqcq <99722391+tqcq@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:38:01 +0800
Subject: [PATCH] feat support vector<string>

---
 src/ulib/utils/utils.cpp            | 11 ++++++++++-
 src/ulib/utils/utils.h              |  7 +++++--
 tests/ulib/utils/utils_unittest.cpp | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/ulib/utils/utils.cpp b/src/ulib/utils/utils.cpp
index 3805fd7..948d97d 100644
--- a/src/ulib/utils/utils.cpp
+++ b/src/ulib/utils/utils.cpp
@@ -3,7 +3,7 @@
 
 namespace ulib {
 std::string
-StrJoin(std::vector<nonstd::string_view> &vec,
+StrJoin(const std::vector<nonstd::string_view> &vec,
         nonstd::string_view delimiter,
         bool ignore_empty_str)
 {
@@ -26,4 +26,13 @@ StrJoin(std::vector<nonstd::string_view> &vec,
     return std::move(ss.str());
 }
 
+std::string
+StrJoin(const std::vector<std::string> &vec,
+        nonstd::string_view delimiter,
+        bool ignore_empty_str)
+{
+    return StrJoin(std::vector<nonstd::string_view>{vec.cbegin(), vec.cend()},
+                   delimiter, ignore_empty_str);
+}
+
 }// namespace ulib
diff --git a/src/ulib/utils/utils.h b/src/ulib/utils/utils.h
index cdcf16c..5e90e99 100644
--- a/src/ulib/utils/utils.h
+++ b/src/ulib/utils/utils.h
@@ -3,7 +3,6 @@
 
 #include <functional>
 #include <string_view.hpp>
-#include <type_traits>
 #include <vector>
 
 namespace ulib {
@@ -21,7 +20,11 @@ Clamp(const T &value, const T &low, const T &high)
     return Clamp(value, low, high, std::less<T>{});
 }
 
-std::string StrJoin(std::vector<nonstd::string_view> &vec,
+std::string StrJoin(const std::vector<nonstd::string_view> &vec,
+                    nonstd::string_view delimiter = ",",
+                    bool ignore_empty_str = true);
+
+std::string StrJoin(const std::vector<std::string> &vec,
                     nonstd::string_view delimiter = ",",
                     bool ignore_empty_str = true);
 
diff --git a/tests/ulib/utils/utils_unittest.cpp b/tests/ulib/utils/utils_unittest.cpp
index a54d7a5..a8c2891 100644
--- a/tests/ulib/utils/utils_unittest.cpp
+++ b/tests/ulib/utils/utils_unittest.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include <ulib/utils/utils.h>
+#include <vector>
 
 TEST(Utils, Clamp)
 {
@@ -32,3 +33,19 @@ TEST(Utils, StrJoin)
     EXPECT_EQ(ulib::StrJoin(vec, ",", false), ",b,c");
     EXPECT_EQ(ulib::StrJoin(vec, ",", true), "b,c");
 }
+
+TEST(Utils, StrJoin_vector_string)
+{
+    std::vector<std::string> vec{"a", "b", "c"};
+    EXPECT_EQ(ulib::StrJoin(vec, ","), "a,b,c");
+    const std::vector<std::string> &const_vec = vec;
+    EXPECT_EQ(ulib::StrJoin(const_vec, ","), "a,b,c");
+}
+
+TEST(Utils, StrJoin_vector_nonstd_string_view)
+{
+    std::vector<nonstd::string_view> vec{"a", "b", "c"};
+    EXPECT_EQ(ulib::StrJoin(vec, ","), "a,b,c");
+    const std::vector<nonstd::string_view> &const_vec = vec;
+    EXPECT_EQ(ulib::StrJoin(const_vec, ","), "a,b,c");
+}